diff --git a/mayan/apps/acls/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/ar/LC_MESSAGES/django.mo
index fae4e8f5c8..48f2719ef8 100644
Binary files a/mayan/apps/acls/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/ar/LC_MESSAGES/django.po b/mayan/apps/acls/locale/ar/LC_MESSAGES/django.po
index f26e94285a..872d35499d 100644
--- a/mayan/apps/acls/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/acls/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/bg/LC_MESSAGES/django.mo
index a760b13940..bd85504c71 100644
Binary files a/mayan/apps/acls/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/bg/LC_MESSAGES/django.po b/mayan/apps/acls/locale/bg/LC_MESSAGES/django.po
index 3926ed7e45..c834ac36f8 100644
--- a/mayan/apps/acls/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.mo
index fe80a9f9b0..8170a36a15 100644
Binary files a/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po
index 5e73d2105f..d705805ba1 100644
--- a/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/acls/locale/da/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/da/LC_MESSAGES/django.mo
index 97e329855f..da2c82fbb7 100644
Binary files a/mayan/apps/acls/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/da/LC_MESSAGES/django.po b/mayan/apps/acls/locale/da/LC_MESSAGES/django.po
index f807404a80..65fc3a829d 100644
--- a/mayan/apps/acls/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.mo
index b3c203967c..85938b4fdf 100644
Binary files a/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po
index 21e7e391b3..c24202620c 100644
--- a/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-24 23:10+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/acls/locale/en/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/en/LC_MESSAGES/django.mo
index 1ac7353367..f3f69fd0d0 100644
Binary files a/mayan/apps/acls/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/en/LC_MESSAGES/django.po b/mayan/apps/acls/locale/en/LC_MESSAGES/django.po
index fbae4abbf2..c285f45417 100644
--- a/mayan/apps/acls/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2012-02-02 18:20+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/acls/locale/es/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/es/LC_MESSAGES/django.mo
index 31037eada1..5e4ef1e8b1 100644
Binary files a/mayan/apps/acls/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/es/LC_MESSAGES/django.po b/mayan/apps/acls/locale/es/LC_MESSAGES/django.po
index 25623de8d2..4482bbbe0c 100644
--- a/mayan/apps/acls/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # jmcainzos <jmcainzos@vodafone.es>, 2015
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: apps.py:15 links.py:35
@@ -30,7 +31,6 @@ msgid "Permissions"
 msgstr "Permisos"
 
 #: apps.py:29 models.py:46
-#| msgid "Roles"
 msgid "Role"
 msgstr "Rol"
 
@@ -39,7 +39,6 @@ msgid "Delete"
 msgstr "Borrar"
 
 #: links.py:39
-#| msgid "View ACLs"
 msgid "New ACL"
 msgstr "Nueva LCA"
 
@@ -57,9 +56,9 @@ msgstr "Entradas de acceso"
 
 #: models.py:57
 #, python-format
-#| msgid "mission \"%(permission)s\" granted to %(actor)s for %(object)s."
 msgid "Permissions \"%(permissions)s\" to role \"%(role)s\" for \"%(object)s\""
-msgstr "Permisos \"%(permissions)s\" para el rol \"%(role)s\" para \"%(object)s\""
+msgstr ""
+"Permisos \"%(permissions)s\" para el rol \"%(role)s\" para \"%(object)s\""
 
 #: models.py:74
 msgid "None"
@@ -80,21 +79,27 @@ msgstr "Ver LCAs"
 #: serializers.py:24 serializers.py:132
 msgid ""
 "API URL pointing to the list of permissions for this access control list."
-msgstr "URL de la API que apunta a la lista de permisos para esta lista de control de acceso."
+msgstr ""
+"URL de la API que apunta a la lista de permisos para esta lista de control "
+"de acceso."
 
 #: serializers.py:57
 msgid ""
 "API URL pointing to a permission in relation to the access control list to "
 "which it is attached. This URL is different than the canonical workflow URL."
-msgstr "URL de la API  que apunta a un permiso en relación con la lista de control de acceso a la que está conectado. Esta URL es diferente de la URL canónica de flujo de trabajo."
+msgstr ""
+"URL de la API  que apunta a un permiso en relación con la lista de control "
+"de acceso a la que está conectado. Esta URL es diferente de la URL canónica "
+"de flujo de trabajo."
 
 #: serializers.py:87
 msgid "Primary key of the new permission to grant to the access control list."
-msgstr "Llave primaria del nuevo permiso para conceder a la lista de control de acceso."
+msgstr ""
+"Llave primaria del nuevo permiso para conceder a la lista de control de "
+"acceso."
 
 #: serializers.py:111 serializers.py:187
 #, python-format
-#| msgid "permission"
 msgid "No such permission: %s"
 msgstr "No existe el permiso: %s"
 
@@ -102,11 +107,15 @@ msgstr "No existe el permiso: %s"
 msgid ""
 "Comma separated list of permission primary keys to grant to this access "
 "control list."
-msgstr "Lista separada por comas de las llaves primarias de permisos para conceder a esta lista de control de acceso."
+msgstr ""
+"Lista separada por comas de las llaves primarias de permisos para conceder a "
+"esta lista de control de acceso."
 
 #: serializers.py:138
 msgid "Primary keys of the role to which this access control list binds to."
-msgstr "Las llaves primarias de los roles a los que se vincula esta lista de control de acceso."
+msgstr ""
+"Las llaves primarias de los roles a los que se vincula esta lista de control "
+"de acceso."
 
 #: views.py:73
 #, python-format
@@ -115,7 +124,6 @@ msgstr "Nueva lista de control de acceso para: %s"
 
 #: views.py:100
 #, python-format
-#| msgid "Default ACLs"
 msgid "Delete ACL: %s"
 msgstr "Borrar LCA: %s"
 
@@ -232,8 +240,10 @@ msgstr "Los permisos inactivos se heredan de un objeto precedente."
 #~ msgid "Permission \"%(permission)s\" revoked of %(actor)s for %(object)s."
 #~ msgstr "Permission \"%(permission)s\" revoked of %(actor)s for %(object)s."
 
-#~ msgid "%(actor)s, didn't had the permission \"%(permission)s\" for %(object)s."
-#~ msgstr "%(actor)s, didn't had the permission \"%(permission)s\" for %(object)s."
+#~ msgid ""
+#~ "%(actor)s, didn't had the permission \"%(permission)s\" for %(object)s."
+#~ msgstr ""
+#~ "%(actor)s, didn't had the permission \"%(permission)s\" for %(object)s."
 
 #~ msgid "Add new holder for: %s"
 #~ msgstr "add new holder for: %s"
diff --git a/mayan/apps/acls/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/fa/LC_MESSAGES/django.mo
index 620d52383f..bbd7b7fc9c 100644
Binary files a/mayan/apps/acls/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/fa/LC_MESSAGES/django.po b/mayan/apps/acls/locale/fa/LC_MESSAGES/django.po
index cc6bfeefcf..2046e62cf5 100644
--- a/mayan/apps/acls/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/acls/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/fr/LC_MESSAGES/django.mo
index c44a0e307d..048ad3c4b6 100644
Binary files a/mayan/apps/acls/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/fr/LC_MESSAGES/django.po b/mayan/apps/acls/locale/fr/LC_MESSAGES/django.po
index ef2e95aa33..6a9533e158 100644
--- a/mayan/apps/acls/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/fr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/acls/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/hu/LC_MESSAGES/django.mo
index f33ad705f0..1c27449aaa 100644
Binary files a/mayan/apps/acls/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/hu/LC_MESSAGES/django.po b/mayan/apps/acls/locale/hu/LC_MESSAGES/django.po
index 8ae68ed97a..503d32f527 100644
--- a/mayan/apps/acls/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/acls/locale/id/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/id/LC_MESSAGES/django.mo
index b28642baeb..14bd648fa1 100644
Binary files a/mayan/apps/acls/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/id/LC_MESSAGES/django.po b/mayan/apps/acls/locale/id/LC_MESSAGES/django.po
index a63647740d..3b91e2fc6a 100644
--- a/mayan/apps/acls/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/acls/locale/it/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/it/LC_MESSAGES/django.mo
index 77e2224448..200a53dac7 100644
Binary files a/mayan/apps/acls/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/it/LC_MESSAGES/django.po b/mayan/apps/acls/locale/it/LC_MESSAGES/django.po
index f7a08495da..3663f642d2 100644
--- a/mayan/apps/acls/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.mo
index 3b6b264f80..2eedb89572 100644
Binary files a/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po
index 437b0917f3..95de7751e6 100644
--- a/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/acls/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/pl/LC_MESSAGES/django.mo
index bfacc1b6cf..d592ab872e 100644
Binary files a/mayan/apps/acls/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/pl/LC_MESSAGES/django.po b/mayan/apps/acls/locale/pl/LC_MESSAGES/django.po
index fab35772bb..e4745efc19 100644
--- a/mayan/apps/acls/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/acls/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/pt/LC_MESSAGES/django.mo
index cfad490f15..5c6c616fc6 100644
Binary files a/mayan/apps/acls/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/pt/LC_MESSAGES/django.po b/mayan/apps/acls/locale/pt/LC_MESSAGES/django.po
index 1710780c16..ba62eb0352 100644
--- a/mayan/apps/acls/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.mo
index 5829308913..e80383baa2 100644
Binary files a/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po
index ad4b749abf..eea29ed66b 100644
--- a/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.mo
index 48f65beb94..fcfdb6dc6b 100644
Binary files a/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po
index 1287acded5..97fb7f1d57 100644
--- a/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/acls/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/ru/LC_MESSAGES/django.mo
index fe350c6fe1..d554b507b0 100644
Binary files a/mayan/apps/acls/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/ru/LC_MESSAGES/django.po b/mayan/apps/acls/locale/ru/LC_MESSAGES/django.po
index ad3c8d2300..28a7c187eb 100644
--- a/mayan/apps/acls/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.mo
index d4e513b59b..85c848fc16 100644
Binary files a/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po
index b9239d5249..cd5277754e 100644
--- a/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.mo
index ee68e11262..3b5d034d97 100644
Binary files a/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po
index 57756adcdb..a0a0244c8e 100644
--- a/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.mo
index 78ae5724d4..65799b0314 100644
Binary files a/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.po
index 122cae7035..a9887c6367 100644
--- a/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.mo
index bd541a293f..4992053f09 100644
Binary files a/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.po
index 71ec9539c6..5e9138f584 100644
--- a/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -112,17 +112,17 @@ msgstr "الإجراءات"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "تفاصيل عن %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "انشاء"
 
diff --git a/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.mo
index d3eea4becf..5c57685aef 100644
Binary files a/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.po
index 79261bba06..b5109f3a62 100644
--- a/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr "Действия"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Създаване"
 
diff --git a/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.mo
index 6dced26e8a..91513bd737 100644
Binary files a/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.po
index 39fc62870a..71765505f4 100644
--- a/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -112,17 +112,17 @@ msgstr "Akcije"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Detalji o: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Kreirati"
 
diff --git a/mayan/apps/appearance/locale/da/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/da/LC_MESSAGES/django.mo
index 1b6283487c..d33eaf65e9 100644
Binary files a/mayan/apps/appearance/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/da/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/da/LC_MESSAGES/django.po
index 6b7a828a35..d82292bd03 100644
--- a/mayan/apps/appearance/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:48-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr "Handlinger"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr ""
 
diff --git a/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.mo
index 548e8afb35..e5de757a62 100644
Binary files a/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.po
index 2e159f7bca..42729debcb 100644
--- a/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/de_DE/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-24 22:57+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Erscheinungsbild"
 
@@ -117,17 +117,17 @@ msgstr "Aktionen"
 msgid "Toggle Dropdown"
 msgstr "Ausklappmenü ein-/ausschalten"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Details für: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "%(object)s bearbeiten"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Erstellen"
 
diff --git a/mayan/apps/appearance/locale/en/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/en/LC_MESSAGES/django.mo
index 6584aef737..8329b66fca 100644
Binary files a/mayan/apps/appearance/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/en/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/en/LC_MESSAGES/django.po
index 5e7016ccee..eba41247e6 100644
--- a/mayan/apps/appearance/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -110,17 +110,17 @@ msgstr ""
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr ""
 
diff --git a/mayan/apps/appearance/locale/es/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/es/LC_MESSAGES/django.mo
index 93c5a969a7..d7e630400f 100644
Binary files a/mayan/apps/appearance/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/es/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/es/LC_MESSAGES/django.po
index 168d72f890..286f80f7a6 100644
--- a/mayan/apps/appearance/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/es/LC_MESSAGES/django.po
@@ -1,24 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Roberto Rosario, 2015-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Apariencia"
 
@@ -44,15 +45,19 @@ msgstr "Error de servidor"
 
 #: templates/500.html:11
 msgid ""
-"There's been an error. It's been reported to the site administrators via "
-"e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Ha habido un error. Se ha informado a los administradores del sitio vía e-mail y debería corregirse en breve. Gracias por su paciencia."
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Ha habido un error. Se ha informado a los administradores del sitio vía e-"
+"mail y debería corregirse en breve. Gracias por su paciencia."
 
 #: templates/500.html:14
 msgid ""
 "If you need assistance, you may reference this error via the following "
 "identifier:"
-msgstr "Si necesita ayuda, puede hacer referencia a este error mediante el siguiente identificador:"
+msgstr ""
+"Si necesita ayuda, puede hacer referencia a este error mediante el siguiente "
+"identificador:"
 
 #: templates/appearance/about.html:8 templates/appearance/about.html:57
 msgid "About"
@@ -111,17 +116,17 @@ msgstr "Acciones"
 msgid "Toggle Dropdown"
 msgstr "Alternar desplegable"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Detalles para: %(object)s "
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Editar: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Crear"
 
@@ -184,7 +189,9 @@ msgstr "Ningún resultado"
 msgid ""
 "Total (%(start)s - %(end)s out of %(total)s) (Page %(page_number)s of "
 "%(total_pages)s)"
-msgstr "Total (%(start)s - %(end)s de %(total)s) (Página %(page_number)s de %(total_pages)s)"
+msgstr ""
+"Total (%(start)s - %(end)s de %(total)s) (Página %(page_number)s de "
+"%(total_pages)s)"
 
 #: templates/appearance/generic_list_subtemplate.html:14
 #: templates/appearance/generic_list_subtemplate.html:17
@@ -236,7 +243,8 @@ msgstr "Primer inicio de sesión"
 msgid ""
 "You have just finished installing <strong>Mayan EDMS</strong>, "
 "congratulations!"
-msgstr "!Felicitaciones! Acaba de terminar de instalar <strong>Mayan EDMS</strong>"
+msgstr ""
+"!Felicitaciones! Acaba de terminar de instalar <strong>Mayan EDMS</strong>"
 
 #: templates/appearance/login.html:25
 msgid "Login using the following credentials:"
@@ -261,7 +269,9 @@ msgstr "Contraseña: <strong>%(password)s</strong>"
 msgid ""
 "Be sure to change the password to increase security and to disable this "
 "message."
-msgstr "Asegúrese de cambiar su contraseña para aumentar la seguridad y para desactivar este mensaje"
+msgstr ""
+"Asegúrese de cambiar su contraseña para aumentar la seguridad y para "
+"desactivar este mensaje"
 
 #: templates/appearance/login.html:45 templates/appearance/login.html:54
 msgid "Sign in"
diff --git a/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.mo
index 475eac7928..d3fbd4a142 100644
Binary files a/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.po
index 7f7974322d..f82021acf0 100644
--- a/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr "عملیات"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "جزئیات :  %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "ویرایش :  %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "ایجاد"
 
diff --git a/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.mo
index d19eb5f2ae..0f0eafca6c 100644
Binary files a/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.po
index ef4c090029..7b776a7a50 100644
--- a/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Apparence"
 
@@ -117,17 +117,17 @@ msgstr "Actions"
 msgid "Toggle Dropdown"
 msgstr "Activer la liste déroulante"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Détails de : %(object)s "
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Modifie r: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Créer"
 
diff --git a/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.mo
index 459ab876b6..3838a43e99 100644
Binary files a/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.po
index 4f18cbac72..da25320b51 100644
--- a/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr "Műveletek"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr ""
 
diff --git a/mayan/apps/appearance/locale/id/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/id/LC_MESSAGES/django.mo
index 78b6e9750c..bbdaded0d4 100644
Binary files a/mayan/apps/appearance/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/id/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/id/LC_MESSAGES/django.po
index e1a493f00e..a75fcfcb26 100644
--- a/mayan/apps/appearance/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr ""
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr ""
 
diff --git a/mayan/apps/appearance/locale/it/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/it/LC_MESSAGES/django.mo
index 480039d941..fa5d45dd7d 100644
Binary files a/mayan/apps/appearance/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/it/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/it/LC_MESSAGES/django.po
index 116d3b0482..aa727bc512 100644
--- a/mayan/apps/appearance/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Aspetto"
 
@@ -116,17 +116,17 @@ msgstr "Azioni "
 msgid "Toggle Dropdown"
 msgstr "Apri dropdown"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Detaglio per: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Modifica: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Crea"
 
diff --git a/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.mo
index 1e08c8d573..e54bd9f1e4 100644
Binary files a/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.po
index 3e71a920cb..dbf30bb46a 100644
--- a/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Uiterlijk"
 
@@ -118,17 +118,17 @@ msgstr "Acties"
 msgid "Toggle Dropdown"
 msgstr "Toggle Dropdown"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Details voor: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Aanpassen: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Maak aan"
 
diff --git a/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.mo
index 3f4556b61a..d59258acd3 100644
Binary files a/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.po
index c9065aa5cc..a7c45c7518 100644
--- a/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -22,7 +22,7 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Wygląd"
 
@@ -119,17 +119,17 @@ msgstr "Akcje"
 msgid "Toggle Dropdown"
 msgstr "Rozwiń listę"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Szczegóły dla: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Edytuj: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Utwórz"
 
diff --git a/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.mo
index 4fbbed9e0e..4ddb93eb4e 100644
Binary files a/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.po
index 2c4f1e4c6d..ed597e5cb9 100644
--- a/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr "Ações"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Detalhes para: %(object)s "
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Editar: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Criar"
 
diff --git a/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.mo
index 3d8418ddbd..0074251659 100644
Binary files a/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.po
index 200a7d9dae..06bbb578d2 100644
--- a/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Aparência"
 
@@ -116,17 +116,17 @@ msgstr "Ações"
 msgid "Toggle Dropdown"
 msgstr "Mostrar/esconder menu"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Detalhes para: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Editar: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Criar"
 
diff --git a/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.mo
index 3e4e1cecea..cb868c5fdc 100644
Binary files a/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.po
index a49e389e5f..7846aea3ea 100644
--- a/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -113,17 +113,17 @@ msgstr "Acţiuni"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Detalii pentru: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Modifică %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Creează"
 
diff --git a/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.mo
index 9043ef9ac1..3941a71ebe 100644
Binary files a/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.po
index 10ccccc637..0ad0c6998d 100644
--- a/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,7 +21,7 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr "Внешний вид"
 
@@ -118,17 +118,17 @@ msgstr "Действия"
 msgid "Toggle Dropdown"
 msgstr "Переключение выпадающего списка"
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "Подробности: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "Редактировать: %(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Создать"
 
diff --git a/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.mo
index 3951a6def8..38fc4f02cd 100644
Binary files a/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.po
index fab9b692cf..14721d1a70 100644
--- a/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -112,17 +112,17 @@ msgstr ""
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr ""
 
diff --git a/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.mo
index 05cfe4d73f..57933ca3e8 100644
Binary files a/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.po
index 58022fb61f..768bf0fc32 100644
--- a/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr "Các thao tác"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "Tạo"
 
diff --git a/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.mo
index 3b99d287aa..a2854060c1 100644
Binary files a/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.po
index effcb4e648..4ab6a949ab 100644
--- a/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/appearance/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:12
+#: apps.py:12 settings.py:9
 msgid "Appearance"
 msgstr ""
 
@@ -111,17 +111,17 @@ msgstr "操作"
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: templates/appearance/calculate_form_title.html:7
+#: templates/appearance/calculate_form_title.html:11
 #, python-format
 msgid "Details for: %(object)s"
 msgstr "详细信息：%(object)s"
 
-#: templates/appearance/calculate_form_title.html:10
+#: templates/appearance/calculate_form_title.html:14
 #, python-format
 msgid "Edit: %(object)s"
 msgstr "编辑：%(object)s"
 
-#: templates/appearance/calculate_form_title.html:12
+#: templates/appearance/calculate_form_title.html:16
 msgid "Create"
 msgstr "创建"
 
diff --git a/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.mo
index 91ba04101c..5ae5769392 100644
Binary files a/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.po
index 195dd8ea2c..2b305e3f73 100644
--- a/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.mo
index c556bbeffb..f07773a254 100644
Binary files a/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.po
index 315bc83426..cb648c29e9 100644
--- a/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.mo
index 82616d34b9..d8ad31abfb 100644
Binary files a/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.po
index 20b8dbdc91..89917bf513 100644
--- a/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/authentication/locale/da/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/da/LC_MESSAGES/django.mo
index 682e97ef99..c665b621ca 100644
Binary files a/mayan/apps/authentication/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/da/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/da/LC_MESSAGES/django.po
index 8da4db2acb..d0857e259a 100644
--- a/mayan/apps/authentication/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.mo
index 2b3b592e3c..ef773cb629 100644
Binary files a/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.po
index 81bad81cac..c0e8e1bdcf 100644
--- a/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/authentication/locale/en/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/en/LC_MESSAGES/django.mo
index 6584aef737..8329b66fca 100644
Binary files a/mayan/apps/authentication/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/en/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/en/LC_MESSAGES/django.po
index 2a736adc53..7d35882093 100644
--- a/mayan/apps/authentication/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/mayan/apps/authentication/locale/es/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/es/LC_MESSAGES/django.mo
index d47f18c9cb..4fb5a7e7d8 100644
Binary files a/mayan/apps/authentication/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/es/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/es/LC_MESSAGES/django.po
index 9313d28adb..bb10e7e47b 100644
--- a/mayan/apps/authentication/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.mo
index 309a2704c4..327c839323 100644
Binary files a/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.po
index f895567171..2bf688b2d9 100644
--- a/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.mo
index a5b35141fa..9febab4118 100644
Binary files a/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.po
index eae56cf2f8..b945f3e14c 100644
--- a/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Christophe CHAUVET <christophe.chauvet@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.mo
index 51715c8202..b408cb1716 100644
Binary files a/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.po
index 3cb8776709..389c304b51 100644
--- a/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/id/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/id/LC_MESSAGES/django.mo
index 4bd2120273..2e105dc35e 100644
Binary files a/mayan/apps/authentication/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/id/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/id/LC_MESSAGES/django.po
index f35b027482..7f71a6f7db 100644
--- a/mayan/apps/authentication/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/it/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/it/LC_MESSAGES/django.mo
index 24a371f7b8..102eeee0b7 100644
Binary files a/mayan/apps/authentication/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/it/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/it/LC_MESSAGES/django.po
index 3847e183ac..58ce0c633e 100644
--- a/mayan/apps/authentication/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-09-24 09:36+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.mo
index e31c2158b9..9f55d1f7c5 100644
Binary files a/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.po
index 1643e8eb14..e98a975fbc 100644
--- a/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Justin Albstbstmeijer <justin@albstmeijer.nl>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.mo
index 33d077f155..a2c6857228 100644
Binary files a/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.po
index f3bef23ecb..5afb6ffc90 100644
--- a/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-03-22 17:45+0000\n"
 "Last-Translator: Wojtek Warczakowski <w.warczakowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.mo
index 2e076a5082..ded31e36e7 100644
Binary files a/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.po
index f643a86664..3c98b26d33 100644
--- a/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Manuela Silva <inactive+h_manuela_rodsilva@transifex.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.mo
index 26ddfaac2f..7b3c9bc8fb 100644
Binary files a/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.po
index af2355c1e9..8d2cacc4e3 100644
--- a/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-11-10 19:28+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.mo
index e5ea58ff82..2bb6ba4a51 100644
Binary files a/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.po
index 832a946faa..4dd10183e9 100644
--- a/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.mo
index b9b44bf135..08051e26d5 100644
Binary files a/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.po
index fbba1ccabc..756251fb49 100644
--- a/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2016-07-14 02:03+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.mo
index ed9d726087..287f8768c0 100644
Binary files a/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.po
index 66225a0839..005e85786d 100644
--- a/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.mo
index a3b0d2109c..e2b9e4bfd6 100644
Binary files a/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.po
index 5366087b70..7da525590c 100644
--- a/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.mo
index 93b3b8f60b..f927922f99 100644
Binary files a/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.po
index 06f922315f..f18461d424 100644
--- a/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/authentication/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2015-08-20 19:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.mo
index ba7b70122b..16d9a61937 100644
Binary files a/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.po
index 803da17c28..a09fb96233 100644
--- a/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/ar/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mohammed ALDOUB <voulnet@gmail.com>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/rosarior/teams/13584/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "التفاصيل"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "الوثائق"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.mo
index 1d43c9a8ab..2a38b7065b 100644
Binary files a/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.po
index b2cf69304e..0dccc9d679 100644
--- a/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/bg/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Iliya Georgiev <inactive+iliicho7@transifex.com>, 2017\n"
-"Language-Team: Bulgarian (https://www.transifex.com/rosarior/teams/13584/bg/)\n"
+"Language-Team: Bulgarian (https://www.transifex.com/rosarior/teams/13584/"
+"bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "Детайли"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Документи"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.mo
index c1d59492f2..806a4532bd 100644
Binary files a/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.po
index fd829894ba..b6fd6c2ba7 100644
--- a/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/bs_BA/LC_MESSAGES/django.po
@@ -2,24 +2,26 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: www.ping.ba <jomer@ping.ba>, 2017\n"
-"Language-Team: Bosnian (Bosnia and Herzegovina) (https://www.transifex.com/rosarior/teams/13584/bs_BA/)\n"
+"Language-Team: Bosnian (Bosnia and Herzegovina) (https://www.transifex.com/"
+"rosarior/teams/13584/bs_BA/)\n"
+"Language: bs_BA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bs_BA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +57,32 @@ msgstr ""
 msgid "Details"
 msgstr "Detalji"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +123,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.mo
index 52b358fbe4..b861e37eb7 100644
Binary files a/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.po
index 53a18c3f1d..2d47d30c67 100644
--- a/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/da/LC_MESSAGES/django.po
@@ -2,24 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mads L. Nielsen <sirlundgaard@gmail.com>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/rosarior/teams/13584/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +55,32 @@ msgstr ""
 msgid "Details"
 msgstr "Detaljer"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +121,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.mo
index b08c54ba15..9e2a66b20e 100644
Binary files a/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.po
index dd34e698fd..9e15f1a13c 100644
--- a/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/de_DE/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>, 2017\n"
-"Language-Team: German (Germany) (https://www.transifex.com/rosarior/teams/13584/de_DE/)\n"
+"Language-Team: German (Germany) (https://www.transifex.com/rosarior/"
+"teams/13584/de_DE/)\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr "Aktenschrank"
 
@@ -55,32 +56,32 @@ msgstr "Alle"
 msgid "Details"
 msgstr "Details"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Bezeichner"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Dokumente"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr "Aktenschrank"
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr "Überebene und Bezeichnung"
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr "%(model_name)s mit diesem %(field_labels)s existiert bereits."
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr "Dokumenten-Aktenschrank"
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr "Dokumenten-Aktenschränke"
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.mo
index 708f40d2db..943f5daca8 100644
Binary files a/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.po
index aed08b213c..0a6beb6ee7 100644
--- a/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +55,32 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr ""
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
diff --git a/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.mo
index c6d0242aac..f091f66a6a 100644
Binary files a/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.po
index f283b40c24..16b07fa118 100644
--- a/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/es/LC_MESSAGES/django.po
@@ -2,24 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/rosarior/teams/13584/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr "Archivadores"
 
@@ -55,32 +55,32 @@ msgstr "Todos"
 msgid "Details"
 msgstr "Detalles"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Etiqueta"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Documentos"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr "Archivador"
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr "Padre y etiqueta"
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr "%(model_name)s con este %(field_labels)s ya existe."
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr "Archivador de documento"
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr "Archivadores de documento"
 
@@ -123,8 +123,7 @@ msgstr ""
 "contienen. "
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 "URL del servicio de la API que muetra los documentos contenidos en este "
 "archivador. "
diff --git a/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.mo
index 7b8dc16903..1e9d01a556 100644
Binary files a/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.po
index 66b25e29f3..4603d88163 100644
--- a/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/fa/LC_MESSAGES/django.po
@@ -2,24 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>, 2017\n"
 "Language-Team: Persian (https://www.transifex.com/rosarior/teams/13584/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +55,32 @@ msgstr ""
 msgid "Details"
 msgstr "جزئیات"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "برچسب"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "اسناد"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +121,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.mo
index 8c15b8111a..9fb9c3e44f 100644
Binary files a/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.po
index b57dba59db..6b153b6f5a 100644
--- a/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/fr/LC_MESSAGES/django.po
@@ -2,24 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Christophe CHAUVET <christophe.chauvet@gmail.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/rosarior/teams/13584/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +55,32 @@ msgstr ""
 msgid "Details"
 msgstr "Détails"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Libellé"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Documents"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +121,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.mo
index 5916f5e084..8546a6bcd6 100644
Binary files a/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.po
index b453465d6e..ff1f47278a 100644
--- a/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/hu/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dezső József <dejo60@gmail.com>, 2017\n"
-"Language-Team: Hungarian (https://www.transifex.com/rosarior/teams/13584/hu/)\n"
+"Language-Team: Hungarian (https://www.transifex.com/rosarior/teams/13584/"
+"hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "Részletek"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "dokumentumok"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.mo
index 5dc2d5ff0e..c399434862 100644
Binary files a/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.po
index 197b988a1b..12d1a6f518 100644
--- a/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/id/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sehat <sehat75@yahoo.com>, 2017\n"
-"Language-Team: Indonesian (https://www.transifex.com/rosarior/teams/13584/id/)\n"
+"Language-Team: Indonesian (https://www.transifex.com/rosarior/teams/13584/"
+"id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "Detail"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Dokumen"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.mo
index 73c91808e4..d24b41fa20 100644
Binary files a/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.po
index a9ecec8187..1d1e290404 100644
--- a/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/it/LC_MESSAGES/django.po
@@ -2,24 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/rosarior/teams/13584/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +55,32 @@ msgstr "Tutti"
 msgid "Details"
 msgstr "Dettagli"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Etichetta"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Documenti"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +121,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.mo
index 524ad6226a..361e3a5560 100644
Binary files a/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.po
index 5c7835e861..d06b3a4f44 100644
--- a/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/nl_NL/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Justin Albstbstmeijer <justin@albstmeijer.nl>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/rosarior/teams/13584/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/rosarior/"
+"teams/13584/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "Gegevens"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Label"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Documenten"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.mo
index 44395f60bb..a3d5478564 100644
Binary files a/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.po
index e7aa3023b5..d4bfc429ad 100644
--- a/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/pl/LC_MESSAGES/django.po
@@ -2,24 +2,26 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Wojtek Warczakowski <w.warczakowski@gmail.com>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/rosarior/teams/13584/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +57,32 @@ msgstr ""
 msgid "Details"
 msgstr "Szczegóły"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Etykieta"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +123,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.mo
index 38ac4a50ef..df3c310512 100644
Binary files a/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.po
index 39bf9251bd..84f2af86fc 100644
--- a/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/pt/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emerson Soares <on.emersonsoares@gmail.com>, 2017\n"
-"Language-Team: Portuguese (https://www.transifex.com/rosarior/teams/13584/pt/)\n"
+"Language-Team: Portuguese (https://www.transifex.com/rosarior/teams/13584/"
+"pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "Detalhes"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Nome"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Documentos"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.mo
index 433a24910b..fed1d3ef24 100644
Binary files a/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.po
index 30a8f7a28b..e8f8ac1781 100644
--- a/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/pt_BR/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jadson Ribeiro <jadsonbr@outlook.com.br>, 2017\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/rosarior/teams/13584/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/rosarior/"
+"teams/13584/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr "Pasta"
 
@@ -55,32 +56,32 @@ msgstr "Todos"
 msgid "Details"
 msgstr "Detalhes"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Etiqueta"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Documento"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr "Pasta"
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr "Pai e Rótulo"
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr "%(model_name)s com estes %(field_labels)s já exitem. "
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr "Pasta de documentos"
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr "Pastas de documentos"
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr "O nome deste nível de pasta anexado aos nomes de seus antepassados."
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 "URL do ponto de extremidade da API mostrando os documentos da lista dentro "
 "desta pasta."
@@ -138,8 +138,8 @@ msgid ""
 "API URL pointing to a document in relation to the cabinet storing it. This "
 "URL is different than the canonical document URL."
 msgstr ""
-"API URL que aponta para um documento em relação à pasta que o armazena. Este"
-" URL é diferente do URL do documento que está de acordo com as normas "
+"API URL que aponta para um documento em relação à pasta que o armazena. Este "
+"URL é diferente do URL do documento que está de acordo com as normas "
 "estabelecidas."
 
 #: templates/cabinets/cabinet_details.html:21
diff --git a/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.mo
index 43ca149158..b22e9e2db2 100644
Binary files a/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.po
index cb35ff51a8..5c6ab7f608 100644
--- a/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/ro_RO/LC_MESSAGES/django.po
@@ -2,24 +2,26 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Badea Gabriel <gcbadea@gmail.com>, 2017\n"
-"Language-Team: Romanian (Romania) (https://www.transifex.com/rosarior/teams/13584/ro_RO/)\n"
+"Language-Team: Romanian (Romania) (https://www.transifex.com/rosarior/"
+"teams/13584/ro_RO/)\n"
+"Language: ro_RO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +57,32 @@ msgstr ""
 msgid "Details"
 msgstr "Detalii"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Etichetă"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Documente"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +123,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.mo
index 664edf513f..4c7292017d 100644
Binary files a/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.po
index 91df5ae750..bb9aed3b6e 100644
--- a/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/ru/LC_MESSAGES/django.po
@@ -2,24 +2,26 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: panasoft <cc072aa3@opayq.com>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/rosarior/teams/13584/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +57,32 @@ msgstr ""
 msgid "Details"
 msgstr "Детали"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Ярлык"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Документы"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +123,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.mo
index e6b1194550..276e01dd4b 100644
Binary files a/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.po
index ecc6211c5a..65c14111f8 100644
--- a/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/sl_SI/LC_MESSAGES/django.po
@@ -2,24 +2,26 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: kontrabant <kontrabant@gmail.com>, 2017\n"
-"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/rosarior/teams/13584/sl_SI/)\n"
+"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/rosarior/"
+"teams/13584/sl_SI/)\n"
+"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +57,32 @@ msgstr ""
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr "Oznaka"
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +123,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.mo
index 7ad905fda2..8c3f44e085 100644
Binary files a/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.po
index d9b3697a91..509c8cde4a 100644
--- a/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/vi_VN/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Trung Phan Minh <navmobile@gmail.com>, 2017\n"
-"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/rosarior/teams/13584/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/rosarior/"
+"teams/13584/vi_VN/)\n"
+"Language: vi_VN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "Chi tiết"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "Tài liệu"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.mo
index a700c5debc..717be4acef 100644
Binary files a/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.po
index ff4b7fcc79..df54e0fab9 100644
--- a/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/cabinets/locale/zh_CN/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Genlin Jiao <jiaogl@pkusz.edu.cn>, 2017\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/rosarior/teams/13584/zh_CN/)\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/rosarior/"
+"teams/13584/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:33 forms.py:30 links.py:21 menus.py:8 models.py:34 permissions.py:7
-#: views.py:153
+#: apps.py:34 apps.py:70 apps.py:73 forms.py:30 links.py:21 menus.py:8
+#: models.py:36 permissions.py:7 views.py:153
 msgid "Cabinets"
 msgstr ""
 
@@ -55,32 +56,32 @@ msgstr ""
 msgid "Details"
 msgstr "细节"
 
-#: models.py:22
+#: models.py:24 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:25
+#: models.py:27
 msgid "Documents"
 msgstr "文档"
 
-#: models.py:33 models.py:66 serializers.py:134
+#: models.py:35 models.py:68 serializers.py:134
 msgid "Cabinet"
 msgstr ""
 
-#: models.py:67 serializers.py:135
+#: models.py:69 serializers.py:135
 msgid "Parent and Label"
 msgstr ""
 
-#: models.py:74 serializers.py:141
+#: models.py:76 serializers.py:141
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: models.py:86
+#: models.py:88
 msgid "Document cabinet"
 msgstr ""
 
-#: models.py:87
+#: models.py:89
 msgid "Document cabinets"
 msgstr ""
 
@@ -121,8 +122,7 @@ msgid "The name of this cabinet level appended to the names of its ancestors."
 msgstr ""
 
 #: serializers.py:33
-msgid ""
-"URL of the API endpoint showing the list documents inside this cabinet."
+msgid "URL of the API endpoint showing the list documents inside this cabinet."
 msgstr ""
 
 #: serializers.py:69 serializers.py:175
diff --git a/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.mo
index f1a5c523cb..3a2ea20824 100644
Binary files a/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.po
index bba43ddaa4..ed12568a9c 100644
--- a/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,11 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -156,6 +156,18 @@ msgstr "Check out documents"
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -230,9 +242,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -291,9 +300,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.mo
index c532d89e76..df90bfbdbd 100644
Binary files a/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.po
index 20e9c283b1..cbd3375519 100644
--- a/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr "Провери документи"
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -290,9 +299,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.mo
index 244f511abc..51093d6c4f 100644
Binary files a/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.po
index 573005f66c..a365b85bcc 100644
--- a/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -20,11 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -156,6 +156,18 @@ msgstr "Odjaviti dokumente"
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -230,9 +242,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -291,9 +300,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.mo
index 866a2d6618..151dc58e95 100644
Binary files a/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.po
index 18bb8bed68..18ce4b1f78 100644
--- a/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr ""
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -290,9 +299,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.mo
index 1fc3613b37..7c26cdc305 100644
Binary files a/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.po
index 0e9eb6867d..245893c5ee 100644
--- a/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-24 20:58+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -21,11 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Ausbuchungen"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr "Ausgebuchte Dokumente"
 
@@ -157,6 +157,18 @@ msgstr "Dokumente ausbuchen"
 msgid "Check out details view"
 msgstr "Ansicht der Ausbuchungsdetails"
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Ausgebucht"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -233,9 +245,6 @@ msgstr "Einheit"
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.mo
index c0f0f1839a..afa5902148 100644
Binary files a/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.po
index 05054a24c4..9951969ea8 100644
--- a/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2012-07-10 15:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 #, fuzzy
 msgid "Checkouts"
 msgstr "checkouts"
 
-#: apps.py:54
+#: apps.py:55
 #, fuzzy
 #| msgid "checked out documents"
 msgid "Checkedout documents"
@@ -182,6 +182,16 @@ msgstr "Check out documents"
 msgid "Check out details view"
 msgstr "check out date and time"
 
+#: queues.py:8
+#, fuzzy
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+msgid "Check expired checkouts"
+msgstr "checked out"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -267,10 +277,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#, fuzzy
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.mo
index 89bdac4bd4..bba19a7104 100644
Binary files a/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.po
index a924606602..85c130198e 100644
--- a/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Reservaciones"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -156,6 +156,18 @@ msgstr "Reservar documentos"
 msgid "Check out details view"
 msgstr "Detalles de la reserva"
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Reservado"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -232,9 +244,6 @@ msgstr "Periodo"
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.mo
index 9c3525a92a..c3e33ac2bb 100644
Binary files a/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.po
index 23d252da6f..2fbf50db30 100644
--- a/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "خروج Checkout"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr "خروج اسناد"
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "خارج شده checked out"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.mo
index d57113d23f..5b25b85324 100644
Binary files a/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.po
index a87fd7103e..708128ba36 100644
--- a/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,11 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Verrous"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -158,6 +158,18 @@ msgstr "Verrouiller les documents"
 msgid "Check out details view"
 msgstr "Afficher la vue détaillée"
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Verrouillé"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -234,9 +246,6 @@ msgstr "Période"
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.mo
index 463ee089eb..4a61eb50b9 100644
Binary files a/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.po
index abe0b62080..0af5675b62 100644
--- a/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr ""
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -290,9 +299,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.mo
index 491e52b43c..e8987e0abc 100644
Binary files a/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.po
index 542b9274a4..4bda962e97 100644
--- a/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr ""
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -290,9 +299,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.mo
index aac561636e..1c67a5f24f 100644
Binary files a/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.po
index 0b9f1c61d7..076d1f6bc0 100644
--- a/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Uscite"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -156,6 +156,18 @@ msgstr "Check out dei documenti"
 msgid "Check out details view"
 msgstr "Visualizzazione in dettaglio dell'uscita"
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Uscito"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -232,9 +244,6 @@ msgstr "Periodo"
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.mo
index 30332d37cc..75a92e4351 100644
Binary files a/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.po
index ad0c7df333..985dc5452e 100644
--- a/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -21,11 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Checkouts"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -157,6 +157,18 @@ msgstr ""
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Uit-checken"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -231,9 +243,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.mo
index 56a3b9f021..51e022a57e 100644
Binary files a/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.po
index c67664f851..3bad4285d1 100644
--- a/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -22,11 +22,11 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Blokady"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -159,6 +159,18 @@ msgstr "Zablokuj dokumenty"
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Zablokowany"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -235,9 +247,6 @@ msgstr "Okres"
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.mo
index 64cc7f02d7..c332902cda 100644
Binary files a/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.po
index 8451be6613..a7bc3e612d 100644
--- a/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr ""
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -290,9 +299,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.mo
index 610f22c0e3..bd9f21f560 100644
Binary files a/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.po
index 577f04a770..58733e43a7 100644
--- a/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Reservas"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -156,6 +156,18 @@ msgstr "Reservar documentos"
 msgid "Check out details view"
 msgstr "Detalhes da reserva"
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Reservado"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -232,9 +244,6 @@ msgstr "Período"
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.mo
index b6b42f09c3..7ea8fca599 100644
Binary files a/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.po
index 7b9da13d90..d130b3086d 100644
--- a/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -20,11 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -157,6 +157,18 @@ msgstr "Aprobări documente"
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -231,9 +243,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -292,9 +301,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.mo
index 6477791449..07f0b8193b 100644
Binary files a/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.po
index d8b4663074..dd716d078e 100644
--- a/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,11 +22,11 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Забронированные документы"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -158,6 +158,18 @@ msgstr "Бронирование документов"
 msgid "Check out details view"
 msgstr "Подробности бронирования"
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Разбронирован"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -232,9 +244,6 @@ msgstr "Интервал"
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.mo
index 1707b87c14..c606b13329 100644
Binary files a/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.po
index 05c61a83f9..b031ac59ac 100644
--- a/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-23 16:43+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -20,11 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr "Odjave"
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -156,6 +156,18 @@ msgstr ""
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Checked out"
+msgid "Check expired checkouts"
+msgstr "Odjavljen"
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -230,9 +242,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
diff --git a/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.mo
index 80ba6e692a..b24ff2837d 100644
Binary files a/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.po
index ef4bca3844..948b253d7b 100644
--- a/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr ""
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -290,9 +299,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.mo
index 03521f78b6..4f416f4cb1 100644
Binary files a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
index 6b0eaf2c07..5bab2f1b82 100644
--- a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:35 links.py:30
+#: apps.py:36 links.py:30
 msgid "Checkouts"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:55
 msgid "Checkedout documents"
 msgstr ""
 
@@ -155,6 +155,18 @@ msgstr "检出文档"
 msgid "Check out details view"
 msgstr ""
 
+#: queues.py:8
+#, fuzzy
+#| msgid "Checkout user"
+msgid "Checkouts periodic"
+msgstr "checkout user"
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Check expired check out documents and checks them in."
+msgid "Check expired checkouts"
+msgstr "Check expired check out documents and checks them in."
+
 #: views.py:53
 #, python-format
 msgid "Error trying to check out document; %s"
@@ -229,9 +241,6 @@ msgstr ""
 #~ msgid "Allow overriding check out restrictions"
 #~ msgstr "Allow overriding check out restrictions"
 
-#~ msgid "Checkout user"
-#~ msgstr "checkout user"
-
 #~ msgid "Are you sure you wish to check in document: %s?"
 #~ msgstr "Are you sure you wish to check in document: %s?"
 
@@ -290,9 +299,6 @@ msgstr ""
 #~ msgid "no"
 #~ msgstr "no"
 
-#~ msgid "Check expired check out documents and checks them in."
-#~ msgstr "Check expired check out documents and checks them in."
-
 #~ msgid "check out document"
 #~ msgstr "check out document"
 
diff --git a/mayan/apps/common/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/common/locale/ar/LC_MESSAGES/django.mo
index 2dd2a8762e..e2c407816c 100644
Binary files a/mayan/apps/common/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/ar/LC_MESSAGES/django.po b/mayan/apps/common/locale/ar/LC_MESSAGES/django.po
index 757aa039ce..dce3f6b40c 100644
--- a/mayan/apps/common/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/ar/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Mohammed ALDOUB <voulnet@gmail.com>, 2013
@@ -9,22 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
+"ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -134,7 +136,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -208,14 +210,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -227,14 +240,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +277,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -271,7 +286,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -325,11 +339,11 @@ msgstr "لا شيء"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +352,11 @@ msgstr "لا شيء"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/common/locale/bg/LC_MESSAGES/django.mo
index 55167efbb7..00bf1d9390 100644
Binary files a/mayan/apps/common/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/bg/LC_MESSAGES/django.po b/mayan/apps/common/locale/bg/LC_MESSAGES/django.po
index ebb1c7eeb7..dee772d2b3 100644
--- a/mayan/apps/common/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/bg/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Pavlin Koldamov <pkoldamov@gmail.com>, 2012
@@ -9,22 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
+"language/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -134,7 +135,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -208,14 +209,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -227,14 +239,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +276,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -271,7 +285,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -325,11 +338,11 @@ msgstr "Няма"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +351,11 @@ msgstr "Няма"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.mo
index df4283b36e..2395d4b7dc 100644
Binary files a/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po
index e940736455..f8d4af6842 100644
--- a/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # www.ping.ba <jomer@ping.ba>, 2013
@@ -9,22 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/rosarior/mayan-edms/language/bs_BA/)\n"
+"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
+"rosarior/mayan-edms/language/bs_BA/)\n"
+"Language: bs_BA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bs_BA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -134,7 +136,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -208,14 +210,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -227,14 +240,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +277,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -271,7 +286,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -325,11 +339,11 @@ msgstr "Nijedno"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +352,11 @@ msgstr "Nijedno"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/da/LC_MESSAGES/django.mo b/mayan/apps/common/locale/da/LC_MESSAGES/django.mo
index 5d394f1322..e9cf0035e2 100644
Binary files a/mayan/apps/common/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/da/LC_MESSAGES/django.po b/mayan/apps/common/locale/da/LC_MESSAGES/django.po
index b27d524e05..f8d954c5c9 100644
--- a/mayan/apps/common/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/da/LC_MESSAGES/django.po
@@ -1,29 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
+"da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -133,7 +134,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -207,14 +208,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -226,14 +238,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -260,7 +275,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -270,7 +284,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -324,11 +337,11 @@ msgstr "Ingen"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -337,11 +350,11 @@ msgstr "Ingen"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.mo
index 7f65df7da2..6e9c5d4710 100644
Binary files a/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po
index 11396f66f0..cb1c450826 100644
--- a/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Berny <berny@bernhard-marx.de>, 2015-2016
@@ -13,22 +13,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-edms/language/de_DE/)\n"
+"Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
+"edms/language/de_DE/)\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Allgemein"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Verfügbare Attribute:"
 
 #: forms.py:26
@@ -138,7 +141,7 @@ msgstr "Einrichtung"
 msgid "Support"
 msgstr "Hilfe"
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Werkzeuge"
 
@@ -212,32 +215,51 @@ msgstr "Benutzerlokalisierungsprofil"
 msgid "User locale profiles"
 msgstr "Benutzerlokalisierungsprofile"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr "Protokollierung für alle Apps automatisch freischalten."
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
-msgstr "Zeit für die Verzögerung von Hintergrundaufgaben, die für ihre Fortsetzung auf einen Datenbankcommit warten."
+"Time to delay background tasks that depend on a database commit to propagate."
+msgstr ""
+"Zeit für die Verzögerung von Hintergrundaufgaben, die für ihre Fortsetzung "
+"auf einen Datenbankcommit warten."
 
 #: settings.py:27
 msgid "An integer specifying how many objects should be displayed per page."
-msgstr "Eine Ganzzahl, die die Anzahl der angezeigten Datensätze pro Seite angibt."
+msgstr ""
+"Eine Ganzzahl, die die Anzahl der angezeigten Datensätze pro Seite angibt."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
 msgstr "Datenbackend, das alle Worker benutzen können, um Dateien zu teilen"
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
-msgstr "Temporäres Verzeichnis zum systemweiten Speichern von Thumbnails, Vorschauen und temporären Dateien. "
+msgstr ""
+"Temporäres Verzeichnis zum systemweiten Speichern von Thumbnails, Vorschauen "
+"und temporären Dateien. "
+
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
 
 #: views.py:44
 #, python-format
@@ -265,7 +287,6 @@ msgid "Edit current user locale profile details"
 msgstr "Aktuelle Benutzerlokalisierungsdetails bearbeiten"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Filterauswahl"
 
@@ -275,7 +296,6 @@ msgid "Results for filter: %s"
 msgstr "Ergebnis für Filter %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Filter nicht gefunden"
 
@@ -329,11 +349,11 @@ msgstr "Kein(e)"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -342,11 +362,11 @@ msgstr "Kein(e)"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/en/LC_MESSAGES/django.mo b/mayan/apps/common/locale/en/LC_MESSAGES/django.mo
index 3e2ab7e3b0..23a59cc336 100644
Binary files a/mayan/apps/common/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/en/LC_MESSAGES/django.po b/mayan/apps/common/locale/en/LC_MESSAGES/django.po
index 5bfeaa6bed..dbe232a729 100644
--- a/mayan/apps/common/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -211,6 +211,18 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
@@ -242,6 +254,12 @@ msgstr ""
 "temporary files.  If none is specified, one will be created using tempfile."
 "mkdtemp()"
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
diff --git a/mayan/apps/common/locale/es/LC_MESSAGES/django.mo b/mayan/apps/common/locale/es/LC_MESSAGES/django.mo
index 694e01e63e..5ec65e28ec 100644
Binary files a/mayan/apps/common/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/es/LC_MESSAGES/django.po b/mayan/apps/common/locale/es/LC_MESSAGES/django.po
index be8390468c..65887070d3 100644
--- a/mayan/apps/common/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # jmcainzos <jmcainzos@vodafone.es>, 2014
@@ -12,22 +12,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Común"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Atributos disponibles:"
 
 #: forms.py:26
@@ -137,7 +140,7 @@ msgstr "Configuración"
 msgid "Support"
 msgstr "Apoyo"
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Herramientas"
 
@@ -211,32 +214,53 @@ msgstr "Perfil de localización de usuario"
 msgid "User locale profiles"
 msgstr "Perfiles de localización de usuario"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr "Activar bitácoras automáticamente a todas las aplicaciones."
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
-msgstr "Tiempo para retrasar las tareas de fondo que dependen de la propagación de información en la base de datos."
+"Time to delay background tasks that depend on a database commit to propagate."
+msgstr ""
+"Tiempo para retrasar las tareas de fondo que dependen de la propagación de "
+"información en la base de datos."
 
 #: settings.py:27
 msgid "An integer specifying how many objects should be displayed per page."
-msgstr "Un número entero que especifica cuántos objetos se debe mostrar por página."
+msgstr ""
+"Un número entero que especifica cuántos objetos se debe mostrar por página."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
-msgstr "Un soporte de almacenamiento que todos los 'workers' puedan utilizar para compartir archivos."
+msgstr ""
+"Un soporte de almacenamiento que todos los 'workers' puedan utilizar para "
+"compartir archivos."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
-msgstr "Directorio temporero utilizado en todo el sitio para almacenar imágenes en miniatura, visualizaciones y archivos temporeros."
+msgstr ""
+"Directorio temporero utilizado en todo el sitio para almacenar imágenes en "
+"miniatura, visualizaciones y archivos temporeros."
+
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
 
 #: views.py:44
 #, python-format
@@ -264,7 +288,6 @@ msgid "Edit current user locale profile details"
 msgstr "Editar los detalles del perfil del usuario local"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Selección de filtro"
 
@@ -274,7 +297,6 @@ msgid "Results for filter: %s"
 msgstr "Resultados para el filtro: %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Filtro no encontrado"
 
@@ -328,11 +350,11 @@ msgstr "Ninguno"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -341,11 +363,11 @@ msgstr "Ninguno"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/common/locale/fa/LC_MESSAGES/django.mo
index cf13935055..67f8b5621c 100644
Binary files a/mayan/apps/common/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/fa/LC_MESSAGES/django.po b/mayan/apps/common/locale/fa/LC_MESSAGES/django.po
index 8eb30a3c0c..46f4110852 100644
--- a/mayan/apps/common/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/fa/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2013
@@ -9,22 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/language/fa/)\n"
+"Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
+"language/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "خصوصیات موجود"
 
 #: forms.py:26
@@ -134,7 +137,7 @@ msgstr "نصب"
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "ابزار"
 
@@ -208,14 +211,25 @@ msgstr "پروفایل محلی کاربر"
 msgid "User locale profiles"
 msgstr "پروفایل محلی کاربر"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -227,14 +241,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr "محلی که کلیه کاربران جهت به اشتراک گذاری فایل میتوانند استفاه کنند."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +278,6 @@ msgid "Edit current user locale profile details"
 msgstr "ویرایش شرح پروفایل محلی کاربر فعلی"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -271,7 +287,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -325,11 +340,11 @@ msgstr "هیچکدام."
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +353,11 @@ msgstr "هیچکدام."
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/common/locale/fr/LC_MESSAGES/django.mo
index 26708e0823..e37a7a7502 100644
Binary files a/mayan/apps/common/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/fr/LC_MESSAGES/django.po b/mayan/apps/common/locale/fr/LC_MESSAGES/django.po
index 0e76f3d31f..b5c4057f88 100644
--- a/mayan/apps/common/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/fr/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Christophe CHAUVET <christophe.chauvet@gmail.com>, 2016
@@ -14,22 +14,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Commun"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Options disponibles"
 
 #: forms.py:26
@@ -139,7 +142,7 @@ msgstr "Configuration"
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Outils"
 
@@ -213,32 +216,53 @@ msgstr "Paramètres régionaux du profil utilisateur"
 msgid "User locale profiles"
 msgstr "Paramètres régionaux des profils utilisateur"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr "Activation automatique de la trace pour toutes les applications."
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
-msgstr "Durée pendant laquelle les tâches d'arrière plan sont différées pour les tâches dépendant d'une mise à jour de la base de données."
+"Time to delay background tasks that depend on a database commit to propagate."
+msgstr ""
+"Durée pendant laquelle les tâches d'arrière plan sont différées pour les "
+"tâches dépendant d'une mise à jour de la base de données."
 
 #: settings.py:27
 msgid "An integer specifying how many objects should be displayed per page."
-msgstr "Valeur entière indiquant combien d'objets sont affichés sur chaque page."
+msgstr ""
+"Valeur entière indiquant combien d'objets sont affichés sur chaque page."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
-msgstr "Un espace de stockage que tous les agents pourront utiliser pour partager des fichiers."
+msgstr ""
+"Un espace de stockage que tous les agents pourront utiliser pour partager "
+"des fichiers."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
-msgstr "Le dossier temporaire est utilisé pour stocker les vignettes, aperçus et fichiers temporaires."
+msgstr ""
+"Le dossier temporaire est utilisé pour stocker les vignettes, aperçus et "
+"fichiers temporaires."
+
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
 
 #: views.py:44
 #, python-format
@@ -266,7 +290,6 @@ msgid "Edit current user locale profile details"
 msgstr "Éditer le détail des paramètres régionaux de l'utilisateur actuel"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Sélection du filtre"
 
@@ -276,7 +299,6 @@ msgid "Results for filter: %s"
 msgstr "Résultats pour le filtre : %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Filtre non trouvé"
 
@@ -330,11 +352,11 @@ msgstr "Aucun"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -343,11 +365,11 @@ msgstr "Aucun"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/common/locale/hu/LC_MESSAGES/django.mo
index 185d04c9ca..8f74cea64b 100644
Binary files a/mayan/apps/common/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/hu/LC_MESSAGES/django.po b/mayan/apps/common/locale/hu/LC_MESSAGES/django.po
index d8c87144a1..311ae6318a 100644
--- a/mayan/apps/common/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/hu/LC_MESSAGES/django.po
@@ -1,29 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
+"language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -133,7 +134,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -207,14 +208,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -226,14 +238,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -260,7 +275,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -270,7 +284,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -324,11 +337,11 @@ msgstr "Semmi"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -337,11 +350,11 @@ msgstr "Semmi"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/id/LC_MESSAGES/django.mo b/mayan/apps/common/locale/id/LC_MESSAGES/django.mo
index 2a7206fd85..514493e774 100644
Binary files a/mayan/apps/common/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/id/LC_MESSAGES/django.po b/mayan/apps/common/locale/id/LC_MESSAGES/django.po
index f17422a746..fc8f736918 100644
--- a/mayan/apps/common/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/id/LC_MESSAGES/django.po
@@ -1,29 +1,32 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
+"language/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Atribut yang tersedia"
 
 #: forms.py:26
@@ -133,7 +136,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -207,14 +210,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -226,14 +240,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -260,7 +277,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -270,7 +286,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -324,11 +339,11 @@ msgstr ""
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -337,11 +352,11 @@ msgstr ""
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/it/LC_MESSAGES/django.mo b/mayan/apps/common/locale/it/LC_MESSAGES/django.mo
index d087fcc424..57ee404aef 100644
Binary files a/mayan/apps/common/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/it/LC_MESSAGES/django.po b/mayan/apps/common/locale/it/LC_MESSAGES/django.po
index cc579181f5..29f09544e7 100644
--- a/mayan/apps/common/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/it/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Carlo Zanatto <>, 2012
@@ -13,22 +13,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
+"language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Comune"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Attributi disponibili:"
 
 #: forms.py:26
@@ -138,7 +141,7 @@ msgstr "Configurazione"
 msgid "Support"
 msgstr "Supporto"
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Strumenti"
 
@@ -212,32 +215,53 @@ msgstr "Profilo utente locale"
 msgid "User locale profiles"
 msgstr "Profili dell'utente locale"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr "Abilita automaticamente i log per tutte le app."
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
-msgstr "Il ritardo per i task in background dipende dalla propagazione del commit su database."
+"Time to delay background tasks that depend on a database commit to propagate."
+msgstr ""
+"Il ritardo per i task in background dipende dalla propagazione del commit su "
+"database."
 
 #: settings.py:27
 msgid "An integer specifying how many objects should be displayed per page."
-msgstr "Un intero che specifica quanti oggetti devono essere visualizzati per pagina."
+msgstr ""
+"Un intero che specifica quanti oggetti devono essere visualizzati per pagina."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
-msgstr "Un backend di memorizzazione che tutti i lavoratori possono utilizzare per condividere i file."
+msgstr ""
+"Un backend di memorizzazione che tutti i lavoratori possono utilizzare per "
+"condividere i file."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
-msgstr "Directory temporanea utilizzata in tutto il sito per memorizzare, miniature, anteprime e files temporanei"
+msgstr ""
+"Directory temporanea utilizzata in tutto il sito per memorizzare, miniature, "
+"anteprime e files temporanei"
+
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
 
 #: views.py:44
 #, python-format
@@ -265,7 +289,6 @@ msgid "Edit current user locale profile details"
 msgstr "Modificare i dettagli del profilo corrente dell'utente"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Scegli il filtro"
 
@@ -275,7 +298,6 @@ msgid "Results for filter: %s"
 msgstr "Risultati per il filtro: %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Filtro non trovato"
 
@@ -329,11 +351,11 @@ msgstr "Nessuno"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -342,11 +364,11 @@ msgstr "Nessuno"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.mo
index c8b3982624..bd51324966 100644
Binary files a/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po
index f50f3eeb36..5c4100082f 100644
--- a/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Evelijn Saaltink <evelijnsaaltink@gmail.com>, 2016
@@ -11,22 +11,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-edms/language/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
+"edms/language/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Gemeenschappelijk"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Beschikbare eigenschappen:"
 
 #: forms.py:26
@@ -136,7 +139,7 @@ msgstr "Setup"
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Gereedschappen"
 
@@ -210,32 +213,53 @@ msgstr "Gebruikerslandsinstelling"
 msgid "User locale profiles"
 msgstr "Gebruikerslandinstellingen"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
-msgstr "Wachttijd voor achtergrondtaken die afhankelijk zijn van het verbreiden van een database commit."
+"Time to delay background tasks that depend on a database commit to propagate."
+msgstr ""
+"Wachttijd voor achtergrondtaken die afhankelijk zijn van het verbreiden van "
+"een database commit."
 
 #: settings.py:27
 msgid "An integer specifying how many objects should be displayed per page."
-msgstr "Een natuurlijk getal om aan te geven hoeveel objecten per pagina weergegeven worden."
+msgstr ""
+"Een natuurlijk getal om aan te geven hoeveel objecten per pagina weergegeven "
+"worden."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
-msgstr "Een opslagbackend die alle werkers kunnen gebruiken om bestanden te delen."
+msgstr ""
+"Een opslagbackend die alle werkers kunnen gebruiken om bestanden te delen."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
-msgstr "Globale instelling voor een tijdelijke folder om miniaturen, voorvertoningen en tijdelijke bestanden in op te slaan."
+msgstr ""
+"Globale instelling voor een tijdelijke folder om miniaturen, voorvertoningen "
+"en tijdelijke bestanden in op te slaan."
+
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
 
 #: views.py:44
 #, python-format
@@ -263,7 +287,6 @@ msgid "Edit current user locale profile details"
 msgstr "Wijzig landsinstellingen van de huidige gebruiker"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Filterselectie"
 
@@ -273,7 +296,6 @@ msgid "Results for filter: %s"
 msgstr "Resultaten voor filter: %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Filter niet gevonden"
 
@@ -327,11 +349,11 @@ msgstr "Geen"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -340,11 +362,11 @@ msgstr "Geen"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/common/locale/pl/LC_MESSAGES/django.mo
index bd6be8248f..c32d4d5f13 100644
Binary files a/mayan/apps/common/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/pl/LC_MESSAGES/django.po b/mayan/apps/common/locale/pl/LC_MESSAGES/django.po
index dd0a4cc1ca..cc2a69d4d0 100644
--- a/mayan/apps/common/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/pl/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Annunnaky <doublemiu@gmail.com>, 2015
@@ -13,22 +13,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Ustawienia wspólne"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Dostępne atrybuty:"
 
 #: forms.py:26
@@ -138,7 +143,7 @@ msgstr "Ustawienia"
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Narzędzia"
 
@@ -212,14 +217,25 @@ msgstr "Profil regionalny użytkownika"
 msgid "User locale profiles"
 msgstr "Profile regionalne użytkownika"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr "Włącz dla wszystkich aplikacji automatyczny zapis zdarzeń."
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr "Czas opóźnienia wykonania zadań zależnych od operacji na bazie danych."
 
 #: settings.py:27
@@ -228,17 +244,22 @@ msgstr "Liczba określająca ile obiektów będzie wyświetlane na stronie."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
-msgstr "Backend przechowywania umożliwiający wszystkim użytkownikom udostępnianie plików."
+msgstr ""
+"Backend przechowywania umożliwiający wszystkim użytkownikom udostępnianie "
+"plików."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -265,7 +286,6 @@ msgid "Edit current user locale profile details"
 msgstr "Edytuj profil regionalny użytkownika"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Wybór filtru"
 
@@ -275,7 +295,6 @@ msgid "Results for filter: %s"
 msgstr "Wyniki dla filtru: %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Nie znaleziono filtru"
 
@@ -329,11 +348,11 @@ msgstr "Brak"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -342,11 +361,11 @@ msgstr "Brak"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/common/locale/pt/LC_MESSAGES/django.mo
index 0ff16fb906..713d094449 100644
Binary files a/mayan/apps/common/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/pt/LC_MESSAGES/django.po b/mayan/apps/common/locale/pt/LC_MESSAGES/django.po
index 450308a7a6..75ad43c75c 100644
--- a/mayan/apps/common/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/pt/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Emerson Soares <on.emersonsoares@gmail.com>, 2011
@@ -11,22 +11,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
+"language/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -136,7 +137,7 @@ msgstr "Configuração"
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Ferramentas"
 
@@ -210,14 +211,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -229,14 +241,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -263,7 +278,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -273,7 +287,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -327,11 +340,11 @@ msgstr "Nenhum"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -340,11 +353,11 @@ msgstr "Nenhum"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.mo
index a219259a9e..81467262db 100644
Binary files a/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po
index b8f0a105f9..a428c62a25 100644
--- a/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Aline Freitas <aline@alinefreitas.com.br>, 2016
@@ -13,22 +13,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-edms/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
+"edms/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Comúm"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Atributos disponíveis:"
 
 #: forms.py:26
@@ -138,7 +141,7 @@ msgstr "Configurações"
 msgid "Support"
 msgstr "Suporte"
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Ferramentas"
 
@@ -212,32 +215,53 @@ msgstr "Perfil de localidade do usuário"
 msgid "User locale profiles"
 msgstr "Perfis de localidade do usuário"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr "Ativar automaticamente o registro de todos os aplicativos."
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
-msgstr "Tempo para atrasar as tarefas de fundo que dependem da propagação de informação na base de dados."
+"Time to delay background tasks that depend on a database commit to propagate."
+msgstr ""
+"Tempo para atrasar as tarefas de fundo que dependem da propagação de "
+"informação na base de dados."
 
 #: settings.py:27
 msgid "An integer specifying how many objects should be displayed per page."
-msgstr "Um número inteiro que especifica quantos objetos se deve mostrar por página."
+msgstr ""
+"Um número inteiro que especifica quantos objetos se deve mostrar por página."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
-msgstr "Um suporte de armazenamento que todos os trabalhadores podem usar para compartilhar arquivos."
+msgstr ""
+"Um suporte de armazenamento que todos os trabalhadores podem usar para "
+"compartilhar arquivos."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
-msgstr "Pasta temporária utilizada em todo o site para armazenar imagens em miniatura, visualizações e arquivos temporários."
+msgstr ""
+"Pasta temporária utilizada em todo o site para armazenar imagens em "
+"miniatura, visualizações e arquivos temporários."
+
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
 
 #: views.py:44
 #, python-format
@@ -265,7 +289,6 @@ msgid "Edit current user locale profile details"
 msgstr "Editar detalhes do perfil de localização do usuário atual"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Seleção de filtro"
 
@@ -275,7 +298,6 @@ msgid "Results for filter: %s"
 msgstr "Resultados para o filtro: %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Filtro não encontrado"
 
@@ -329,11 +351,11 @@ msgstr "Nenhum"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -342,11 +364,11 @@ msgstr "Nenhum"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.mo
index 9ae9e63f40..c907ca86f1 100644
Binary files a/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po
index 9dbf22816c..bb1acec5d3 100644
--- a/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Badea Gabriel <gcbadea@gmail.com>, 2013
@@ -9,22 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-edms/language/ro_RO/)\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
+"edms/language/ro_RO/)\n"
+"Language: ro_RO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -134,7 +136,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -208,14 +210,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -227,14 +240,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +277,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -271,7 +286,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -325,11 +339,11 @@ msgstr "Nici unul"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +352,11 @@ msgstr "Nici unul"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/common/locale/ru/LC_MESSAGES/django.mo
index 8a4d01e50c..2d257bcc3a 100644
Binary files a/mayan/apps/common/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/ru/LC_MESSAGES/django.po b/mayan/apps/common/locale/ru/LC_MESSAGES/django.po
index 4ff45ef7dd..02c8e11bd4 100644
--- a/mayan/apps/common/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/ru/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # lilo.panic, 2016
@@ -9,22 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
+"language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr "Общий"
 
 #: classes.py:106
-msgid "Available attributes: "
+#, fuzzy
+#| msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr "Доступные атрибуты:"
 
 #: forms.py:26
@@ -134,7 +139,7 @@ msgstr "Настройки"
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr "Инструменты"
 
@@ -208,33 +213,54 @@ msgstr "Профиль локали пользователя"
 msgid "User locale profiles"
 msgstr "Профили локали пользователей"
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
-msgstr "Автоматически разрешать всем установленным приложениям делать записи в журнале."
+msgstr ""
+"Автоматически разрешать всем установленным приложениям делать записи в "
+"журнале."
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
-msgstr "Время задержки фоновых задач зависящих от процесса распространения записанных в БД данных."
+"Time to delay background tasks that depend on a database commit to propagate."
+msgstr ""
+"Время задержки фоновых задач зависящих от процесса распространения "
+"записанных в БД данных."
 
 #: settings.py:27
 msgid "An integer specifying how many objects should be displayed per page."
-msgstr "Числовое значение указывающее как много объектов может быть отображено на одной странице."
+msgstr ""
+"Числовое значение указывающее как много объектов может быть отображено на "
+"одной странице."
 
 #: settings.py:33
 msgid "A storage backend that all workers can use to share files."
-msgstr "Бекенд хранения, который каждый может использовать для хранения файлов."
+msgstr ""
+"Бекенд хранения, который каждый может использовать для хранения файлов."
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +287,6 @@ msgid "Edit current user locale profile details"
 msgstr "Редактировать настройки локали текущего пользователя"
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr "Фильтр по выбранным"
 
@@ -271,7 +296,6 @@ msgid "Results for filter: %s"
 msgstr "Результаты для фильтра: %s"
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr "Фильтр не найден"
 
@@ -325,11 +349,11 @@ msgstr "Ни один"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +362,11 @@ msgstr "Ни один"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.mo
index 4eb7d47b7c..216b10fee4 100644
Binary files a/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po
index bea92c9315..a9dca832c7 100644
--- a/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po
@@ -1,29 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-edms/language/sl_SI/)\n"
+"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
+"edms/language/sl_SI/)\n"
+"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -133,7 +135,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -207,14 +209,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -226,14 +239,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -260,7 +276,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -270,7 +285,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -324,11 +338,11 @@ msgstr "Brez"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -337,11 +351,11 @@ msgstr "Brez"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.mo
index 0c06023076..c87eb231ad 100644
Binary files a/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po
index 276fbd654a..9b7c04e500 100644
--- a/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Trung Phan Minh <navmobile@gmail.com>, 2013
@@ -9,22 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/mayan-edms/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
+"mayan-edms/language/vi_VN/)\n"
+"Language: vi_VN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -134,7 +135,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -208,14 +209,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -227,14 +239,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +276,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -271,7 +285,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -325,11 +338,11 @@ msgstr "None"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +351,11 @@ msgstr "None"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.mo
index 8397ff868c..5f014596e7 100644
Binary files a/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.po
index 3fbb2b89cd..92e5934003 100644
--- a/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Ford Guo <agile.guo@gmail.com>, 2014
@@ -9,22 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:52+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:76 settings.py:9
+#: apps.py:77 settings.py:9
 msgid "Common"
 msgstr ""
 
 #: classes.py:106
-msgid "Available attributes: "
+msgid "Available attributes: \n"
 msgstr ""
 
 #: forms.py:26
@@ -134,7 +135,7 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: links.py:61 views.py:234
+#: links.py:61 queues.py:10 views.py:234
 msgid "Tools"
 msgstr ""
 
@@ -208,14 +209,25 @@ msgstr ""
 msgid "User locale profiles"
 msgstr ""
 
+#: queues.py:8
+msgid "Default"
+msgstr ""
+
+#: queues.py:12
+msgid "Common periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Delete stale uploads"
+msgstr ""
+
 #: settings.py:13
 msgid "Automatically enable logging to all apps."
 msgstr ""
 
 #: settings.py:19
 msgid ""
-"Time to delay background tasks that depend on a database commit to "
-"propagate."
+"Time to delay background tasks that depend on a database commit to propagate."
 msgstr ""
 
 #: settings.py:27
@@ -227,14 +239,17 @@ msgid "A storage backend that all workers can use to share files."
 msgstr ""
 
 #: settings.py:38
-#| msgid ""
-#| "ary directory used site wide to store thumbnails, previews and porary es.  "
-#| "If none is specified, one will be created using pfile.mkdtemp()"
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
 "temporary files."
 msgstr ""
 
+#: validators.py:29
+msgid ""
+"Enter a valid 'internal name' consisting of letters, numbers, and "
+"underscores."
+msgstr ""
+
 #: views.py:44
 #, python-format
 msgid "The version you are using is outdated. The latest version is %s"
@@ -261,7 +276,6 @@ msgid "Edit current user locale profile details"
 msgstr ""
 
 #: views.py:153
-#| msgid "Selection"
 msgid "Filter selection"
 msgstr ""
 
@@ -271,7 +285,6 @@ msgid "Results for filter: %s"
 msgstr ""
 
 #: views.py:176
-#| msgid "Page not found"
 msgid "Filter not found"
 msgstr ""
 
@@ -325,11 +338,11 @@ msgstr "无"
 #~ msgstr "Email"
 
 #~ msgid ""
-#~ "Please enter a correct email and password. Note that the password field is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password field "
+#~ "is case-sensitive."
 #~ msgstr ""
-#~ "Please enter a correct email and password. Note that the password fields is "
-#~ "case-sensitive."
+#~ "Please enter a correct email and password. Note that the password fields "
+#~ "is case-sensitive."
 
 #~ msgid "This account is inactive."
 #~ msgstr "This account is inactive."
@@ -338,11 +351,11 @@ msgstr "无"
 #~ msgstr "change password"
 
 #~ msgid ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 #~ msgstr ""
-#~ "Controls the mechanism used to authenticated user.  Options are: username, "
-#~ "email"
+#~ "Controls the mechanism used to authenticated user.  Options are: "
+#~ "username, email"
 
 #~ msgid "Allow non authenticated users, access to all views"
 #~ msgstr "Allow non authenticated users, access to all views"
diff --git a/mayan/apps/converter/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/ar/LC_MESSAGES/django.mo
index 7001557bec..9808abf46f 100644
Binary files a/mayan/apps/converter/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/ar/LC_MESSAGES/django.po b/mayan/apps/converter/locale/ar/LC_MESSAGES/django.po
index 831c9e9834..7336024f02 100644
--- a/mayan/apps/converter/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -51,47 +51,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "تغيير حجم"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "تدوير"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "التكبير"
 
diff --git a/mayan/apps/converter/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/bg/LC_MESSAGES/django.mo
index 0d5e7cb300..11f28c09b9 100644
Binary files a/mayan/apps/converter/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/bg/LC_MESSAGES/django.po b/mayan/apps/converter/locale/bg/LC_MESSAGES/django.po
index 489067b6b0..8c716e36b2 100644
--- a/mayan/apps/converter/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -50,47 +50,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Преоразмеряване"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Завъртете"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Увеличаване"
 
diff --git a/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.mo
index 5198675fd5..c868eef9ee 100644
Binary files a/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.po
index f0a025dd87..f6beb4aacb 100644
--- a/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -51,47 +51,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Promjeni veličinu"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Rotiraj"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Uvećaj"
 
diff --git a/mayan/apps/converter/locale/da/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/da/LC_MESSAGES/django.mo
index f23b4ea6c8..3152e16c70 100644
Binary files a/mayan/apps/converter/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/da/LC_MESSAGES/django.po b/mayan/apps/converter/locale/da/LC_MESSAGES/django.po
index de27b2f13c..0dfbcbcc77 100644
--- a/mayan/apps/converter/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -49,47 +49,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr ""
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr ""
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr ""
 
diff --git a/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.mo
index 8d91780eff..b19eb0c0a5 100644
Binary files a/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.po
index c33287bf95..6ce1a6ab1d 100644
--- a/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-24 23:01+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -38,7 +38,7 @@ msgstr "Transformation"
 msgid "Arguments"
 msgstr "Argumente"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Ausnahme bei der Ermittlung der PDF-Seitenanzahl: %s"
@@ -52,47 +52,47 @@ msgstr "Kein Office-Dateiformat"
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr "LibreOffice nicht installiert oder in Pfad %s nicht gefunden"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Zuschneiden"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr "Drehen"
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr "Gaußsche Unschärfe"
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr "Spiegeln"
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Größe ändern"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Drehen"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr "Um 90° drehen"
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr "Um 180° drehen"
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr "Um 270° drehen"
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr "Unscharf maskieren"
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Zoom"
 
diff --git a/mayan/apps/converter/locale/en/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/en/LC_MESSAGES/django.mo
index 428677b3f4..ce74575501 100644
Binary files a/mayan/apps/converter/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/en/LC_MESSAGES/django.po b/mayan/apps/converter/locale/en/LC_MESSAGES/django.po
index a71299f9e3..1e3896dcf6 100644
--- a/mayan/apps/converter/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -50,53 +50,53 @@ msgstr "suported file formats"
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Resize"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Rotate"
 
-#: classes.py:382
+#: classes.py:386
 #, fuzzy
 #| msgid "Rotate by n degress."
 msgid "Rotate 90 degrees"
 msgstr "Rotate by n degress."
 
-#: classes.py:393
+#: classes.py:397
 #, fuzzy
 #| msgid "Rotate by n degress."
 msgid "Rotate 180 degrees"
 msgstr "Rotate by n degress."
 
-#: classes.py:404
+#: classes.py:408
 #, fuzzy
 #| msgid "Rotate by n degress."
 msgid "Rotate 270 degrees"
 msgstr "Rotate by n degress."
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Zoom"
 
diff --git a/mayan/apps/converter/locale/es/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/es/LC_MESSAGES/django.mo
index 627dcde7bd..000394d491 100644
Binary files a/mayan/apps/converter/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/es/LC_MESSAGES/django.po b/mayan/apps/converter/locale/es/LC_MESSAGES/django.po
index b1c8d5121f..13e01a3ee6 100644
--- a/mayan/apps/converter/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # Lory977 <helga.carrero@gmail.com>, 2015
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-05-28 19:57+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: apps.py:19 permissions.py:7 settings.py:7
@@ -36,13 +37,12 @@ msgstr "Transformación"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Excepción determinando el número de páginas del PDF; %s"
 
 #: classes.py:97
-#| msgid "suported file formats"
 msgid "Not an office file format."
 msgstr "No es un formato de archivo de la oficina."
 
@@ -51,50 +51,47 @@ msgstr "No es un formato de archivo de la oficina."
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr "LibreOffice no instalado o no encontrado en: %s"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Recortar"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr "Dar la vuelta"
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr "Desenfoque gaussiano"
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr "Espejo"
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Cambiar el tamaño"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Girar"
 
-#: classes.py:382
-#| msgid "Rotate by n degress."
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr "Girar 90 grados"
 
-#: classes.py:393
-#| msgid "Rotate by n degress."
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr "Girar 180 grados"
 
-#: classes.py:404
-#| msgid "Rotate by n degress."
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr "Girar 270 grados"
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr "Unsharp masking"
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Ampliar"
 
@@ -118,7 +115,9 @@ msgstr "Transformaciones"
 msgid ""
 "Order in which the transformations will be executed. If left unchanged, an "
 "automatic order value will be assigned."
-msgstr "Orden de ejecución de las transformaciones. Si lo deja en blanco, un valor de orden sera asignado automáticamente. "
+msgstr ""
+"Orden de ejecución de las transformaciones. Si lo deja en blanco, un valor "
+"de orden sera asignado automáticamente. "
 
 #: models.py:44
 msgid "Name"
@@ -128,7 +127,9 @@ msgstr "Nombre"
 msgid ""
 "Enter the arguments for the transformation as a YAML dictionary. ie: "
 "{\"degrees\": 180}"
-msgstr "Entre el argumento de la transformación como un diccionario YAML. Ejemplo: {\"degrees\": 180}"
+msgstr ""
+"Entre el argumento de la transformación como un diccionario YAML. Ejemplo: "
+"{\"degrees\": 180}"
 
 #: permissions.py:10
 msgid "Create new transformations"
@@ -143,7 +144,6 @@ msgid "Edit transformations"
 msgstr "Editar transformaciones"
 
 #: permissions.py:19
-#| msgid "Raw application information"
 msgid "View existing transformations"
 msgstr "Ver transformaciones existentes"
 
@@ -166,7 +166,8 @@ msgstr "Entre un valor YAML."
 #: views.py:64
 #, python-format
 msgid "Delete transformation \"%(transformation)s\" for: %(content_object)s?"
-msgstr "¿Borrar transformación \"%(transformation)s\" para: %(content_object)s?"
+msgstr ""
+"¿Borrar transformación \"%(transformation)s\" para: %(content_object)s?"
 
 #: views.py:127
 #, python-format
@@ -217,14 +218,13 @@ msgstr "Transformaciones para: %s"
 #~ msgstr "File path to graphicsmagick's program."
 
 #~ msgid ""
-#~ "Graphics conversion backend to use.  Options are: "
-#~ "converter.backends.imagemagick.ImageMagick, "
-#~ "converter.backends.graphicsmagick.GraphicsMagick and "
-#~ "converter.backends.python.Python"
+#~ "Graphics conversion backend to use.  Options are: converter.backends."
+#~ "imagemagick.ImageMagick, converter.backends.graphicsmagick.GraphicsMagick "
+#~ "and converter.backends.python.Python"
 #~ msgstr ""
-#~ "Graphics conversion backend to use.  Options are: "
-#~ "converter.backends.imagemagick, converter.backends.graphicsmagick and "
-#~ "converter.backends.python."
+#~ "Graphics conversion backend to use.  Options are: converter.backends."
+#~ "imagemagick, converter.backends.graphicsmagick and converter.backends."
+#~ "python."
 
 #~ msgid "Help"
 #~ msgstr "Help"
@@ -537,9 +537,11 @@ msgstr "Transformaciones para: %s"
 #~ msgstr "Magick Image File Format"
 
 #~ msgid ""
-#~ "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
+#~ "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib "
+#~ "1.2.3.3,1.2.3.4)"
 #~ msgstr ""
-#~ "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
+#~ "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib "
+#~ "1.2.3.3,1.2.3.4)"
 
 #~ msgid "Raw Bi-level bitmap in least-significant-byte first order"
 #~ msgstr "Raw Bi-level bitmap in least-significant-byte first order"
@@ -655,7 +657,8 @@ msgstr "Transformaciones para: %s"
 #~ msgid "Joint Photographic Experts Group JFIF format (62)"
 #~ msgstr "Joint Photographic Experts Group JFIF format (62)"
 
-#~ msgid "Portable Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
+#~ msgid ""
+#~ "Portable Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 #~ msgstr ""
 #~ "Portable Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 
diff --git a/mayan/apps/converter/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/fa/LC_MESSAGES/django.mo
index 668293dfc8..bf3e2d2298 100644
Binary files a/mayan/apps/converter/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/fa/LC_MESSAGES/django.po b/mayan/apps/converter/locale/fa/LC_MESSAGES/django.po
index 108c8ece61..0e330ec173 100644
--- a/mayan/apps/converter/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -35,7 +35,7 @@ msgstr "تبدیلات"
 msgid "Arguments"
 msgstr "آرگومانها"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -49,47 +49,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "تغییر اندازه"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "چرخاندن"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "بزرگ/کوچک نمایی"
 
diff --git a/mayan/apps/converter/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/fr/LC_MESSAGES/django.mo
index 3cd0038b18..b115aa52e8 100644
Binary files a/mayan/apps/converter/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/fr/LC_MESSAGES/django.po b/mayan/apps/converter/locale/fr/LC_MESSAGES/django.po
index 2a8122e666..abdae089b4 100644
--- a/mayan/apps/converter/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/fr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -37,7 +37,7 @@ msgstr "Transformation"
 msgid "Arguments"
 msgstr "Arguments"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Exception déterminant le nombre de pages PDF : %s"
@@ -52,47 +52,47 @@ msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 "LibreOffice n'est pas installé ou n'a pas été trouvé à l'emplacement : %s"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Découper"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Redimensionner"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Rotation"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Zoom"
 
diff --git a/mayan/apps/converter/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/hu/LC_MESSAGES/django.mo
index 17b689ffad..8fe2e24b46 100644
Binary files a/mayan/apps/converter/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/hu/LC_MESSAGES/django.po b/mayan/apps/converter/locale/hu/LC_MESSAGES/django.po
index 6f647b718b..eb8d6627f8 100644
--- a/mayan/apps/converter/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -49,47 +49,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr ""
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr ""
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr ""
 
diff --git a/mayan/apps/converter/locale/id/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/id/LC_MESSAGES/django.mo
index d4299869ae..14bd648fa1 100644
Binary files a/mayan/apps/converter/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/id/LC_MESSAGES/django.po b/mayan/apps/converter/locale/id/LC_MESSAGES/django.po
index ba8e678612..f3af8aa621 100644
--- a/mayan/apps/converter/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -49,47 +49,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr ""
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr ""
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr ""
 
diff --git a/mayan/apps/converter/locale/it/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/it/LC_MESSAGES/django.mo
index e082ca177a..d6f6c6cd36 100644
Binary files a/mayan/apps/converter/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/it/LC_MESSAGES/django.po b/mayan/apps/converter/locale/it/LC_MESSAGES/django.po
index a6e7272bf9..50b4212f13 100644
--- a/mayan/apps/converter/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -37,7 +37,7 @@ msgstr "Trasformazione"
 msgid "Arguments"
 msgstr "Argomenti"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Eccezione che determina il conteggio pagine PDF: %s"
@@ -51,47 +51,47 @@ msgstr "Non è un formato di file office"
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr "LibreOffice non installato o non trovato nel percorso: %s"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Taglia"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Ruotare"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Zoom"
 
diff --git a/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.mo
index e27e5c0b1e..576bc4f12e 100644
Binary files a/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.po
index 42c3bc5e6f..89d0012f55 100644
--- a/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -39,7 +39,7 @@ msgstr "Transformatie"
 msgid "Arguments"
 msgstr "Argumenten"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Exceptie bij het bepalen van aan aantal bladzijden van de PDF: %s"
@@ -53,47 +53,47 @@ msgstr "Geen office bestandsformaat."
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr "LibreOffice niet geënstalleerd of niet gevonden in pad: %s"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Afmeting wijzigen"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Roteren"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Inzoomen"
 
diff --git a/mayan/apps/converter/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/pl/LC_MESSAGES/django.mo
index 787a365aaa..2d47573058 100644
Binary files a/mayan/apps/converter/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/pl/LC_MESSAGES/django.po b/mayan/apps/converter/locale/pl/LC_MESSAGES/django.po
index 3f4e255046..a01de2ddbd 100644
--- a/mayan/apps/converter/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/pl/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -39,7 +39,7 @@ msgstr "Transformacja"
 msgid "Arguments"
 msgstr "Argumenty"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Wyjątek określający liczbę stron PDF: %s"
@@ -53,47 +53,47 @@ msgstr "Format niezgodny z formatem plików LibreOffice."
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr "LibreOffice nie został zainstalowany lub nie znaleziono ścieżki: %s"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Przycięcie"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Zmiana rozmiaru"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Obrócenie"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Powiększenie"
 
diff --git a/mayan/apps/converter/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/pt/LC_MESSAGES/django.mo
index 1e2f5bd8ca..1686eae70f 100644
Binary files a/mayan/apps/converter/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/pt/LC_MESSAGES/django.po b/mayan/apps/converter/locale/pt/LC_MESSAGES/django.po
index cb430bd8c2..d70ae6b521 100644
--- a/mayan/apps/converter/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -52,47 +52,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Rodar"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Zoom"
 
diff --git a/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.mo
index 9773aad27f..f7b2c163c2 100644
Binary files a/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.po
index 99f80885bd..8168226df8 100644
--- a/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -38,7 +38,7 @@ msgstr "Transformação"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Exceção ao determinar o número de páginas do PDF; %s"
@@ -52,47 +52,47 @@ msgstr "Não é um formato de arquivo de escritório."
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr "LibreOffice não instalado ou não encontrado no caminho: %s"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Recortar"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Rotacionar"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Ampliar"
 
diff --git a/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.mo
index 5f46cbcf0a..1a5e9038f1 100644
Binary files a/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.po
index 4dedf7b9f6..a4e834a86d 100644
--- a/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -51,47 +51,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Redimensionarea"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Roti"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Zoom"
 
diff --git a/mayan/apps/converter/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/ru/LC_MESSAGES/django.mo
index 9c4ba43705..6c20b24f70 100644
Binary files a/mayan/apps/converter/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/ru/LC_MESSAGES/django.po b/mayan/apps/converter/locale/ru/LC_MESSAGES/django.po
index 1d60d76384..60aa1555e4 100644
--- a/mayan/apps/converter/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:38-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -38,7 +38,7 @@ msgstr "Преобразование"
 msgid "Arguments"
 msgstr "Аргументы"
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr "Ошибка при определении числа страниц PDF; %s"
@@ -52,47 +52,47 @@ msgstr "Не является файлом офисного формата."
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr "LibreOffice не установлен, или не найден по пути: %s"
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr "Кадрировать"
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "Изменение размера"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "Вращать"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "Увеличить"
 
diff --git a/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.mo
index 54a8f80286..849605d74a 100644
Binary files a/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.po
index de2fbee508..010b93a413 100644
--- a/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -50,47 +50,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr ""
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr ""
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr ""
 
diff --git a/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.mo
index 925e6f3bee..9ffe9617a6 100644
Binary files a/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.po
index f97a203fc4..b0ed19ba73 100644
--- a/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -49,47 +49,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr ""
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr ""
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr ""
 
diff --git a/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.mo
index 4119fbb561..c65104e112 100644
Binary files a/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po
index 4766272838..004a916141 100644
--- a/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: backends/python.py:86 backends/python.py:100
+#: backends/python.py:100 backends/python.py:114
 #, python-format
 msgid "Exception determining PDF page count; %s"
 msgstr ""
@@ -50,47 +50,47 @@ msgstr ""
 msgid "LibreOffice not installed or not found at path: %s"
 msgstr ""
 
-#: classes.py:290
+#: classes.py:294
 msgid "Crop"
 msgstr ""
 
-#: classes.py:303
+#: classes.py:307
 msgid "Flip"
 msgstr ""
 
-#: classes.py:314
+#: classes.py:318
 msgid "Gaussian blur"
 msgstr ""
 
-#: classes.py:325
+#: classes.py:329
 msgid "Mirror"
 msgstr ""
 
-#: classes.py:336
+#: classes.py:340
 msgid "Resize"
 msgstr "调整大小"
 
-#: classes.py:363
+#: classes.py:367
 msgid "Rotate"
 msgstr "旋转"
 
-#: classes.py:382
+#: classes.py:386
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#: classes.py:393
+#: classes.py:397
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#: classes.py:404
+#: classes.py:408
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#: classes.py:414
+#: classes.py:418
 msgid "Unsharp masking"
 msgstr ""
 
-#: classes.py:430
+#: classes.py:434
 msgid "Zoom"
 msgstr "缩放"
 
diff --git a/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.mo
index 273cade153..a6f8f80dfa 100644
Binary files a/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.po
index b2eab01cb9..13d7a20823 100644
--- a/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.mo
index b0a36a1b61..5d26226bab 100644
Binary files a/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.po
index c8e63853d1..ae727bff1f 100644
--- a/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.mo
index 96164b698f..40475e9cee 100644
Binary files a/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.po
index 1b9eaf27fe..bdf288d446 100644
--- a/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.mo
index 8afb7522ed..c5309c05b0 100644
Binary files a/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.po
index 74fe153af2..e49e6881af 100644
--- a/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.mo
index 5f1ba23588..5ff74cc0c4 100644
Binary files a/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.po
index 3f26c361b1..a0df0c5f60 100644
--- a/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/de_DE/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-05-20 21:54+0000\n"
 "Last-Translator: Tobias Paepke <tobias.paepke@paepke.net>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.mo
index 5ec5b3d032..ee2e6ad809 100644
Binary files a/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.po
index 78dcfd7bde..071fcf9a43 100644
--- a/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.mo
index cf69afa5bf..8ade788558 100644
Binary files a/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.po
index d7a82c1a86..8fdb48840d 100644
--- a/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-05-09 01:46+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.mo
index e0ab462a35..a2c98b040f 100644
Binary files a/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.po
index 62f0d1b806..e85acf4a34 100644
--- a/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.mo
index 0132661385..1d0992eb3b 100644
Binary files a/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.po
index c81b613f7a..a6b4241a61 100644
--- a/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-05-23 20:02+0000\n"
 "Last-Translator: Bruno CAPELETO <bruno.capeleto@abcreseau.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.mo
index c8426a2ed4..44514b7e5e 100644
Binary files a/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.po
index 7b8d03db6a..f301003514 100644
--- a/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.mo
index 437bee5183..0c32cae963 100644
Binary files a/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.po
index ee220e7865..9092ae0b2c 100644
--- a/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.mo
index 82c48281a0..a67b9d9e34 100644
Binary files a/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.po
index 5183ba1c9e..6388735080 100644
--- a/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-09-24 10:33+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.mo
index b67cbedc00..73bce2757d 100644
Binary files a/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.po
index 9d8273fce1..962544f34d 100644
--- a/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-09 16:40+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.mo
index 6558d65ca5..f46aa3e9d7 100644
Binary files a/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.po
index 1ca5ace4ec..15af7cd736 100644
--- a/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/pl/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.mo
index 15880382e7..61d7f54b5f 100644
Binary files a/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.po
index 8e63ba3ed4..4e7bbb48ae 100644
--- a/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/pt/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.mo
index 66a93ced08..6a7465b65f 100644
Binary files a/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.po
index 1285e760e7..c0ac2cfb93 100644
--- a/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-17 23:07+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.mo
index 98f2b17dc5..637d8df80d 100644
Binary files a/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.po
index 2a91cbb95a..898715cae4 100644
--- a/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.mo
index 9a3075e51e..0a8a5ed222 100644
Binary files a/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.po
index e068a77401..52485e87cc 100644
--- a/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-07-19 20:20+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.mo
index 29861aa88c..2b16e44ec8 100644
Binary files a/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.po
index b57b56e8ee..aaea3fdfd1 100644
--- a/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.mo
index 19e0d0124c..58e2443ba8 100644
Binary files a/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.po
index 4fcf662615..6eb6c0b8b1 100644
--- a/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.mo
index 4ab8740395..fc3b80651e 100644
Binary files a/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po
index 632987651a..cb7eaaaf55 100644
--- a/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/django_gpg/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:22+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.mo
index 6222aa9c1a..034780e6b5 100644
Binary files a/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.po
index c32908fd04..e7881d3a8f 100644
--- a/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.mo
index 93320d50b8..5e86885545 100644
Binary files a/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.po
index f82e271be4..770f5a1acf 100644
--- a/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.mo
index 1f1054f174..6d86ab04dd 100644
Binary files a/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.po
index e294bad9b6..dd05284f1f 100644
--- a/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/bs_BA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.mo
index 4906b79a3c..a02fd7a01f 100644
Binary files a/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.po
index 4be0c530d6..e2587d9e89 100644
--- a/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.mo
index f987a875bd..6cbb9f1a79 100644
Binary files a/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.po
index 77db3dc358..07ac416d50 100644
--- a/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/de_DE/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.mo
index 76b0457828..0a081f26c9 100644
Binary files a/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.po
index d0296a481e..b1b1e3a220 100644
--- a/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2013-11-20 11:56+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.mo
index 31b572099e..604e61a65b 100644
Binary files a/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.po
index e89c770a7b..3cd0054d62 100644
--- a/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.mo
index 0aa1f7c64d..b4e8d6b8dc 100644
Binary files a/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.po
index 64797198b6..dc60cfb83a 100644
--- a/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.mo
index d53c60780a..b1ca094ea7 100644
Binary files a/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.po
index dcb6591df4..504ac820d0 100644
--- a/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/fr/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Thierry Schott <DarkDare@users.noreply.github.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.mo
index 88723d8033..fcee550d64 100644
Binary files a/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.po
index 5269ffe71a..dfbffff742 100644
--- a/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.mo
index 270b9ed13b..62450cae5f 100644
Binary files a/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.po
index 6b52a26ff9..0298ba7230 100644
--- a/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.mo
index 797884faf4..30a58592ae 100644
Binary files a/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.po
index 584e97c26b..6554cf0dd2 100644
--- a/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-09-24 09:51+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.mo
index 6d7550e31b..bc536d182b 100644
Binary files a/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.po
index 9898ec7c5c..c845c64543 100644
--- a/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-10-28 12:44+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.mo
index 7f61224d41..8a6507c17d 100644
Binary files a/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.po
index ca6a948707..9f6fb61f9f 100644
--- a/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Wojtek Warczakowski <w.warczakowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.mo
index 3bd15c0167..b126fdde4b 100644
Binary files a/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.po
index 789e80e123..0ee3fef2f1 100644
--- a/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.mo
index 6fa5262fcb..204accabdf 100644
Binary files a/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.po
index 16a42fbccc..beeae1703b 100644
--- a/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-17 22:54+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.mo
index 8d08a9e883..15c09b13b0 100644
Binary files a/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.po
index 3d475cecdd..2543e6cc29 100644
--- a/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-17 09:39+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.mo
index 37c7a67fdd..f758e5fbb3 100644
Binary files a/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.po
index 39e6874af7..d358e4301b 100644
--- a/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-07-14 01:35+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.mo
index c45d13e748..6675aa9700 100644
Binary files a/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.po
index 8d1970e3c7..b5bfe1b1b8 100644
--- a/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-23 16:43+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.mo
index 3f99f7af7c..8b2c09ebd9 100644
Binary files a/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.po
index b391404ed4..97b95adb37 100644
--- a/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.mo
index 9b10404d58..f3d6eec667 100644
Binary files a/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.po
index 5151d44697..266bdcc92b 100644
--- a/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_comments/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:09+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.mo
index 021f1e0ea5..5879e0e1ae 100644
Binary files a/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.po
index e3423d7845..e6b0bdd0b5 100644
--- a/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "None"
 msgstr "لا شيء"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -33,31 +33,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -103,7 +103,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -153,50 +153,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "قيمة"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "الوثائق"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexing"
 
@@ -220,6 +220,30 @@ msgstr "View document indexes"
 msgid "Rebuild document indexes"
 msgstr "Rebuild document indexes"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Delete document indexes"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -285,9 +309,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -380,9 +401,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.mo
index b8308ffee6..e0ecee9fa0 100644
Binary files a/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.po
index 46350df460..642af0c355 100644
--- a/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "None"
 msgstr "Няма"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -32,31 +32,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -151,50 +151,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Стойност"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Документи"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Индексиране"
 
@@ -218,6 +218,28 @@ msgstr ""
 msgid "Rebuild document indexes"
 msgstr ""
 
+#: queues.py:12
+msgid "Delete empty index nodes"
+msgstr ""
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -283,9 +305,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -378,9 +397,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.mo
index b54c86ed5c..a359a40606 100644
Binary files a/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.po
index 462bdba8d9..f5d68d4992 100644
--- a/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "None"
 msgstr "Nijedno"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -33,31 +33,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -103,7 +103,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -156,50 +156,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Vrijednost"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indeksiranje"
 
@@ -223,6 +223,30 @@ msgstr "Pregledaj indekse dokumenata"
 msgid "Rebuild document indexes"
 msgstr " Obnovi indekse dokumenata"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Obriši indekse dokumenata"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -288,9 +312,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -383,9 +404,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.mo
index 0accd566f1..aa86fada96 100644
Binary files a/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.po
index 31cb01ff43..fdb5f3619f 100644
--- a/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "None"
 msgstr "Ingen"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -31,31 +31,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -148,50 +148,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr ""
 
@@ -215,6 +215,28 @@ msgstr ""
 msgid "Rebuild document indexes"
 msgstr ""
 
+#: queues.py:12
+msgid "Delete empty index nodes"
+msgstr ""
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -280,9 +302,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -375,9 +394,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.mo
index b0df31eb9d..6099cbd3ee 100644
Binary files a/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po
index 5433d8d322..3178d41ccb 100644
--- a/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "None"
 msgstr "Keine"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Dokumententypen"
 
@@ -36,31 +36,31 @@ msgstr "Dokumententypen"
 msgid "Document indexing"
 msgstr "Dokumentenindices"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Bezeichner"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Abkürzung"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Elemente"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "Stufe"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr "Dokument verknüpft"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Knotenpunkt"
 
@@ -106,7 +106,9 @@ msgid "New child node"
 msgstr "Neuer Unterknoten"
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+#, fuzzy
+#| msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr "Interner Name um diesen Index zu identifizieren"
 
 #: models.py:43
@@ -163,7 +165,7 @@ msgstr "Dokumente verknüpfen"
 msgid "Root"
 msgstr "Wurzel"
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
@@ -172,43 +174,43 @@ msgstr ""
 "Fehler bei der Indexierung von Dokument %(document)s; Ausdruck: "
 "%(expression)s; %(exception)s"
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr "Index Knotenvorlage"
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr "Index Knotenvorlagen"
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr "Index Knotenpunkt"
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Wert"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Dokumente"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr "Indexknotenpunkt"
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr "Indexknotenpunkte"
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr "Indexknotenpunkt"
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr "Indexknotenpunkte"
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indizierung"
 
@@ -232,6 +234,30 @@ msgstr "Dokumentenindices anzeigen"
 msgid "Rebuild document indexes"
 msgstr "Dokumentenindices neu aufbauen"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Dokumentenindices löschen"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Link documents"
+msgid "Remove document"
+msgstr "Dokumente verknüpfen"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Link documents"
+msgid "Index document"
+msgstr "Dokumente verknüpfen"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "Indices wiederaufbauen"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
diff --git a/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.mo
index ed06b7fb82..339c319419 100644
Binary files a/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.po
index 91b34678d6..58bb126519 100644
--- a/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 #, fuzzy
 msgid "Document types"
 msgstr "document types"
@@ -33,35 +33,35 @@ msgstr "document types"
 msgid "Document indexing"
 msgstr "document indexes"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 #, fuzzy
 msgid "Enabled"
 msgstr "enabled"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 #, fuzzy
 msgid "Items"
 msgstr "items"
 
-#: apps.py:104
+#: apps.py:100
 #, fuzzy
 msgid "Level"
 msgstr "level"
 
-#: apps.py:112
+#: apps.py:108
 #, fuzzy
 msgid "Has document links?"
 msgstr "has document links?"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -115,7 +115,7 @@ msgstr "new child node"
 #: models.py:37
 #, fuzzy
 #| msgid "Internal name used to reference this index."
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr "Internal name used to reference this index."
 
 #: models.py:43
@@ -170,7 +170,7 @@ msgstr "link documents"
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, fuzzy, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
@@ -178,52 +178,52 @@ msgid ""
 msgstr ""
 "Error updating document index, expression: %(expression)s; %(exception)s"
 
-#: models.py:261
+#: models.py:268
 #, fuzzy
 msgid "Index node template"
 msgstr "index template node"
 
-#: models.py:262
+#: models.py:269
 #, fuzzy
 msgid "Indexes node template"
 msgstr "indexes template nodes"
 
-#: models.py:270
+#: models.py:277
 #, fuzzy
 msgid "Index template node"
 msgstr "index template node"
 
-#: models.py:273
+#: models.py:280
 #, fuzzy
 msgid "Value"
 msgstr "value"
 
-#: models.py:277
+#: models.py:284
 #, fuzzy
 msgid "Documents"
 msgstr "documents"
 
-#: models.py:363
+#: models.py:370
 #, fuzzy
 msgid "Index node instance"
 msgstr "index instance"
 
-#: models.py:364
+#: models.py:371
 #, fuzzy
 msgid "Indexes node instances"
 msgstr "index instance"
 
-#: models.py:372
+#: models.py:379
 #, fuzzy
 msgid "Document index node instance"
 msgstr "index instance"
 
-#: models.py:373
+#: models.py:380
 #, fuzzy
 msgid "Document indexes node instances"
 msgstr "index instance"
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexing"
 
@@ -247,6 +247,27 @@ msgstr "View document indexes"
 msgid "Rebuild document indexes"
 msgstr "Rebuild document indexes"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Delete document indexes"
+
+#: queues.py:16
+#, fuzzy
+msgid "Remove document"
+msgstr "link documents"
+
+#: queues.py:20
+#, fuzzy
+msgid "Index document"
+msgstr "link documents"
+
+#: queues.py:24
+#, fuzzy
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, fuzzy, python-format
 #| msgid "Delete document indexes"
diff --git a/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.mo
index d28594952b..3c966f4f84 100644
Binary files a/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.po
index 75b73250ae..5f216ed7a9 100644
--- a/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # jmcainzos <jmcainzos@vodafone.es>, 2014
@@ -11,54 +11,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:56+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:24
 msgid "None"
 msgstr "Ninguno"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Tipos de documento"
 
 #: apps.py:49
-#| msgid "document indexes"
 msgid "Document indexing"
 msgstr "Indexación de documentos"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Etiqueta"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Identificador"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Elementos"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "Nível"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr "El documento tiene enlaces?"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Nodo"
 
@@ -104,14 +104,18 @@ msgid "New child node"
 msgstr "nuevo nodo secundario"
 
 #: models.py:37
-#| msgid "Internal name used to reference this index."
-msgid "This values will be used by other apps to reference this index."
-msgstr "Estos valores serán utilizados por otras aplicaciones para hacer referencia a este índice."
+#, fuzzy
+#| msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
+msgstr ""
+"Estos valores serán utilizados por otras aplicaciones para hacer referencia "
+"a este índice."
 
 #: models.py:43
-msgid ""
-"Causes this index to be visible and updated when document data changes."
-msgstr "Hace que este índice sea visible y actualizado cuando los datos de documentos cambien."
+msgid "Causes this index to be visible and updated when document data changes."
+msgstr ""
+"Hace que este índice sea visible y actualizado cuando los datos de "
+"documentos cambien."
 
 #: models.py:117 models.py:149
 msgid "Index"
@@ -129,7 +133,9 @@ msgstr "Instancias de índices"
 msgid ""
 "Enter a template to render. Use Django's default templating language "
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
-msgstr "Introduzca una plantilla para generar. Use el lenguaje de plantillas de Django (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/). "
+msgstr ""
+"Introduzca una plantilla para generar. Use el lenguaje de plantillas de "
+"Django (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/). "
 
 #: models.py:157
 msgid "Indexing expression"
@@ -137,13 +143,17 @@ msgstr "expresión de indexación"
 
 #: models.py:162
 msgid "Causes this node to be visible and updated when document data changes."
-msgstr "Hace que este nodo sea visible y actualizado cuando los datos de los documentos son cambiados."
+msgstr ""
+"Hace que este nodo sea visible y actualizado cuando los datos de los "
+"documentos son cambiados."
 
 #: models.py:170
 msgid ""
-"Check this option to have this node act as a container for documents and not"
-" as a parent for further nodes."
-msgstr "Marque esta opción para que el nodo actúe como un contenedor de documentos y no como un padre para otros nodos secundarios."
+"Check this option to have this node act as a container for documents and not "
+"as a parent for further nodes."
+msgstr ""
+"Marque esta opción para que el nodo actúe como un contenedor de documentos y "
+"no como un padre para otros nodos secundarios."
 
 #: models.py:173
 msgid "Link documents"
@@ -153,50 +163,52 @@ msgstr "enlace de documentos"
 msgid "Root"
 msgstr "raíz"
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
-msgstr "Error indexando documento: %(document)s; expresión: %(expression)s; %(exception)s"
+msgstr ""
+"Error indexando documento: %(document)s; expresión: %(expression)s; "
+"%(exception)s"
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr "nodo de plantilla de indice"
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr "nodos de plantillas de índices"
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr "nodo de plantilla de indice"
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Valor"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Documentos"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr "índice de nodo de instancia"
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr "nodos de instancias de indices"
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr "Instancia del nodo del índice de documentos"
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr "Instancias de nodos de índices de documentos"
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexación"
 
@@ -220,9 +232,32 @@ msgstr "Ver los índices de documentos"
 msgid "Rebuild document indexes"
 msgstr "Generar índices de documentos"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Eliminar los índices de documentos"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Link documents"
+msgid "Remove document"
+msgstr "enlace de documentos"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Link documents"
+msgid "Index document"
+msgstr "enlace de documentos"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "reconstruir índices"
+
 #: views.py:49
 #, python-format
-#| msgid "Delete document indexes"
 msgid "Delete the index: %s?"
 msgstr "¿Borrar el indice: %s?"
 
@@ -350,9 +385,11 @@ msgstr "Reconstrucción de Índices en espera de forma exitosa."
 #~ msgstr "Maximum suffix (%s) count reached."
 
 #~ msgid ""
-#~ "Error in document indexing update expression: %(expression)s; %(exception)s"
+#~ "Error in document indexing update expression: %(expression)s; "
+#~ "%(exception)s"
 #~ msgstr ""
-#~ "Error in document indexing update expression: %(expression)s; %(exception)s"
+#~ "Error in document indexing update expression: %(expression)s; "
+#~ "%(exception)s"
 
 #~ msgid "Unable to delete document indexing node; %s"
 #~ msgstr "Unable to delete document indexing node; %s"
@@ -389,11 +426,11 @@ msgstr "Reconstrucción de Índices en espera de forma exitosa."
 #~ msgstr "documents rename count"
 
 #~ msgid ""
-#~ "A dictionary that maps the index name and where on the filesystem that index"
-#~ " will be mirrored."
+#~ "A dictionary that maps the index name and where on the filesystem that "
+#~ "index will be mirrored."
 #~ msgstr ""
-#~ "A dictionary that maps the index name and where on the filesystem that index"
-#~ " will be mirrored."
+#~ "A dictionary that maps the index name and where on the filesystem that "
+#~ "index will be mirrored."
 
 #~ msgid "Index rebuild error: %s"
 #~ msgstr "Index rebuild error: %s"
diff --git a/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.mo
index aae5112ec2..0dc96ecd3e 100644
Binary files a/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.po
index 9d457d7acb..464e9ada2a 100644
--- a/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "None"
 msgstr "ناموجود"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "انواع سند"
 
@@ -31,31 +31,31 @@ msgstr "انواع سند"
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "برچسب"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Slug"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "فعال شده"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "اقلام"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "سطح"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr "آیا سند دارای پیوند است؟"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "گره"
 
@@ -101,7 +101,7 @@ msgid "New child node"
 msgstr "گره فرزند جدید"
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -152,7 +152,7 @@ msgstr "اسناد پیوند"
 msgid "Root"
 msgstr "ریشه"
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
@@ -160,43 +160,43 @@ msgid ""
 msgstr ""
 "خطای ساختن ایندکس سند: %(document)s; , عبارت : %(expression)s; %(exception)s"
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr "الگوی گره اندیس"
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr "الگوی گره اندیس ها"
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr "گره الگوی اندیس"
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "مقدار"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "اسناد"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr "موردی ازگره اندیس"
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr "موارد گره اندیس ها"
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "ایندکس گذاری"
 
@@ -220,6 +220,30 @@ msgstr "دیدن ایندکسهای سند"
 msgid "Rebuild document indexes"
 msgstr "بازسازی ایندکسهای سند"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "حذف ایندکس های سند"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Link documents"
+msgid "Remove document"
+msgstr "اسناد پیوند"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Link documents"
+msgid "Index document"
+msgstr "اسناد پیوند"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "بازسازی اندیس ها"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
diff --git a/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.mo
index b7747a13a6..ad15fa48fa 100644
Binary files a/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.po
index 4e9437a2ff..8411d73651 100644
--- a/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "None"
 msgstr "Aucun"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Types de document"
 
@@ -34,31 +34,31 @@ msgstr "Types de document"
 msgid "Document indexing"
 msgstr "Indexation de document"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Libellé"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Jeton"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Activé"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Éléments"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "Niveau"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr "Est lié à d'autres documents ?"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Noeud"
 
@@ -105,7 +105,9 @@ msgid "New child node"
 msgstr "Nouveau noeud enfant"
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+#, fuzzy
+#| msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 "Ces valeurs seront utilisées par d'autres applications pour référencer cet "
 "indexe."
@@ -162,7 +164,7 @@ msgstr "Lier les documents"
 msgid "Root"
 msgstr "Racine"
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
@@ -171,43 +173,43 @@ msgstr ""
 "Erreur lors de l'indexation du document: %(document)s; expression: "
 "%(expression)s; %(exception)s"
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr "Noeud de modèle d'index"
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr "Noeud de modèle d'index"
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr "Noeud de modèle d'index"
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Valeur"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Documents"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr "Noeud d'instance d'index"
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr "Noeud d'instances d'indexes"
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr "Instance de noeud d'indexe de document"
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr "Instances de noeuds d'indexe de document"
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexation"
 
@@ -231,6 +233,30 @@ msgstr "Afficher les indexes des documents"
 msgid "Rebuild document indexes"
 msgstr "Reconstruire les indexes des documents"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Supprimer des indexes de documents"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Link documents"
+msgid "Remove document"
+msgstr "Lier les documents"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Link documents"
+msgid "Index document"
+msgstr "Lier les documents"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "Reconstruire les index"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
diff --git a/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.mo
index 3483e71242..e6cfca0d8f 100644
Binary files a/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.po
index 7a708ea4e4..518a5c6bb0 100644
--- a/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "None"
 msgstr "Semmi"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -31,31 +31,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -148,50 +148,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "dokumentumok"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr ""
 
@@ -215,6 +215,28 @@ msgstr ""
 msgid "Rebuild document indexes"
 msgstr ""
 
+#: queues.py:12
+msgid "Delete empty index nodes"
+msgstr ""
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -280,9 +302,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -375,9 +394,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.mo
index 4391c26ab1..0c3921b0cb 100644
Binary files a/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.po
index 03418669eb..9fdc39990a 100644
--- a/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -31,31 +31,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -148,50 +148,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Dokumen"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr ""
 
@@ -215,6 +215,28 @@ msgstr ""
 msgid "Rebuild document indexes"
 msgstr ""
 
+#: queues.py:12
+msgid "Delete empty index nodes"
+msgstr ""
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -280,9 +302,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -375,9 +394,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.mo
index c7f39495e6..40ae2523db 100644
Binary files a/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.po
index daca814b6e..8d5bdad7a1 100644
--- a/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/it/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "None"
 msgstr "Nessuno"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Tipi di documento"
 
@@ -35,31 +35,31 @@ msgstr "Tipi di documento"
 msgid "Document indexing"
 msgstr "Indicizzazione documento"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "etichetta"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Slug"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Articoli"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "Livello"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr "Il documento ha un collegamento?"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Nodo"
 
@@ -105,7 +105,9 @@ msgid "New child node"
 msgstr "Novo nodo figlio"
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+#, fuzzy
+#| msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 "Questo valore è utilizzato dalle altre apps per riferirsi a questo indice."
 
@@ -161,7 +163,7 @@ msgstr "Documenti di collegamento"
 msgid "Root"
 msgstr "Principale"
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
@@ -170,43 +172,43 @@ msgstr ""
 "Errore nell'ndicizzazione del documento: %(document)s; espressione: "
 "%(expression)s; %(exception)s"
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr "Indice del nodo Template "
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr "Indici dei nodi Template"
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr "Indice del nodo Template"
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Valore"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Documenti"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr "Istanza nodo Indice"
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr "Istanze nodo indici"
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr "Istanza del nodo indice del documento"
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr "Istanze dei nodi indice del documento"
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indicizzazione"
 
@@ -230,6 +232,30 @@ msgstr "Visualizza indici documento"
 msgid "Rebuild document indexes"
 msgstr "Ricostruisci indici documento"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Eliminare gli indici dei documenti"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Link documents"
+msgid "Remove document"
+msgstr "Documenti di collegamento"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Link documents"
+msgid "Index document"
+msgstr "Documenti di collegamento"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "Ricostruisci indici"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
diff --git a/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.mo
index 1d49d5aca0..cc789f950b 100644
Binary files a/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.po
index cdd17d7fa6..b2a6e96118 100644
--- a/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/nl_NL/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "None"
 msgstr "Geen"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Documentsoorten"
 
@@ -34,31 +34,31 @@ msgstr "Documentsoorten"
 msgid "Document indexing"
 msgstr "Documentindexering"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Label"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Items"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "Niveau"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr "Heeft document verwijzingen?"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Node"
 
@@ -104,7 +104,7 @@ msgid "New child node"
 msgstr "Nieuwe node"
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -154,7 +154,7 @@ msgstr "Koppel documenten"
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
@@ -163,43 +163,43 @@ msgstr ""
 "Fout bij het indexeren van document: %(document)s; uitdrukking: "
 "%(expression)s; %(exception)s"
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Waarde"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Documenten"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexering bezig"
 
@@ -223,6 +223,30 @@ msgstr "Bekijk document-indexeringen"
 msgid "Rebuild document indexes"
 msgstr "documenten opnieuw indexeren"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Verwijder document-indexeringen"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Link documents"
+msgid "Remove document"
+msgstr "Koppel documenten"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Link documents"
+msgid "Index document"
+msgstr "Koppel documenten"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "Opnieuw indexeren"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
diff --git a/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.mo
index f49c8cb370..7c71d5d838 100644
Binary files a/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.po
index 2d8f860b2b..9a5c0dd217 100644
--- a/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/pl/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "None"
 msgstr "Brak"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Typy dokumentów"
 
@@ -36,31 +36,31 @@ msgstr "Typy dokumentów"
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Etykieta"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Slug"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Włączony"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Pozycje"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Węzeł"
 
@@ -106,7 +106,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -159,50 +159,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Wartość"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indeksowanie"
 
@@ -226,6 +226,30 @@ msgstr "Zobacz indeksy dokumentów"
 msgid "Rebuild document indexes"
 msgstr "Odbuduj indeksy dokumentów"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Usuń indeksy dokumentów"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "Przebudowa indeksów"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -386,9 +410,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.mo
index 3a27fc14a3..a8e5bf909d 100644
Binary files a/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.po
index bff5d03656..0edc82782f 100644
--- a/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/pt/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "None"
 msgstr "Nenhum"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -33,31 +33,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Nome"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Slug"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Itens"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -103,7 +103,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -156,50 +156,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Valor"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Documentos"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexação"
 
@@ -223,6 +223,30 @@ msgstr "Ver índices  de documento"
 msgid "Rebuild document indexes"
 msgstr "Reconstruir índices de documento"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Eliminar índices de documento"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -288,9 +312,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -383,9 +404,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.mo
index c7025e4d4c..2f51dc26ee 100644
Binary files a/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.po
index 71f6ebf337..0c6568b84d 100644
--- a/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "None"
 msgstr "Nenhum"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Tipos de Documentos"
 
@@ -34,31 +34,31 @@ msgstr "Tipos de Documentos"
 msgid "Document indexing"
 msgstr "Indexação de documentos"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Etiqueta"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr "Identificador"
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Itens"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "Nível"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr "Tem links de documentos?"
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Nó"
 
@@ -104,7 +104,9 @@ msgid "New child node"
 msgstr "Novo node filho"
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+#, fuzzy
+#| msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 "Estes valores serão utilizados por outras aplicações para fazer referência a "
 "este índice."
@@ -161,7 +163,7 @@ msgstr "Link de documentos"
 msgid "Root"
 msgstr "Raiz"
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
@@ -170,43 +172,43 @@ msgstr ""
 "Erro indexando documento: %(document)s; expressão: %(expression)s; "
 "%(exception)s"
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr "Índice de modelo de nó"
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr "Indices de modelo de nó"
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr "Indice de modelo de índice"
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Valor"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Documento"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr "Índice de instância de nó"
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr "Índices instâncias de nó "
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr "Instâncias do nó do índice de documentos"
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr "Instâncias de nós de lindice de instâncias"
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexando"
 
@@ -230,6 +232,30 @@ msgstr "Ver índices  de documento"
 msgid "Rebuild document indexes"
 msgstr "Reconstruir índices de documento"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Excluir documento indexado"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Link documents"
+msgid "Remove document"
+msgstr "Link de documentos"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Link documents"
+msgid "Index document"
+msgstr "Link de documentos"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "Reconstruir índices de documento"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
diff --git a/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.mo
index 2eff12c92a..4b5814bfd7 100644
Binary files a/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.po
index ec55afd8e4..0094db8701 100644
--- a/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "None"
 msgstr "Nici unul"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -33,31 +33,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Etichetă"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Articole"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -103,7 +103,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -156,50 +156,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Valoare"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Documente"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Indexare"
 
@@ -223,6 +223,30 @@ msgstr "Vezi indexul de documente"
 msgid "Rebuild document indexes"
 msgstr "Reconstruire index documente"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Ștergeți indexul de documente"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -288,9 +312,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -383,9 +404,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.mo
index 64ac0ad5e6..fa076ee378 100644
Binary files a/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.po
index 4d79ee994e..7be91f0b95 100644
--- a/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "None"
 msgstr "Ни один"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr "Типы документов"
 
@@ -34,31 +34,31 @@ msgstr "Типы документов"
 msgid "Document indexing"
 msgstr "Индексирование документа"
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Надпись"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr "Доступно"
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr "Элементы"
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr "Уровень"
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr "Узел"
 
@@ -104,7 +104,7 @@ msgid "New child node"
 msgstr "Новый дочерний узел"
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -154,50 +154,50 @@ msgstr ""
 msgid "Root"
 msgstr "Корень"
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Значение"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Документы"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "Индексирование"
 
@@ -221,6 +221,30 @@ msgstr "Просмотр индексов документа"
 msgid "Rebuild document indexes"
 msgstr "Восстановление индексов документа"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "Удалить индексы документов"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild indexes"
+msgid "Rebuild index"
+msgstr "Восстановление индексов"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -381,9 +405,6 @@ msgstr "Восстановление индекса успешно отправ
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.mo
index 9045da6741..90a9ac0bd0 100644
Binary files a/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.po
index 4cea524985..8e5471cb52 100644
--- a/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "None"
 msgstr "Brez"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -32,31 +32,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr "Oznaka"
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -149,50 +149,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr ""
 
@@ -216,6 +216,28 @@ msgstr ""
 msgid "Rebuild document indexes"
 msgstr ""
 
+#: queues.py:12
+msgid "Delete empty index nodes"
+msgstr ""
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -281,9 +303,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -376,9 +395,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.mo
index 0e3a678cc4..01f2556484 100644
Binary files a/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.po
index eb2b30bef2..45976eb5fe 100644
--- a/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "None"
 msgstr "None"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -31,31 +31,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -148,50 +148,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "Giá trị"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "Tài liệu"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr ""
 
@@ -215,6 +215,28 @@ msgstr ""
 msgid "Rebuild document indexes"
 msgstr ""
 
+#: queues.py:12
+msgid "Delete empty index nodes"
+msgstr ""
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -280,9 +302,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -375,9 +394,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.mo
index c071040c94..89b9676978 100644
Binary files a/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.po
index 2ff6153030..ff28c3b399 100644
--- a/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_indexing/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:32+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "None"
 msgstr "无"
 
-#: admin.py:26 apps.py:99 links.py:48 models.py:49
+#: admin.py:26 apps.py:95 links.py:48 models.py:49
 msgid "Document types"
 msgstr ""
 
@@ -32,31 +32,31 @@ msgstr ""
 msgid "Document indexing"
 msgstr ""
 
-#: apps.py:85 models.py:33
+#: apps.py:81 models.py:33
 msgid "Label"
 msgstr ""
 
-#: apps.py:86 models.py:38
+#: apps.py:82 models.py:38
 msgid "Slug"
 msgstr ""
 
-#: apps.py:88 apps.py:108 models.py:46 models.py:165
+#: apps.py:84 apps.py:104 models.py:46 models.py:165
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:93 apps.py:123 apps.py:136
+#: apps.py:89 apps.py:119 apps.py:132
 msgid "Items"
 msgstr ""
 
-#: apps.py:104
+#: apps.py:100
 msgid "Level"
 msgstr ""
 
-#: apps.py:112
+#: apps.py:108
 msgid "Has document links?"
 msgstr ""
 
-#: apps.py:119 apps.py:130
+#: apps.py:115 apps.py:126
 msgid "Node"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgid "New child node"
 msgstr ""
 
 #: models.py:37
-msgid "This values will be used by other apps to reference this index."
+msgid "This value will be used by other apps to reference this index."
 msgstr ""
 
 #: models.py:43
@@ -149,50 +149,50 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: models.py:236
+#: models.py:240
 #, python-format
 msgid ""
 "Error indexing document: %(document)s; expression: %(expression)s; "
 "%(exception)s"
 msgstr ""
 
-#: models.py:261
+#: models.py:268
 msgid "Index node template"
 msgstr ""
 
-#: models.py:262
+#: models.py:269
 msgid "Indexes node template"
 msgstr ""
 
-#: models.py:270
+#: models.py:277
 msgid "Index template node"
 msgstr ""
 
-#: models.py:273
+#: models.py:280
 msgid "Value"
 msgstr "值"
 
-#: models.py:277
+#: models.py:284
 msgid "Documents"
 msgstr "文档"
 
-#: models.py:363
+#: models.py:370
 msgid "Index node instance"
 msgstr ""
 
-#: models.py:364
+#: models.py:371
 msgid "Indexes node instances"
 msgstr ""
 
-#: models.py:372
+#: models.py:379
 msgid "Document index node instance"
 msgstr ""
 
-#: models.py:373
+#: models.py:380
 msgid "Document indexes node instances"
 msgstr ""
 
-#: permissions.py:7
+#: permissions.py:7 queues.py:8
 msgid "Indexing"
 msgstr "索引"
 
@@ -216,6 +216,30 @@ msgstr "查看文档索引"
 msgid "Rebuild document indexes"
 msgstr "重建文档索引"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Delete document indexes"
+msgid "Delete empty index nodes"
+msgstr "删除文档索引"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Document"
+msgid "Remove document"
+msgstr "document"
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Document"
+msgid "Index document"
+msgstr "document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Rebuild all indexes?"
+msgid "Rebuild index"
+msgstr "rebuild indexes"
+
 #: views.py:49
 #, python-format
 msgid "Delete the index: %s?"
@@ -281,9 +305,6 @@ msgstr ""
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
-#~ msgid "Rebuild all indexes?"
-#~ msgstr "rebuild indexes"
-
 #~ msgid "Index list"
 #~ msgstr "index list"
 
@@ -376,9 +397,6 @@ msgstr ""
 #~ msgid "Available functions: %s"
 #~ msgstr "Available functions: %s"
 
-#~ msgid "Document"
-#~ msgstr "document"
-
 #~ msgid "Document rename count"
 #~ msgstr "document rename count"
 
diff --git a/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.mo
index 4055afd3e9..851c3180b0 100644
Binary files a/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.po
index 77943af54f..fa98fa7cad 100644
--- a/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,27 +21,27 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Document signatures"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Date"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "Key ID"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "لا شيء"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -213,6 +213,30 @@ msgstr "Verify document signatures"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verify document signatures"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verify document signatures"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verify document signatures"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "Verify document signatures"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.mo
index 16aa0ea5c6..85047abbbe 100644
Binary files a/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.po
index 869192246c..c798e0abfc 100644
--- a/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,27 +20,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Сигнатури на документа"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Дата"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "Ключ ID"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Няма"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Подписи"
 
@@ -212,6 +212,30 @@ msgstr "Проверете сигнатурите на документа"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Проверете сигнатурите на документа"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Проверете сигнатурите на документа"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Проверете сигнатурите на документа"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "Проверете сигнатурите на документа"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.mo
index 875a1271b0..e3b9f578a7 100644
Binary files a/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.po
index cfe727f597..82e7e559c8 100644
--- a/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -21,27 +21,27 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Potpisi dokumenta"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Datum"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "ID ključa"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Nijedno"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -213,6 +213,30 @@ msgstr "Provjeriti potpise dokumenta"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Provjeriti potpise dokumenta"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Provjeriti potpise dokumenta"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Provjeriti potpise dokumenta"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "Provjeriti potpise dokumenta"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.mo
index 00d6aca64f..1a92d9741e 100644
Binary files a/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.po
index 10d56f0d02..7487b9d00a 100644
--- a/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,27 +19,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr ""
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Dato"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr ""
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Ingen"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -211,6 +211,22 @@ msgstr ""
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+msgid "Verify key signatures"
+msgstr ""
+
+#: queues.py:15
+msgid "Unverify key signatures"
+msgstr ""
+
+#: queues.py:19
+msgid "Verify document version"
+msgstr ""
+
+#: queues.py:24
+msgid "Verify missing embedded signature"
+msgstr ""
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.mo
index d45ab8d3a8..25d2fcfecf 100644
Binary files a/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po
index 72b203ea2a..b4b126920b 100644
--- a/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-05-20 22:09+0000\n"
 "Last-Translator: Tobias Paepke <tobias.paepke@paepke.net>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -24,27 +24,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Dokumentenunterschriften"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Datum"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "Schlüssel-ID"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr "Unterschrifts-ID"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Nichts"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Typ"
 
@@ -104,7 +104,7 @@ msgstr "Schlüssel-Typ"
 msgid "Verify all documents"
 msgstr "Alle Dokumente überprüfen"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Unterschriften"
 
@@ -216,6 +216,30 @@ msgstr "Dokumentenunterschriften überprüfen"
 msgid "View details of document signatures"
 msgstr "Details der Unterschriften des Dokuments"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Dokumentenunterschriften überprüfen"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Dokumentenunterschriften überprüfen"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Dokumentenunterschriften überprüfen"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Document version embedded signature"
+msgid "Verify missing embedded signature"
+msgstr "Dokumentenversion der eingebetteten Unterschrift"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr "Passphrase wird benötigt um den Schlüssel zu entsperren"
diff --git a/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.mo
index 7cda87b10e..e2e57eabb4 100644
Binary files a/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.po
index d2d894e5c9..6116bab979 100644
--- a/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Document signatures"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr ""
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 #, fuzzy
 #| msgid "Key ID: %s"
 msgid "Key ID"
 msgstr "Key ID: %s"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 #, fuzzy
 #| msgid "Signature ID: %s"
 msgid "Signature ID"
 msgstr "Signature ID: %s"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr ""
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr "Verify document signatures"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 #, fuzzy
 msgid "Signatures"
 msgstr "signatures"
@@ -250,6 +250,29 @@ msgstr "Verify document signatures"
 msgid "View details of document signatures"
 msgstr "Verify document signatures"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verify document signatures"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verify document signatures"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verify document signatures"
+
+#: queues.py:24
+#, fuzzy
+msgid "Verify missing embedded signature"
+msgstr "document version signature"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.mo
index 996d6e5803..e77fe3843f 100644
Binary files a/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.po
index a4319b3765..f93773ce9e 100644
--- a/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/es/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-23 06:48+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,27 +23,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Firmas de documentos"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Fecha"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "Identificador de clave"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr "ID de firma"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Ninguno"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Tipo"
 
@@ -103,7 +103,7 @@ msgstr "Tipo de llave"
 msgid "Verify all documents"
 msgstr "Verificar todos los documents"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Firma"
 
@@ -215,6 +215,30 @@ msgstr "Verificar firmas de documentos"
 msgid "View details of document signatures"
 msgstr "Ver detalles de firma de documentos"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verificar firmas de documentos"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verificar firmas de documentos"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verificar firmas de documentos"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Document version embedded signature"
+msgid "Verify missing embedded signature"
+msgstr "Firma integrada de versión de documento"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr "Se necesita contraseña para acceder a esta llave."
diff --git a/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.mo
index d05e53cb2a..097752638f 100644
Binary files a/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.po
index 2e047f9478..dd39bbb0f8 100644
--- a/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,27 +19,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "امضاهای سند"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "تاریخ"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "شناسه کلید"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "هیچ"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "نوع"
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "امضاها"
 
@@ -211,6 +211,30 @@ msgstr "بررسی امضای سند"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "بررسی امضای سند"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "بررسی امضای سند"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "بررسی امضای سند"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "بررسی امضای سند"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.mo
index 2b6ce1db36..d5d25c9515 100644
Binary files a/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.po
index f4077f327a..ae7b174998 100644
--- a/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/fr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-05-23 19:54+0000\n"
 "Last-Translator: Bruno CAPELETO <bruno.capeleto@abcreseau.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -23,27 +23,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Signatures du document"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Date"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "ID de la clé"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr "ID de la signature"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Aucune"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Type"
 
@@ -103,7 +103,7 @@ msgstr "Type de clé"
 msgid "Verify all documents"
 msgstr "Vérifier tous les documents"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Signatures"
 
@@ -215,6 +215,30 @@ msgstr "Vérifier les signatures du document"
 msgid "View details of document signatures"
 msgstr "Voir le détails des signatures du document"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Vérifier les signatures du document"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Vérifier les signatures du document"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Vérifier les signatures du document"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Document version embedded signature"
+msgid "Verify missing embedded signature"
+msgstr "Signature intégrée de la version du document"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr "Une phrase secrète est nécessaire pour déverrouiller cette clé"
diff --git a/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.mo
index b97959be9b..af0d0844ca 100644
Binary files a/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.po
index cd6c0ac816..c675902ea9 100644
--- a/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,27 +19,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr ""
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr ""
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr ""
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Semmi"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -211,6 +211,22 @@ msgstr ""
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+msgid "Verify key signatures"
+msgstr ""
+
+#: queues.py:15
+msgid "Unverify key signatures"
+msgstr ""
+
+#: queues.py:19
+msgid "Verify document version"
+msgstr ""
+
+#: queues.py:24
+msgid "Verify missing embedded signature"
+msgstr ""
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.mo
index fa78f1a7e8..583a45aed7 100644
Binary files a/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.po
index 4ef6ff2c40..d5c3ada50b 100644
--- a/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,27 +19,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr ""
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr ""
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr ""
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr ""
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -211,6 +211,22 @@ msgstr ""
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+msgid "Verify key signatures"
+msgstr ""
+
+#: queues.py:15
+msgid "Unverify key signatures"
+msgstr ""
+
+#: queues.py:19
+msgid "Verify document version"
+msgstr ""
+
+#: queues.py:24
+msgid "Verify missing embedded signature"
+msgstr ""
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.mo
index d647d4a93c..acb173f5e1 100644
Binary files a/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.po
index 48dd34a632..edf9d7f514 100644
--- a/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/it/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-09-24 13:19+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,27 +22,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Firme documento"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Data"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "ID Chiave"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr "ID Firma"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Nessuno"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Tipo"
 
@@ -102,7 +102,7 @@ msgstr "Tipo chiave"
 msgid "Verify all documents"
 msgstr "Verifica tutti i documenti"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Firme"
 
@@ -214,6 +214,30 @@ msgstr "Verifica la firma del documento"
 msgid "View details of document signatures"
 msgstr "Vedi dettagli delle firme documento"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verifica la firma del documento"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verifica la firma del documento"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verifica la firma del documento"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Document version embedded signature"
+msgid "Verify missing embedded signature"
+msgstr "Firma incorporata versione documento"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr "è richiesta la passphrase per sbloccare questa chiave."
diff --git a/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.mo
index 092ae431c2..15626deb74 100644
Binary files a/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.po
index 734f31fb28..f47bdb8490 100644
--- a/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-09 16:39+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -20,27 +20,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Documenthandtekeningen"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Datum"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "Sleutel-ID"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr "Handtekening-ID"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Geen"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Type"
 
@@ -100,7 +100,7 @@ msgstr "Sleutelsoort"
 msgid "Verify all documents"
 msgstr "Verifieer alle documenten"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Handtekeningen"
 
@@ -212,6 +212,26 @@ msgstr ""
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Document signatures"
+msgid "Verify key signatures"
+msgstr "Documenthandtekeningen"
+
+#: queues.py:15
+msgid "Unverify key signatures"
+msgstr ""
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Document version"
+msgid "Verify document version"
+msgstr "Documentversie"
+
+#: queues.py:24
+msgid "Verify missing embedded signature"
+msgstr ""
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.mo
index f995fbf736..a03676abf6 100644
Binary files a/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.po
index 7b416db05b..a7c95aae2e 100644
--- a/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,27 +21,27 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Document signatures"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Data"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "Key ID"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Brak"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Typ"
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -213,6 +213,30 @@ msgstr "Verify document signatures"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verify document signatures"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verify document signatures"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verify document signatures"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "Verify document signatures"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.mo
index 3ed372d876..44a024bbb1 100644
Binary files a/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.po
index 3e6debac58..5a4ef6e6d8 100644
--- a/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/pt/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,27 +20,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Assinaturas do documento"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Data"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "ID da chave"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Nenhum"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Assinaturas"
 
@@ -212,6 +212,30 @@ msgstr "Verificar as assinaturas do documento"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verificar as assinaturas do documento"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verificar as assinaturas do documento"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verificar as assinaturas do documento"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "Verificar as assinaturas do documento"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.mo
index 6e9f51a820..ffba937c48 100644
Binary files a/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.po
index 7096124e2c..bb2f0e353b 100644
--- a/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-17 22:53+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -21,27 +21,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Assinaturas de documentos"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Data"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "ID da chave"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr "ID da assinatura"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Nenhum"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Tipo"
 
@@ -101,7 +101,7 @@ msgstr "Tipo de chave"
 msgid "Verify all documents"
 msgstr "Verificar todos os documentos"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "assinaturas"
 
@@ -213,6 +213,30 @@ msgstr "Verificar as assinaturas de documentos"
 msgid "View details of document signatures"
 msgstr "Ver detalhes da assinatura de documentos"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verificar as assinaturas de documentos"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verificar as assinaturas de documentos"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verificar as assinaturas de documentos"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Document version embedded signature"
+msgid "Verify missing embedded signature"
+msgstr "Versão do documento da assinatura integrada"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr "É preciso senha para acessar a chave."
diff --git a/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.mo
index ac1f1121c7..dc36aa6e29 100644
Binary files a/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.po
index 6fb87518fd..e7bc43bd69 100644
--- a/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -21,27 +21,27 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Document de semnături"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Data"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "ID cheie"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Nici unul"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Tip"
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -213,6 +213,30 @@ msgstr "Verifica semnăturile de documente"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Verifica semnăturile de documente"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Verifica semnăturile de documente"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Verifica semnăturile de documente"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "Verifica semnăturile de documente"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.mo
index 1cb5e15ea2..dacab4353a 100644
Binary files a/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.po
index 640ed250c2..9358555ef9 100644
--- a/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/ru/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-07-19 20:01+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,27 +23,27 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Подписи документа"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Дата"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "ID ключа"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr "ID подписи"
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Ни один"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr "Тип"
 
@@ -103,7 +103,7 @@ msgstr "Тип ключа"
 msgid "Verify all documents"
 msgstr "Проверить все документы"
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr "Подписи"
 
@@ -215,6 +215,30 @@ msgstr "Проверить подпись документа"
 msgid "View details of document signatures"
 msgstr "Посмотреть подробности подписей документов"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "Проверить подпись документа"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "Проверить подпись документа"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "Проверить подпись документа"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Document version embedded signature"
+msgid "Verify missing embedded signature"
+msgstr "Встроенная подпись версии документа"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr "Для разблокироваки этого ключа необходима кодовая фраза"
diff --git a/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.mo
index 70e0cd4442..41bd285e50 100644
Binary files a/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.po
index b65172f98c..26732019a0 100644
--- a/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -20,27 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr ""
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr ""
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr ""
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "Brez"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -212,6 +212,22 @@ msgstr ""
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+msgid "Verify key signatures"
+msgstr ""
+
+#: queues.py:15
+msgid "Unverify key signatures"
+msgstr ""
+
+#: queues.py:19
+msgid "Verify document version"
+msgstr ""
+
+#: queues.py:24
+msgid "Verify missing embedded signature"
+msgstr ""
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.mo
index 9075060959..00dd0ce572 100644
Binary files a/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.po
index e0e5dafae0..0ad59155fb 100644
--- a/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -20,27 +20,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "Chữ kí tài liệu"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "Ngày"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "Key ID"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "None"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -212,6 +212,30 @@ msgstr "xác nhận chữ kí tài liệu"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "xác nhận chữ kí tài liệu"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "xác nhận chữ kí tài liệu"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "xác nhận chữ kí tài liệu"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "xác nhận chữ kí tài liệu"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.mo
index 3864017893..6de21fcc06 100644
Binary files a/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.po
index 498c5974a8..29c3330930 100644
--- a/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_signatures/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-27 18:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,27 +20,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:51 permissions.py:8 settings.py:7
+#: apps.py:52 permissions.py:8 settings.py:7
 msgid "Document signatures"
 msgstr "文档签名"
 
-#: apps.py:91
+#: apps.py:92
 msgid "Date"
 msgstr "日期"
 
-#: apps.py:94 models.py:47
+#: apps.py:95 models.py:47
 msgid "Key ID"
 msgstr "密钥ID"
 
-#: apps.py:98 forms.py:64 models.py:51
+#: apps.py:99 forms.py:64 models.py:51
 msgid "Signature ID"
 msgstr ""
 
-#: apps.py:99 forms.py:76
+#: apps.py:100 forms.py:76
 msgid "None"
 msgstr "无"
 
-#: apps.py:102
+#: apps.py:103
 msgid "Type"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Verify all documents"
 msgstr ""
 
-#: links.py:39
+#: links.py:39 queues.py:8
 msgid "Signatures"
 msgstr ""
 
@@ -212,6 +212,30 @@ msgstr "核对文档签名"
 msgid "View details of document signatures"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify key signatures"
+msgstr "核对文档签名"
+
+#: queues.py:15
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Unverify key signatures"
+msgstr "核对文档签名"
+
+#: queues.py:19
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify document version"
+msgstr "核对文档签名"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Verify document signatures"
+msgid "Verify missing embedded signature"
+msgstr "核对文档签名"
+
 #: views.py:60 views.py:155
 msgid "Passphrase is needed to unlock this key."
 msgstr ""
diff --git a/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.mo
index bd06c9666e..8271e9293d 100644
Binary files a/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.po
index 78ec7bdafb..7681f6b154 100644
--- a/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,59 +19,80 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "لا شيء"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "مستخدم"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "تعليق"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -83,7 +104,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -107,7 +128,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,87 +144,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.mo
index 18744aac8d..2324170d9b 100644
Binary files a/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.po
index 6f6b1a5404..5ba381d5ce 100644
--- a/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,59 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Няма"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Потребител"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Коментар"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -82,7 +103,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -106,7 +127,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -122,87 +143,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.mo
index 04bf8bd013..cc72ef349a 100644
Binary files a/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.po
index 1bb190234a..4c1308a6b5 100644
--- a/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -19,59 +19,80 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Nijedno"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Korisnik"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Komentar"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -83,7 +104,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -107,7 +128,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,87 +144,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/da/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/da/LC_MESSAGES/django.mo
index 367b668685..00cad89429 100644
Binary files a/mayan/apps/document_states/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/da/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/da/LC_MESSAGES/django.po
index 065fbf0098..20312be41e 100644
--- a/mayan/apps/document_states/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -18,59 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Ingen"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Bruger"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Kommentar"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -82,7 +103,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -106,7 +127,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -122,87 +143,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.mo
index 17b6171957..b800def799 100644
Binary files a/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.po
index 36a2a013b9..3aac9d3109 100644
--- a/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/de_DE/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-24 23:13+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -20,59 +20,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr "Status"
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create states for workflow: %s"
+msgid "Current state of a workflow"
+msgstr "Status für Workflow %s erstellen"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Bezeichnung"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "Initialstatus"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Keiner"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "Aktueller Status"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Benutzer"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr "Letzter Übergang"
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "Datum und Zeit"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr "Fertigstellung"
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "Übergang"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Kommentar"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr "Initialstatus"
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr "Herkunftsstatus"
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr "Zielstatus"
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr "Workflows"
 
@@ -84,7 +107,7 @@ msgstr "Workflow erstellen"
 msgid "Delete"
 msgstr "Löschen"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Dokumententypen"
 
@@ -108,7 +131,7 @@ msgstr "Übergang erstellen"
 msgid "Transitions"
 msgstr "Übergänge"
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr "Alle Workflows starten"
 
@@ -124,15 +147,17 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Bezeichnung"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "Workflow"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
@@ -140,11 +165,11 @@ msgstr ""
 "Diesen Status markieren, wenn der Workflow damit starten soll. Nur ein "
 "Status kann initial sein."
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "Initial"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
@@ -152,63 +177,63 @@ msgstr ""
 "Ermöglicht den Eintrag einer Zahl (ohne Prozentzeichen), die den Stand der "
 "Fertigstellung in Bezug auf den Workflow angibt."
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "Workflow Status"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "Workflow Status"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr "Workflow Übergang"
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr "Workflow Übergänge"
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Dokument"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr "Workflow"
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr "Workflows"
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr "Zeit"
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr "Workflow Logeintrag"
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr "Workflow Logeinträge"
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/en/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/en/LC_MESSAGES/django.mo
index 6584aef737..7c2464b7fe 100644
Binary files a/mayan/apps/document_states/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/en/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/en/LC_MESSAGES/django.po
index 681c22b4cf..787c897299 100644
--- a/mayan/apps/document_states/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,59 +17,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr ""
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr ""
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr ""
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -81,7 +102,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -105,7 +126,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -121,87 +142,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/es/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/es/LC_MESSAGES/django.mo
index af9473c641..cea2eac7da 100644
Binary files a/mayan/apps/document_states/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/es/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/es/LC_MESSAGES/django.po
index 14f08444d8..44bcb23f06 100644
--- a/mayan/apps/document_states/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-23 02:58+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,59 +20,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr "Estados de documentos"
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create states for workflow: %s"
+msgid "Current state of a workflow"
+msgstr "Crear estados para el flujo de trabajo: %s"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Etiqueta"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "Estado inicial"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Ninguno"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "Estado actual"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Usuario"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr "Última transición"
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "Fecha y hora"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr "Cantidad de completación"
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "Transición"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Comentario"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr "¿Es el estado inicial?"
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr "Estado origen"
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr "Estado destino"
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr "Flujos de trabajo"
 
@@ -84,7 +107,7 @@ msgstr "Crear flujo de trabajo"
 msgid "Delete"
 msgstr "Borrar"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Tipos de documentos"
 
@@ -108,7 +131,7 @@ msgstr "Crear transición"
 msgid "Transitions"
 msgstr "Transiciones"
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr "Iniciar todos los flujos de trabajo"
 
@@ -124,15 +147,17 @@ msgstr "Documentos del flujo de trabajo"
 msgid "State documents"
 msgstr "Documentos del estado de flujo"
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Etiqueta"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "Flujo de trabajo"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
@@ -140,11 +165,11 @@ msgstr ""
 "Seleccione si este va a ser el estado con el que desea que el flujo de "
 "trabajo comience. Sólo un estado puede ser el estado inicial."
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "Inicial"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
@@ -152,63 +177,63 @@ msgstr ""
 "Introduzca el porcentaje de finalización que este estado representa en "
 "relación con el flujo de trabajo. Utilice números sin el signo de porcentaje."
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "Estado de flujo de trabajo"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "Estados de flujo de trabajo"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr "Transición de flujo de trabajo"
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr "Transiciones de flujo de trabajo"
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Documento"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr "Instancia de flujo de trabajo"
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr "Instancias de flujo de trabajo"
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr "Fecha y hora"
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr "Entrada de registro de la instancia de flujo de trabajo"
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr "Entradas de registro de las instancias de flujos de trabajo"
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr "No hay opción valida de transición."
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.mo
index 542eccc24f..95bb1db95b 100644
Binary files a/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.po
index ec03b1a417..bfb7bbf5fd 100644
--- a/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,59 +19,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create states for workflow: %s"
+msgid "Current state of a workflow"
+msgstr "وضعیت ایجاد برای گردشکار : %s"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "برچسب"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "وضعیت اولیه"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "هیچ"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "وضعیت فعلی"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "کاربر"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr "آخرین تغییر وضعیت"
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "تاریخ و زمان"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "تغییر وضعیت"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "شرح"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr "آیا در وضعیت اولیه است؟"
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr "وضعیت شروع"
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr "وضعیت نهایی"
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr "گردشکار"
 
@@ -83,7 +106,7 @@ msgstr ""
 msgid "Delete"
 msgstr "حذف"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "انواع سند"
 
@@ -107,7 +130,7 @@ msgstr "تغییر وضعیت به ایجاد"
 msgid "Transitions"
 msgstr "تغییر وضعیت ها"
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,15 +146,17 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "برچسب"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "گردشکار"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
@@ -139,73 +164,73 @@ msgstr ""
 "در صورتیکه این وضعیت شروع گردشکار باشد این وضعیت را انتخاب کنید. وضعیت فقط "
 "میتواند وضعیت اولیه باشد."
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "اولیه"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "وضعیت گردشکار"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "وضعیتهای گردشکار"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr "تغییر وضعیت گردشکار"
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr "تغییر وضعیت های گردشکار"
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "سند"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr "موردی از گردشکار"
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr "موردهای گردشکار"
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr "تاریخ زمان"
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr "ورودیه لاگ برای مورد گردشکار"
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr "ورودیهای مورد گردشکار"
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.mo
index 2580a7af68..ef80a2755e 100644
Binary files a/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.po
index 418ba177a4..b077a7d217 100644
--- a/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,59 +19,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr "États du document"
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create states for workflow: %s"
+msgid "Current state of a workflow"
+msgstr "Créer des états pour le flux de travail: %s"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Étiquette"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "État initial"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Aucun"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "État actuel"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Utilisateur"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr "Dernière transition"
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "Date et heure"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr "Finalisation"
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "Transition"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Commentaire"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr "Est ce l'état initial?"
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr "État d'origine"
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr "État de destination"
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr "Flux de travail"
 
@@ -83,7 +106,7 @@ msgstr "Créer un flux de travail"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Types de document"
 
@@ -107,7 +130,7 @@ msgstr "Créer une transition"
 msgid "Transitions"
 msgstr "Transitions"
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,15 +146,17 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Étiquette"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "Flux de travail"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
@@ -139,11 +164,11 @@ msgstr ""
 "Sélectionnez si ceci sera l'état avec lequel vous voulez que le flux de "
 "travail pour démarrer. Un seul état peut être à l'état initial."
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "Initial"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
@@ -151,63 +176,63 @@ msgstr ""
 "Entrer le pourcentage de finalisation que cet état représente dans la "
 "relation du flux de travail. Saisir un nombre sans le signe pourcentage."
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "État du flux de travail"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "États du flux de travail"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr "Transition du flux de travail"
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr "Transitions du flux de travail"
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Document"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr "Instance du flux de travail"
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr "Instances du flux de travail"
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr "Date et heure"
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr "Entrée de la journalisation de l'instance du flux de travail"
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr "Entrées de la journlisation du flux de travail"
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.mo
index 96e024e02e..e782d9690c 100644
Binary files a/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.po
index 5d67a02e9d..118bc549b7 100644
--- a/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,59 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Semmi"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Felhasználó"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -82,7 +103,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -106,7 +127,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -122,87 +143,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/id/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/id/LC_MESSAGES/django.mo
index 64e43d5243..e229b29c43 100644
Binary files a/mayan/apps/document_states/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/id/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/id/LC_MESSAGES/django.po
index a07ede27a5..56ced7b7d2 100644
--- a/mayan/apps/document_states/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,59 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr ""
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Pengguna"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Komentar"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -82,7 +103,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -106,7 +127,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -122,87 +143,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/it/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/it/LC_MESSAGES/django.mo
index 0523239c5a..e5dd410972 100644
Binary files a/mayan/apps/document_states/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/it/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/it/LC_MESSAGES/django.po
index 1f10d60cef..27003a95a6 100644
--- a/mayan/apps/document_states/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,59 +19,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr "Stati documento"
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create states for workflow: %s"
+msgid "Current state of a workflow"
+msgstr "Crea stati del workflow: %s"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Etichetta"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "Stato iniziale"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Nessuna "
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "Stato corrente"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Utente"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr "Ultima transizione"
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "Data e ora"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr "Completamento"
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "Transizione"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Commento"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr "Stato iniziale?"
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr "Stato originale"
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr "Stato di destinazione"
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr "I workflow"
 
@@ -83,7 +106,7 @@ msgstr "Crea workflow"
 msgid "Delete"
 msgstr "Cancella"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Tipi di documento"
 
@@ -107,7 +130,7 @@ msgstr "Crea transizione"
 msgid "Transitions"
 msgstr "Transizioni"
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,15 +146,17 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Etichetta"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "Workflow"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
@@ -139,11 +164,11 @@ msgstr ""
 "Seleziona se questo è lo stato da utilizzare quando il workflow inizia. Solo "
 "uno stato può essere quello iniziale."
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "Iniziale"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
@@ -151,63 +176,63 @@ msgstr ""
 "Inserisci la percentuale di completamento che questo stato rappresenta in "
 "relazione al workflow. Usa i numeri senza segno di percentuale."
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "Stato workflow"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "Stati workflow"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr "Transizione workflow"
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr "Transizioni workflow"
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Documento"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr "Istanza workflow"
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr "Istanze workflow"
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr "Data e ora"
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr "Voce log istanza workflow"
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr "Voci log istanza workflow"
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.mo
index 50981b3975..98ce7262de 100644
Binary files a/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.po
index f91574c720..472ed846ed 100644
--- a/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -19,59 +19,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr "Documentstaten"
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create workflows"
+msgid "Current state of a workflow"
+msgstr "Workflows aanmaken"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Label"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "Initiële staat"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Geen"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "Huidige staat"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Gebruiker"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr "Laatste transitie"
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "Datum en tijd"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr "Voltooiing"
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "Transitie"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Commentaar"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr "Originele staat"
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr "Bestemmingsstaat"
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -83,7 +106,7 @@ msgstr ""
 msgid "Delete"
 msgstr "Verwijder"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Documentsoorten"
 
@@ -107,7 +130,7 @@ msgstr "Transitie aanmaken"
 msgid "Transitions"
 msgstr "Transities"
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,87 +146,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "Workflow"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "Initieel"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "Workflowstaat"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "Workflowstaten"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr "Workflowtransitie"
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr "Workflowtransities"
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Document"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr "Workflowinstantie"
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr "Workflowinstanties"
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr "Datumtijd"
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.mo
index c586801861..9eea065dda 100644
Binary files a/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.po
index 70983513ab..3f23ae7189 100644
--- a/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/pl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,59 +21,82 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create states for workflow: %s"
+msgid "Current state of a workflow"
+msgstr "Utwórz stany obiegu dokumentów: %s"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Etykieta"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "Stan początkowy"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Brak"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "Aktualny stan"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Użytkownik"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "Data i godzina"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Komentarz"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr "Czy  jest stan początkowy?"
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -85,7 +108,7 @@ msgstr ""
 msgid "Delete"
 msgstr "Usuń"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Typy dokumentu"
 
@@ -109,7 +132,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -125,87 +148,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Etykieta"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "Obieg dokumentów"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "Początkowy"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "Stan obiegu"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "Stany obiegu"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Dokument"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.mo
index da4d0de8ba..58a50421bc 100644
Binary files a/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.po
index f1d267fe2a..3edb6c5490 100644
--- a/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,59 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Nome"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Nenhum"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Utilizador"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Comentário"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -82,7 +103,7 @@ msgstr ""
 msgid "Delete"
 msgstr "Eliminar"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -106,7 +127,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -122,87 +143,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Nome"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.mo
index 77dab71e05..72f156eaf8 100644
Binary files a/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.po
index 6db6a0c4e6..00f01c11f7 100644
--- a/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -20,59 +20,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr "Estados de documentos"
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Create states for workflow: %s"
+msgid "Current state of a workflow"
+msgstr "Criar estados para Workflow: %s"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Label"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "Estado Inicial"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Nenhum"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "Estado corrente"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Usuário"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr "Última transação"
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "data e hora"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr "Finalização"
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "Transações"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Comentário"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr "é  estado inicial?"
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr "Estado Original"
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr "Estado  de destino"
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr "Workflows"
 
@@ -84,7 +107,7 @@ msgstr "Criar fluxo de trabalho"
 msgid "Delete"
 msgstr "Excluir"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Tipos de Documentos"
 
@@ -108,7 +131,7 @@ msgstr "Criar Transições"
 msgid "Transitions"
 msgstr "Transações"
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -124,15 +147,17 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr "Workflow"
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
@@ -140,11 +165,11 @@ msgstr ""
 "Selecione se este será o estado com o qual você deseja que o fluxo de "
 "trabalho para começar em. Apenas um Estado pode ser o estado inicial."
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr "Inicial"
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
@@ -152,63 +177,63 @@ msgstr ""
 "Entre com a porcentagem de finalização que este estado representa em relação "
 "com o fluxo de trabalho. Utilize números sem o sinal de porcentagem."
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr "Estado do Workflow"
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr "Estados do Workflow"
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr "Transição do Workflow"
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr "Transição dos Workflows"
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Documento"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr "Instância do Workflow"
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr "instâncias do Workflow "
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr "Hora e data"
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr "Workflow instance log de entrada "
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr "Workflow instance log de entradas"
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.mo
index cf7d43733f..2bffe6d902 100644
Binary files a/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.po
index 0f4fb8b1fe..d58d61efdf 100644
--- a/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -19,59 +19,80 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Etichetă"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Nici unul"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "utilizator"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Comentariu"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -83,7 +104,7 @@ msgstr ""
 msgid "Delete"
 msgstr "Șterge"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -107,7 +128,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,87 +144,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Etichetă"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.mo
index 653fa93210..b48eaf8ef1 100644
Binary files a/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.po
index dcbf71b4c2..32d33a5116 100644
--- a/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,59 +21,82 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr "Статусы документа"
 
+#: apps.py:69 apps.py:76
+#, fuzzy
+#| msgid "Current state"
+msgid "Current state of a workflow"
+msgstr "Текущее состояние"
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Надпись"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr "Исходное состояние"
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Ничего"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr "Текущее состояние"
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Пользователь"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr "Дата и время"
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr "Завершение"
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr "Переход"
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Комментарий"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -85,7 +108,7 @@ msgstr ""
 msgid "Delete"
 msgstr "Удалить"
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr "Типы документов"
 
@@ -109,7 +132,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -125,87 +148,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Надпись"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Документ"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.mo
index 69748f009b..ac221aab2d 100644
Binary files a/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.po
index 983e8272d2..4ab431c7f5 100644
--- a/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-23 16:43+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -19,59 +19,80 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr "Oznaka"
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "Brez"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr ""
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Komentar"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -83,7 +104,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -107,7 +128,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -123,87 +144,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
-msgstr "Oznaka"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
+msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr "Dokument"
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.mo
index a53497a5c0..f30abe7ce9 100644
Binary files a/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.po
index 9154482951..15268df8d0 100644
--- a/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -18,59 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "None"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "Người dùng"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "Chú thích"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -82,7 +103,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -106,7 +127,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -122,87 +143,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.mo
index 09a57bfa83..0118077c75 100644
Binary files a/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.po
index 87e48087a3..f9be85d283 100644
--- a/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/document_states/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,59 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:41
+#: apps.py:44 queues.py:8
 msgid "Document states"
 msgstr ""
 
+#: apps.py:69 apps.py:76
+msgid "Current state of a workflow"
+msgstr ""
+
 #: apps.py:70
+msgid "Return the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:77
+msgid ""
+"Return the completion value of the current state of the selected workflow"
+msgstr ""
+
+#: apps.py:92 models.py:37 models.py:94 models.py:129
+msgid "Label"
+msgstr ""
+
+#: apps.py:95 models.py:34
+msgid "Internal name"
+msgstr ""
+
+#: apps.py:99
 msgid "Initial state"
 msgstr ""
 
-#: apps.py:71 apps.py:81 apps.py:91 apps.py:97
+#: apps.py:100 apps.py:110 apps.py:120 apps.py:126
 msgid "None"
 msgstr "无"
 
-#: apps.py:75
+#: apps.py:104
 msgid "Current state"
 msgstr ""
 
-#: apps.py:79 apps.py:106 models.py:269
+#: apps.py:108 apps.py:135 models.py:276
 msgid "User"
 msgstr "用户"
 
-#: apps.py:85
+#: apps.py:114
 msgid "Last transition"
 msgstr ""
 
-#: apps.py:89 apps.py:102
+#: apps.py:118 apps.py:131
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:95 apps.py:122 models.py:99
+#: apps.py:124 apps.py:151 models.py:106
 msgid "Completion"
 msgstr ""
 
-#: apps.py:109 forms.py:43 links.py:85 models.py:267
+#: apps.py:138 forms.py:43 links.py:85 models.py:274
 msgid "Transition"
 msgstr ""
 
-#: apps.py:113 forms.py:46 models.py:270
+#: apps.py:142 forms.py:46 models.py:277
 msgid "Comment"
 msgstr "评论"
 
-#: apps.py:118
+#: apps.py:147
 msgid "Is initial state?"
 msgstr ""
 
-#: apps.py:126 models.py:126
+#: apps.py:155 models.py:133
 msgid "Origin state"
 msgstr ""
 
-#: apps.py:130 models.py:130
+#: apps.py:159 models.py:137
 msgid "Destination state"
 msgstr ""
 
-#: links.py:15 links.py:38 links.py:95 models.py:69 views.py:130 views.py:409
+#: links.py:15 links.py:38 links.py:95 models.py:76 views.py:130 views.py:409
 msgid "Workflows"
 msgstr ""
 
@@ -82,7 +103,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:29 models.py:34
+#: links.py:29 models.py:41
 msgid "Document types"
 msgstr ""
 
@@ -106,7 +127,7 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: links.py:77
+#: links.py:77 queues.py:12
 msgid "Launch all workflows"
 msgstr ""
 
@@ -122,87 +143,89 @@ msgstr ""
 msgid "State documents"
 msgstr ""
 
-#: models.py:30 models.py:87 models.py:122
-msgid "Label"
+#: models.py:31
+msgid ""
+"This value will be used by other apps to reference this workflow. Can only "
+"contain letters, numbers, and underscores."
 msgstr ""
 
-#: models.py:68 models.py:85 models.py:120 models.py:148
+#: models.py:75 models.py:92 models.py:127 models.py:155
 msgid "Workflow"
 msgstr ""
 
-#: models.py:91
+#: models.py:98
 msgid ""
 "Select if this will be the state with which you want the workflow to start "
 "in. Only one state can be the initial state."
 msgstr ""
 
-#: models.py:93
+#: models.py:100
 msgid "Initial"
 msgstr ""
 
-#: models.py:97
+#: models.py:104
 msgid ""
 "Enter the percent of completion that this state represents in relation to "
 "the workflow. Use numbers without the percent sign."
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Workflow state"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Workflow states"
 msgstr ""
 
-#: models.py:141
+#: models.py:148
 msgid "Workflow transition"
 msgstr ""
 
-#: models.py:142
+#: models.py:149
 msgid "Workflow transitions"
 msgstr ""
 
-#: models.py:151
+#: models.py:158
 msgid "Document"
 msgstr ""
 
-#: models.py:246 models.py:261
+#: models.py:253 models.py:268
 msgid "Workflow instance"
 msgstr ""
 
-#: models.py:247
+#: models.py:254
 msgid "Workflow instances"
 msgstr ""
 
-#: models.py:264
+#: models.py:271
 msgid "Datetime"
 msgstr ""
 
-#: models.py:276
+#: models.py:283
 msgid "Workflow instance log entry"
 msgstr ""
 
-#: models.py:277
+#: models.py:284
 msgid "Workflow instance log entries"
 msgstr ""
 
-#: models.py:281
+#: models.py:288
 msgid "Not a valid transition choice."
 msgstr ""
 
-#: models.py:287
+#: models.py:294
 msgid "Workflow runtime proxy"
 msgstr ""
 
-#: models.py:288
+#: models.py:295
 msgid "Workflow runtime proxies"
 msgstr ""
 
-#: models.py:294
+#: models.py:301
 msgid "Workflow state runtime proxy"
 msgstr ""
 
-#: models.py:295
+#: models.py:302
 msgid "Workflow state runtime proxies"
 msgstr ""
 
diff --git a/mayan/apps/documents/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/ar/LC_MESSAGES/django.mo
index 050a6bfe8c..7d106d80b1 100644
Binary files a/mayan/apps/documents/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/ar/LC_MESSAGES/django.po b/mayan/apps/documents/locale/ar/LC_MESSAGES/django.po
index 44c949b1d6..ae83835e46 100644
--- a/mayan/apps/documents/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,103 +20,103 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "الوثائق"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "نوع الملف"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "تعليق"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgstr "Checksum"
 msgid "Pages"
 msgstr "صفحات"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "نوع الوثيقة"
@@ -307,7 +307,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -345,7 +345,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr "تحرير"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -472,52 +472,52 @@ msgstr ""
 msgid "File"
 msgstr "ملف"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "صفحة %(page_num)d من أصل %(total_pages)d للوثيقة %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "اسم الملف"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "مستخدم"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -589,6 +589,60 @@ msgstr "تحرير أنواع الوثائق"
 msgid "View document types"
 msgstr "عرض أنواع الوثائق"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "حذف الوثائق"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -623,24 +677,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "لا توجد صفحات أخرى بهذه الوثيقة"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "أنت بالفعل في الصفحة الأولى من هذه الوثيقة"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1184,9 +1238,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1255,9 +1306,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1283,9 +1331,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1376,9 +1421,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1441,9 +1483,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/bg/LC_MESSAGES/django.mo
index 06b4e94587..55f93a50ae 100644
Binary files a/mayan/apps/documents/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/bg/LC_MESSAGES/django.po b/mayan/apps/documents/locale/bg/LC_MESSAGES/django.po
index 514838bfa7..a65ce25ad4 100644
--- a/mayan/apps/documents/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Документи"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr ""
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Коментар"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr "Контролна сума"
 msgid "Pages"
 msgstr "Страници"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Вид на документа"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "Редактиране"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -473,54 +473,54 @@ msgstr ""
 msgid "File"
 msgstr "Файл"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr ""
 "Страница %(page_num)d от общо %(total_pages)d страници от %(document)s "
 "документи."
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Име на файл"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Потребител"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -592,6 +592,60 @@ msgstr "Редактиране на вида документи"
 msgid "View document types"
 msgstr "Преглед на типовете документи"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Изтриване на документи"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -635,24 +689,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Няма повече страници в този документ"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Вече сте на първа страница на този документ"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1182,9 +1236,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1253,9 +1304,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1281,9 +1329,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1374,9 +1419,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1439,9 +1481,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.mo
index fc36d15792..9a60d28577 100644
Binary files a/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.po
index 32a3300cc6..0965d30923 100644
--- a/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/bs_BA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -20,103 +20,103 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME tip"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Komentar"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgstr "Checksum"
 msgid "Pages"
 msgstr "Stranice"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Tip dokumenta"
@@ -307,7 +307,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr "Urediti"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -474,52 +474,52 @@ msgstr ""
 msgid "File"
 msgstr "Datoteka"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Stranica %(page_num)d od ukupno %(total_pages)d u %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Korisnik"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -591,6 +591,60 @@ msgstr "Izmijeni tipove dokumenata"
 msgid "View document types"
 msgstr "Pregledaj tipove dokumenata"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Obriši dokumente"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -631,24 +685,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Ovaj dokument nema više stranica."
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Već ste na prvoj stranici ovog dokumenta"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1180,9 +1234,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1251,9 +1302,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1279,9 +1327,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1372,9 +1417,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1437,9 +1479,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/da/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/da/LC_MESSAGES/django.mo
index eb8c8020ae..d361965940 100644
Binary files a/mayan/apps/documents/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/da/LC_MESSAGES/django.po b/mayan/apps/documents/locale/da/LC_MESSAGES/django.po
index 2115adb996..c1259bcbd3 100644
--- a/mayan/apps/documents/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME type"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Kommentar"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr "Checksum"
 msgid "Pages"
 msgstr "Sider"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Dokumenttype"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -473,52 +473,52 @@ msgstr ""
 msgid "File"
 msgstr "Fil"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Side %(page_num)d ud af %(total_pages)d i %(document)s "
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Filnavn"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Bruger"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -590,6 +590,60 @@ msgstr "Redigér dokumenttyper"
 msgid "View document types"
 msgstr "Vis dokumenttyper"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Slet dokumenter"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -630,24 +684,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Der er ikke flere sider i dette dokument"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Du er allerede på den første side af dette dokument"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1177,9 +1231,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1248,9 +1299,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1276,9 +1324,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1369,9 +1414,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1434,9 +1476,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.mo
index 8ddb15f6c2..28945d1a0c 100644
Binary files a/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po
index 9b9ae44f8f..3bc8f0637d 100644
--- a/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-24 22:24+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -23,36 +23,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Dokumente"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr "Neue Seiten in diesem Monat"
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr "Neue Dokumente in diesem Monat"
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr "Alle Dokumente"
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Dokumententypen"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr "Dokumente im Papierkorb"
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Dokumententyp erstellen"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
@@ -60,68 +60,68 @@ msgstr ""
 "Jedes hochgeladene Dokument muss einen Dokumententyp zugewiesen bekommen, da "
 "Mayan EDMS Dokumente auf der Grundlage von Dokumententypen kategorisiert. "
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Bezeichner"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr "Der MIME-Typ der jeweiligen Dokumentenversion"
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME Typ"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Miniaturbild"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Typ"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr "Zeitpunkt der Löschung"
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Zeit und Datum"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Kommentar"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Neue Dokumente pro Monat"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Neue Dokumentenversionen pro Monat"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Neue Dokumentenseiten pro Monat"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr "Summe der Dokumente im Monat"
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr "Summe der Dokumentenversionen im Monat"
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr "Summe der Dokumentenseiten im Monat"
 
@@ -214,7 +214,7 @@ msgstr "Prüfsumme"
 msgid "Pages"
 msgstr "Seiten"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Dokumententyp"
@@ -315,7 +315,7 @@ msgstr "Version herunterladen"
 msgid "All documents"
 msgstr "Alle Dokumente"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Letzte Dokumente"
 
@@ -355,7 +355,7 @@ msgstr "Vorherige Seite"
 msgid "Next page"
 msgstr "Nächste Seite"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Dokument"
 
@@ -395,7 +395,7 @@ msgstr "Bearbeiten"
 msgid "Add quick label to document type"
 msgstr "Schnellbezeichner zu Dokumententyp hinzufügen"
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr "Schnellbezeichner"
 
@@ -489,52 +489,52 @@ msgstr "Zeitstempel"
 msgid "File"
 msgstr "Datei"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Dokumentenversion"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr "Schnellbezeichner"
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Seitennummer"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Seite %(page_num)d von %(total_pages)d des Dokuments %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Dokumentenseite"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Dokumentenseiten"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Dateiname"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Benutzer"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Letzter Zugriff"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "Letztes Dokument"
 
@@ -606,6 +606,62 @@ msgstr "Dokumententypen bearbeiten"
 msgid "View document types"
 msgstr "Dokumententypen anzeigen"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Dokumentenversion"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Dokumente löschen"
+
+#: queues.py:33
+#, fuzzy
+#| msgid "Clear document image cache"
+msgid "Clear image cache"
+msgstr "Dokumentenbildercache löschen"
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Document page image"
+msgid "Generate document page image"
+msgstr "Dokumentenseitenbild"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -643,24 +699,24 @@ msgstr "Standarddokumentensprache (im ISO639-2 Format)"
 msgid "List of supported document languages."
 msgstr "Liste der unterstützen Dokumentensprachen"
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr "Seiten des Dokuments: %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Keine weiteren Seiten in diesem Dokument"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Sie sind bereits auf der ersten Seite dieses Dokuments"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr "Seitenbild für %s"
@@ -1263,9 +1319,6 @@ msgstr "Dokumentenseitenbild"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1291,9 +1344,6 @@ msgstr "Dokumentenseitenbild"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1449,9 +1499,6 @@ msgstr "Dokumentenseitenbild"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/en/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/en/LC_MESSAGES/django.mo
index 7f9f0deeec..72f0b40f0f 100644
Binary files a/mayan/apps/documents/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/en/LC_MESSAGES/django.po b/mayan/apps/documents/locale/en/LC_MESSAGES/django.po
index 0f33809efa..2b68f0387f 100644
--- a/mayan/apps/documents/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2013-11-20 11:36+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,124 +18,124 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documents"
 
-#: apps.py:110
+#: apps.py:111
 #, fuzzy
 #| msgid "View document types"
 msgid "New pages this month"
 msgstr "View document types"
 
-#: apps.py:119
+#: apps.py:120
 #, fuzzy
 #| msgid "New document filename"
 msgid "New documents this month"
 msgstr "New document filename"
 
-#: apps.py:128
+#: apps.py:129
 #, fuzzy
 #| msgid "Transform documents"
 msgid "Total documents"
 msgstr "Transform documents"
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 #, fuzzy
 msgid "Document types"
 msgstr "Document type"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 #, fuzzy
 #| msgid "Documents in storage: %d"
 msgid "Documents in trash"
 msgstr "Documents in storage: %d"
 
-#: apps.py:145
+#: apps.py:146
 #, fuzzy
 msgid "Create a document type"
 msgstr "Create document types"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME type"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 #, fuzzy
 msgid "Thumbnail"
 msgstr "thumbnail"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 #, fuzzy
 msgid "Enabled"
 msgstr "enabled"
 
-#: apps.py:253
+#: apps.py:254
 #, fuzzy
 msgid "Date time trashed"
 msgstr "Date added"
 
-#: apps.py:258
+#: apps.py:259
 #, fuzzy
 msgid "Time and date"
 msgstr "time and date"
 
-#: apps.py:266
+#: apps.py:267
 #, fuzzy
 msgid "Encoding"
 msgstr "encoding"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Comment"
 
-#: apps.py:456
+#: apps.py:457
 #, fuzzy
 #| msgid "New document filename"
 msgid "New documents per month"
 msgstr "New document filename"
 
-#: apps.py:463
+#: apps.py:464
 #, fuzzy
 #| msgid "Document version reverted successfully"
 msgid "New document versions per month"
 msgstr "Document version reverted successfully"
 
-#: apps.py:470
+#: apps.py:471
 #, fuzzy
 #| msgid "View document types"
 msgid "New document pages per month"
 msgstr "View document types"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -238,7 +238,7 @@ msgstr "Checksum"
 msgid "Pages"
 msgstr "Pages"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Document type"
@@ -356,7 +356,7 @@ msgstr "document version"
 msgid "All documents"
 msgstr "all documents"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 #, fuzzy
 msgid "Recent documents"
 msgstr "recent documents"
@@ -405,7 +405,7 @@ msgstr "previous page"
 msgid "Next page"
 msgstr "next page"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 #, fuzzy
 msgid "Document"
 msgstr "Documents"
@@ -454,7 +454,7 @@ msgstr ""
 msgid "Add quick label to document type"
 msgstr "add filename to document type"
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -554,59 +554,59 @@ msgstr "timestamp"
 msgid "File"
 msgstr "Filename"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 #, fuzzy
 msgid "Document version"
 msgstr "document version"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 #, fuzzy
 msgid "Page number"
 msgstr "page number"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Page %(page_num)d out of %(total_pages)d of %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 #, fuzzy
 msgid "Document page"
 msgstr "document page"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 #, fuzzy
 msgid "Document pages"
 msgstr "document pages"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Filename"
 
-#: models.py:825
+#: models.py:845
 #, fuzzy
 msgid "Document page cached image"
 msgstr "document page image"
 
-#: models.py:826
+#: models.py:846
 #, fuzzy
 msgid "Document page cached images"
 msgstr "document page image"
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr ""
 
-#: models.py:854
+#: models.py:874
 #, fuzzy
 msgid "Accessed"
 msgstr "accessed"
 
-#: models.py:868
+#: models.py:888
 #, fuzzy
 msgid "Recent document"
 msgstr "recent document"
@@ -685,6 +685,57 @@ msgstr "Edit document types"
 msgid "View document types"
 msgstr "View document types"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+msgid "Documents periodic"
+msgstr "document version"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Delete documents"
+
+#: queues.py:33
+#, fuzzy
+#| msgid "Clear the document image cache"
+msgid "Clear image cache"
+msgstr "Clear the document image cache"
+
+#: queues.py:38
+#, fuzzy
+msgid "Generate document page image"
+msgstr "document page image"
+
+#: queues.py:43
+#, fuzzy
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -725,24 +776,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, fuzzy, python-format
 msgid "Pages for document: %s"
 msgstr "versions for document: %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "There are no more pages in this document"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "You are already at the first page of this document"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, fuzzy, python-format
 msgid "Image of: %s"
 msgstr "duplicates of: %s"
@@ -1444,10 +1495,6 @@ msgstr "document page image"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#, fuzzy
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1475,10 +1522,6 @@ msgstr "document page image"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#, fuzzy
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1643,9 +1686,6 @@ msgstr "document page image"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/es/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/es/LC_MESSAGES/django.mo
index 72651b6849..db03374428 100644
Binary files a/mayan/apps/documents/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/es/LC_MESSAGES/django.po b/mayan/apps/documents/locale/es/LC_MESSAGES/django.po
index 6349b1cbf8..80b31cd93d 100644
--- a/mayan/apps/documents/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 17:56+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,103 +20,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documentos"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr "Nuevas páginas este mes"
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr "Nuevos documentos este mes"
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr "Total de documentos"
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Tipos de documentos"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr "Documentos en la papelera"
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Crear tipo un tipo de documento"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Etiqueta"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Foto miniatura"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Tipo"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Activado"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr "Fecha y hora de envío a papelera  "
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Hora y fecha"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Codificación"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Comentario"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Nuevos documentos por mes"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Nuevas versiones de documentos por mes"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Nuevas páginas de documentos por mes"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr "Total de documentos cada mes"
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr "Total de versiones de documentos cada mes"
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr "Total de páginas de documentos cada mes"
 
@@ -209,7 +209,7 @@ msgstr "Suma de comprobación"
 msgid "Pages"
 msgstr "Páginas"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Tipo de documento"
@@ -311,7 +311,7 @@ msgstr "Descarga de versión"
 msgid "All documents"
 msgstr "Todos los documentos"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Documentos recientes"
 
@@ -352,7 +352,7 @@ msgstr "Página previa"
 msgid "Next page"
 msgstr "Próxima página"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Documento"
 
@@ -392,7 +392,7 @@ msgstr "Editar"
 msgid "Add quick label to document type"
 msgstr "Añadir nombre típico al tipo de documento"
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr "Nombres típicos "
 
@@ -483,52 +483,52 @@ msgstr "Marca de tiempo"
 msgid "File"
 msgstr "Archivo"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Versión de documento"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr "Etiqueta rapida"
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Número de página"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Página %(page_num)d de %(total_pages)d de %(document)s "
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Página de documento"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Páginas de documento"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Usuario"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Accedido"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "Documento reciente"
 
@@ -600,6 +600,62 @@ msgstr "Editar tipos de documentos"
 msgid "View document types"
 msgstr "Ver los tipos de documentos"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Versión de documento"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Eliminar documentos"
+
+#: queues.py:33
+#, fuzzy
+#| msgid "Clear document image cache"
+msgid "Clear image cache"
+msgstr "Borrar la caché de imágenes de documentos"
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Document page image"
+msgid "Generate document page image"
+msgstr "Imagen de página de documento"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -644,24 +700,24 @@ msgstr "Idioma por defecto para documentos (en formato ISO639-2)."
 msgid "List of supported document languages."
 msgstr "Lista de idiomas de documento apoyados."
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr "Pagínas para documento: %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "No hay más páginas en este documento"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Usted ya está en la primera página de este documento"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr "Imágen de: %s"
@@ -1262,9 +1318,6 @@ msgstr "Imagen de página de documento"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1290,9 +1343,6 @@ msgstr "Imagen de página de documento"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1448,9 +1498,6 @@ msgstr "Imagen de página de documento"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/fa/LC_MESSAGES/django.mo
index 62c9ab0af4..4a3a885c78 100644
Binary files a/mayan/apps/documents/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/fa/LC_MESSAGES/django.po b/mayan/apps/documents/locale/fa/LC_MESSAGES/django.po
index fb0b747e35..a2d5388839 100644
--- a/mayan/apps/documents/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "اسناد"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "انواع سند"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "برچسب"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "نوع MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "اندازه کوچک"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "نوع"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "فعال شده"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "تاریخ و زمان"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Encoding"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "شرح"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr "چک سام"
 msgid "Pages"
 msgstr "صفحات"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "نوع سند"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "All documents"
 msgstr "کلیه اسناد"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "اسناد تازه"
 
@@ -346,7 +346,7 @@ msgstr "صفحه قبلی"
 msgid "Next page"
 msgstr "صفحه بعدی"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "سند"
 
@@ -386,7 +386,7 @@ msgstr "ویرایش"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -473,52 +473,52 @@ msgstr "علامت زمان"
 msgid "File"
 msgstr "فایل"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "نسخه سند"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "شماره صفحه"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "صفحه  شماره%(page_num)d   از%(total_pages)d  از سند %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "صفحه سند"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "صفحات سند"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "نام فایل"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "کاربر"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "دسترسی یافته"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "سند تازه"
 
@@ -590,6 +590,60 @@ msgstr "ویرایش انواع سند"
 msgid "View document types"
 msgstr "بازدید انواع سند"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "نسخه سند"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "حذف سند"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Document page image"
+msgid "Generate document page image"
+msgstr "عکس صفحه سند"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -630,24 +684,24 @@ msgstr "زبان پیش فرض اسناد (in ISO639-2) میباشد."
 msgid "List of supported document languages."
 msgstr "لیست زبانهای پشتیبانی سند"
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "پایان صفحات سند"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "شما در حال حاضر برروی اولین صفحه این سند میباشید."
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1242,9 +1296,6 @@ msgstr "عکس صفحه سند"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1270,9 +1321,6 @@ msgstr "عکس صفحه سند"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1428,9 +1476,6 @@ msgstr "عکس صفحه سند"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/fr/LC_MESSAGES/django.mo
index 4def638b34..b98af21742 100644
Binary files a/mayan/apps/documents/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/fr/LC_MESSAGES/django.po b/mayan/apps/documents/locale/fr/LC_MESSAGES/django.po
index aa6c96a48a..aa6927e097 100644
--- a/mayan/apps/documents/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -22,36 +22,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documents"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Types de documents"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr "Documents dans la corbeille"
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Créer un type de document"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
@@ -59,68 +59,68 @@ msgstr ""
 "Chaque document téléchargé doit être associé à un type de document, cela "
 "permet à Mayan EDMS de catégoriser les documents."
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Libellé"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr "Type MIME d'une version quelconque d'un document"
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Vignette"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Type"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Activé"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr "Date et heure d'envoi à la corbeille"
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Heure et date"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Encodage"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Commentaire"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Nouveaux documents par mois"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Nouvelles versions de document par mois"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Nouvelles pages de document par mois"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr "Nombre total de documents chaque mois"
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr "Nombre total de versions de documents chaque mois"
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr "Nombre total de pages de documents chaque mois"
 
@@ -213,7 +213,7 @@ msgstr "Somme de contrôle"
 msgid "Pages"
 msgstr "Pages"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Type de document"
@@ -315,7 +315,7 @@ msgstr "Télécharger cette version"
 msgid "All documents"
 msgstr "Tous les documents"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Documents récents"
 
@@ -355,7 +355,7 @@ msgstr "Page précédente"
 msgid "Next page"
 msgstr "Page suivante"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Document"
 
@@ -395,7 +395,7 @@ msgstr "Modifier"
 msgid "Add quick label to document type"
 msgstr "Ajouter une étiquette rapide au document"
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr "Etiquettes rapides"
 
@@ -489,52 +489,52 @@ msgstr "Horodatage"
 msgid "File"
 msgstr "Fichier"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Version du document"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr "Étiquetage rapide"
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Numéro de page"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Page %(page_num)d sur %(total_pages)d de %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Page du document"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Pages du document"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Utilisateur"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Consulté"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "Document récent"
 
@@ -606,6 +606,62 @@ msgstr "Modifier les types de documents"
 msgid "View document types"
 msgstr "Afficher les types de documents"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Version du document"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Supprimer les documents"
+
+#: queues.py:33
+#, fuzzy
+#| msgid "Clear document image cache"
+msgid "Clear image cache"
+msgstr "Effacer les documents du cache"
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Document page image"
+msgid "Generate document page image"
+msgstr "Image de la page du document"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -649,24 +705,24 @@ msgstr "Langue des documents par défaut (au format ISO639-2)."
 msgid "List of supported document languages."
 msgstr "Liste des langues supportées du document."
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr "Pages du document : %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Il n'y a pas d'autres pages dans ce document"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Vous êtes déjà sur la première page du document"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr "Image de : %s"
@@ -1279,9 +1335,6 @@ msgstr "Image de la page du document"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1307,9 +1360,6 @@ msgstr "Image de la page du document"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1465,9 +1515,6 @@ msgstr "Image de la page du document"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/hu/LC_MESSAGES/django.mo
index 985b45e5c0..eeb36bd8c8 100644
Binary files a/mayan/apps/documents/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/hu/LC_MESSAGES/django.po b/mayan/apps/documents/locale/hu/LC_MESSAGES/django.po
index 63039e9452..002e9685d2 100644
--- a/mayan/apps/documents/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "dokumentumok"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME típus"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr "Ellenőrző összeg"
 msgid "Pages"
 msgstr "Lapok"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Dokumentum típus"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -473,54 +473,54 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr ""
 "Az oldalak száma %(page_num)d  nagyobb mint a  %(document)s oldalainak  "
 "száma: %(total_pages)d "
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Felhasználó"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -592,6 +592,60 @@ msgstr "Dokumentum típus szerkesztése"
 msgid "View document types"
 msgstr "Dokumentum típus megtekintése"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Dokumentum törlése"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -633,24 +687,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "a dokumentumnak nincs több oldala"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Ez már a dokumentum első oldala"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1179,9 +1233,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1250,9 +1301,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1278,9 +1326,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1371,9 +1416,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1436,9 +1478,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/id/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/id/LC_MESSAGES/django.mo
index fbde464755..50b61b9bbc 100644
Binary files a/mayan/apps/documents/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/id/LC_MESSAGES/django.po b/mayan/apps/documents/locale/id/LC_MESSAGES/django.po
index 4f34303d37..31e169aaac 100644
--- a/mayan/apps/documents/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Dokumen"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr ""
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Komentar"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr ""
 msgid "Pages"
 msgstr "Halaman-halaman"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Jenis dokumen"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -473,52 +473,52 @@ msgstr ""
 msgid "File"
 msgstr "File"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Halaman %(page_num)d dari %(total_pages)d untuk %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "namafile"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Pengguna"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -590,6 +590,60 @@ msgstr "Sunting jenis dokumen"
 msgid "View document types"
 msgstr "Lihat jenis-jenis dokumen"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Hapus dokumen"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -633,24 +687,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Tidak ada halaman lagi dalam dokumen ini"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Anda telah berada pada halaman pertama dari dokumen ini"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1176,9 +1230,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1247,9 +1298,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1275,9 +1323,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1368,9 +1413,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1433,9 +1475,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/it/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/it/LC_MESSAGES/django.mo
index 77f04b7c0c..8244e75413 100644
Binary files a/mayan/apps/documents/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/it/LC_MESSAGES/django.po b/mayan/apps/documents/locale/it/LC_MESSAGES/django.po
index 3e504d1519..528628207d 100644
--- a/mayan/apps/documents/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,36 +21,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documenti"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Tipi di documento"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr "Documenti nel cestino"
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Creare un tipo di documento"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
@@ -58,68 +58,68 @@ msgstr ""
 "Ad ogni documento caricato deve essere assegnato un tipo documento,  questa "
 "è la via più semplice per categorizzare i documenti in Mayan EDMS."
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Etichetta"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr "Il MIME Type di qualsiasi delle versioni del documento"
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Tipo"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr "Data e ora di spostamento nel cestino"
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Ora e data"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Codifica"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Commento"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Nuovi documenti per mese"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Nuove versioni dei documenti per mese"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Nuove pagine di documento per mese"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr "Totale documenti per ogni mese"
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr "Totale versioni di documento documento per ogni mese"
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr "Totale pagine documento per ogni mese"
 
@@ -212,7 +212,7 @@ msgstr "Checksum"
 msgid "Pages"
 msgstr "Pagine"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Tipo documento "
@@ -313,7 +313,7 @@ msgstr "Scarica versione"
 msgid "All documents"
 msgstr "Tutti i documenti"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Documenti recenti"
 
@@ -353,7 +353,7 @@ msgstr "Pagina precedente"
 msgid "Next page"
 msgstr "Pagina successiva"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Documento"
 
@@ -393,7 +393,7 @@ msgstr "Modifica"
 msgid "Add quick label to document type"
 msgstr "Aggiungi un'etichetta rapida al tipo documento"
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr "Etichette rapide"
 
@@ -487,52 +487,52 @@ msgstr "Timestamp"
 msgid "File"
 msgstr "File"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Versione documento"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr "Etichetta rapida"
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Numero di pagina"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Pagina %(page_num)d di %(total_pages)d del %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Pagina del documento"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Le pagine del documento"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Nome file"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Utente"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Acceduto"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "Documento recente "
 
@@ -604,6 +604,62 @@ msgstr "Modifica il tipo di documento"
 msgid "View document types"
 msgstr "Visualizza i tipi di documento"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Versione documento"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Cancella documenti"
+
+#: queues.py:33
+#, fuzzy
+#| msgid "Clear document image cache"
+msgid "Clear image cache"
+msgstr "Pulisci la cache delle immagini dei documenti"
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Document page image"
+msgid "Generate document page image"
+msgstr "Immagine pagina documento"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -646,24 +702,24 @@ msgstr "Lingua predefinita per idocumenti (in formato ISO639-2)."
 msgid "List of supported document languages."
 msgstr "Elenco delle lingue supportate nei documenti."
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr "Pagine del documento: %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Non ci sono più pagine in questo documento"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Sei già alla prima pagina del documento"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr "Immagine di: %s"
@@ -1267,9 +1323,6 @@ msgstr "Immagine pagina documento"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1295,9 +1348,6 @@ msgstr "Immagine pagina documento"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1453,9 +1503,6 @@ msgstr "Immagine pagina documento"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.mo
index 8ba897d593..48e86cb871 100644
Binary files a/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.po
index de143ee4f4..8df8156568 100644
--- a/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Johan Braeken\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -21,103 +21,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documenten"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Documentsoorten"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Een documentsoort aanmaken"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Label"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME type"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Thumbnail"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Type"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Tijd en datum"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Commentaar"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Nieuwe documenten per maand"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Nieuwe documentversies per maand"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Nieuwe documentpagina's per maand"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -210,7 +210,7 @@ msgstr "Checksum"
 msgid "Pages"
 msgstr "Pagina's"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Documentsoort"
@@ -309,7 +309,7 @@ msgstr ""
 msgid "All documents"
 msgstr "Alle documenten"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Recente documenten"
 
@@ -349,7 +349,7 @@ msgstr "Vorige bladzijde"
 msgid "Next page"
 msgstr "Volgende bladzijde"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Document"
 
@@ -389,7 +389,7 @@ msgstr "bewerken"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -476,52 +476,52 @@ msgstr "Timestamp"
 msgid "File"
 msgstr "Bestand"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Documentversie"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Paginanummer"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Pagina %(page_num)d van %(total_pages)d in %(document)s "
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Documentpagina"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Gebruiker"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -593,6 +593,60 @@ msgstr "Documentsoorten bewerken"
 msgid "View document types"
 msgstr "Bekijk de documentsoorten"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Documentversie"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Documenten verwijderen"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -631,24 +685,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Er zijn verder geen pagina's meer in dit document"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "U bent al op de eerste pagina in dit document"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1249,9 +1303,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1277,9 +1328,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1370,9 +1418,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1435,9 +1480,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/pl/LC_MESSAGES/django.mo
index 5850cc535e..d5622d0706 100644
Binary files a/mayan/apps/documents/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/pl/LC_MESSAGES/django.po b/mayan/apps/documents/locale/pl/LC_MESSAGES/django.po
index b67047c488..99cac2bf72 100644
--- a/mayan/apps/documents/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/pl/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -23,36 +23,36 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Typy dokumentów"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Utwórz typ dokumentu"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
@@ -60,68 +60,68 @@ msgstr ""
 "Każdy przesłany dokument musi mieć przypisany typ dokumentu, ponieważ jest "
 "to podstawowy sposób kategoryzacji dokumentów w Mayan EDMS."
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Etykieta"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr "Typ MIME każdej wersji dokumentu"
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Miniaturka"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Typ"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Włączone"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr "Data i czas umieszczenia w koszu"
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Czas i data"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Komentarz"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Nowe dokumenty miesięcznie"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Nowe wersje dokumentów miesięcznie"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Nowe strony dokumentów miesięcznie"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr "Liczba dokumentów w każdym miesiącu"
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr "Liczba wersji dokumentów w każdym miesiącu"
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr "Liczba stron dokumentów w każdym miesiącu"
 
@@ -214,7 +214,7 @@ msgstr "Suma kontrolna"
 msgid "Pages"
 msgstr "Strony"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Typ dokumentów"
@@ -316,7 +316,7 @@ msgstr ""
 msgid "All documents"
 msgstr "Wszystkie dokumenty"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Ostatnio przeglądane"
 
@@ -354,7 +354,7 @@ msgstr "Poprzednia strona"
 msgid "Next page"
 msgstr "Następna strona"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Dokument"
 
@@ -394,7 +394,7 @@ msgstr "Edytuj"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -481,52 +481,52 @@ msgstr "Pieczęć czasu"
 msgid "File"
 msgstr "Plik"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Wersja dokumentu"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Numer strony"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Strona %(page_num)d z %(total_pages)d stron dokumentu %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Strona dokumentu"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Strony dokumentu"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Nazwa"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Użytkownik"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Dostępne"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "Ostatni dokument"
 
@@ -598,6 +598,60 @@ msgstr "Edytuj typy dokumentów"
 msgid "View document types"
 msgstr "Zobacz typy dokumentów"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Wersja dokumentu"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Usuwanie dokumentów"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Create document type"
+msgid "Generate document page image"
+msgstr "Tworzenie typów dokumentów"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -632,24 +686,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr "Strony dokumentu: %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr ""
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Jesteś już na pierwszej stronie tego dokumentu"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1256,9 +1310,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1284,9 +1335,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1442,9 +1490,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/pt/LC_MESSAGES/django.mo
index bfb38d61a8..f121b3de24 100644
Binary files a/mayan/apps/documents/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/pt/LC_MESSAGES/django.po b/mayan/apps/documents/locale/pt/LC_MESSAGES/django.po
index 048bf253c8..b7439a7d93 100644
--- a/mayan/apps/documents/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documentos"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Nome"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Comentário"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr "Soma de verificação"
 msgid "Pages"
 msgstr "Páginas"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Tipo de documento"
@@ -304,7 +304,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -344,7 +344,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr "Editar"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -471,52 +471,52 @@ msgstr ""
 msgid "File"
 msgstr "Ficheiro"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Página %(page_num)d de %(total_pages)d de %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Utilizador"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -588,6 +588,60 @@ msgstr "Editar tipos de documentos"
 msgid "View document types"
 msgstr "Ver tipos de documento"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Excluir documentos"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -630,24 +684,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Não há mais páginas neste documento"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Já está na primeira página deste documento"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1177,9 +1231,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1248,9 +1299,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1276,9 +1324,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1369,9 +1414,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1434,9 +1476,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.mo
index e38bae312d..a125fd1877 100644
Binary files a/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.po
index 1d9708e313..d67a5b1bee 100644
--- a/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -20,36 +20,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documento"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Tipos de Documentos"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr "Documentos na lixeira"
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Criar tipo de documento"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
@@ -57,68 +57,68 @@ msgstr ""
 "Cada documento carregado deve ser atribuído um tipo de documento, é a forma "
 "básica que o Mayan EDMS categoriza os documentos."
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Label"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr "O tipo MIME de qualquer uma das versões de um documento"
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Tipo"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr "Data e hora do envio para a lixeira"
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Hora e Data"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Codificação"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Comentário"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Novos documentos por mês"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Novas versões de documentos por mês"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Novas páginas de documentos por mês"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr "Total de documentos por mês"
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr "Total de versões de documentos por mês"
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr "Total de páginas de documentos por mês"
 
@@ -211,7 +211,7 @@ msgstr "Verificação"
 msgid "Pages"
 msgstr "Páginas"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Tipo de Documento"
@@ -312,7 +312,7 @@ msgstr "Baixar a versão"
 msgid "All documents"
 msgstr "Todos os Documentos"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Documentos recentes"
 
@@ -352,7 +352,7 @@ msgstr "Página anterior"
 msgid "Next page"
 msgstr "Próxima pagina"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Documento"
 
@@ -392,7 +392,7 @@ msgstr "Editar"
 msgid "Add quick label to document type"
 msgstr "Adicionar etiqueta rápida ao tipo de documento"
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr "Etiquetas rápidas"
 
@@ -485,52 +485,52 @@ msgstr "Timestamp"
 msgid "File"
 msgstr "Arquivo"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Versão do Documento"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr "Etiqueta rápida"
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Página número"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Pagina %(page_num)d de %(total_pages)d em %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Página do documento"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Páginas do documento"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Usuário"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Acessado"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "Documentos recentes"
 
@@ -602,6 +602,62 @@ msgstr "Editar tipos de documentos"
 msgid "View document types"
 msgstr "Ver tipos de documentos"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Versão do Documento"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Excluir documentos"
+
+#: queues.py:33
+#, fuzzy
+#| msgid "Clear document image cache"
+msgid "Clear image cache"
+msgstr "Apagar o cache de imagens de documentos"
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Document page image"
+msgid "Generate document page image"
+msgstr "Imagem da página do documento"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -645,24 +701,24 @@ msgstr "Os documentos padrão linguagem (em formato ISO639-2)."
 msgid "List of supported document languages."
 msgstr "Lista de idiomas de documentos suportados."
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr "Páginas por documento: %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Não há mais páginas neste documento"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Você já está na primeira página deste documento"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr "Imagem de: %s"
@@ -1266,9 +1322,6 @@ msgstr "Imagem da página do documento"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1294,9 +1347,6 @@ msgstr "Imagem da página do documento"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1452,9 +1502,6 @@ msgstr "Imagem da página do documento"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.mo
index 3d2184c2db..374edf56a7 100644
Binary files a/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.po
index c679f590aa..ccad834ff6 100644
--- a/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -21,103 +21,103 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Documente"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Etichetă"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "Tip MIME"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Iconiță"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Tip"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Encodare"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Comentariu"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -210,7 +210,7 @@ msgstr "Suma de control"
 msgid "Pages"
 msgstr "Pagini"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Tip document"
@@ -308,7 +308,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -348,7 +348,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr "Editează"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -475,52 +475,52 @@ msgstr ""
 msgid "File"
 msgstr "Fișier"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Versiune document"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Numarul paginii"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Pag %(page_num)d din %(total_pages)d din %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Pagini document"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Nume fişier"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "utilizator"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Accesat"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -592,6 +592,60 @@ msgstr "Editează tipuri"
 msgid "View document types"
 msgstr "Vezi tipuri de documente"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Versiune document"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Şterge"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -636,24 +690,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Nu mai sunt pagini în acest document."
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Sunteți deja la prima pagină a acestui document"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1256,9 +1310,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1284,9 +1335,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1377,9 +1425,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1442,9 +1487,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/ru/LC_MESSAGES/django.mo
index 68b6e0a165..b4f5d23696 100644
Binary files a/mayan/apps/documents/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/ru/LC_MESSAGES/django.po b/mayan/apps/documents/locale/ru/LC_MESSAGES/django.po
index 06cdbd42dd..1672244c28 100644
--- a/mayan/apps/documents/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,36 +22,36 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Документы"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr "Типы документов"
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr "Документы в корзине"
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr "Создать тип документа"
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
@@ -59,68 +59,68 @@ msgstr ""
 "Каждому загруженому документу должен быть присвоен тип документа, - это "
 "основной способ, которым Mayan EDMS  распределяет документы по категориям."
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Надпись"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr "MIME-тип любых версий документа"
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME type"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr "Миниатюра"
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr "Тип"
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr "Доступно"
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr "Время и дата удаления"
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr "Время и дата"
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Комментарий"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr "Новых документов в месяц"
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr "Новых версий документов в месяц"
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr "Новых страниц документов в месяц"
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr "Всего документов в месяц"
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr "Новых версий документов в месяц"
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr "Всего страниц документов в месяц"
 
@@ -213,7 +213,7 @@ msgstr "Контрольная сумма"
 msgid "Pages"
 msgstr "Страницы"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Тип документа"
@@ -314,7 +314,7 @@ msgstr "Скачать версию"
 msgid "All documents"
 msgstr "Все документы"
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr "Последние документы"
 
@@ -354,7 +354,7 @@ msgstr "Предыдущая страница"
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Документ"
 
@@ -394,7 +394,7 @@ msgstr "Редактировать"
 msgid "Add quick label to document type"
 msgstr "Добавить быструю метку к документу"
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr "Быстрые метки"
 
@@ -488,52 +488,52 @@ msgstr "временная метка"
 msgid "File"
 msgstr "Файл"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr "Версия документа"
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr "Быстрая метка"
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr "Номер страницы"
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Страница %(page_num)d из %(total_pages)d  %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr "Страница документа"
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr "Страницы документа"
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Имя файла"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Пользователь"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr "Допущен"
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr "Недавние документы"
 
@@ -605,6 +605,62 @@ msgstr "Редактировать  типы  документов"
 msgid "View document types"
 msgstr "Просмотр типов документов"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document version"
+msgid "Documents periodic"
+msgstr "Версия документа"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Удаление документов"
+
+#: queues.py:33
+#, fuzzy
+#| msgid "Clear document image cache"
+msgid "Clear image cache"
+msgstr "Очистить кэш изображений документа"
+
+#: queues.py:38
+#, fuzzy
+#| msgid "Document page image"
+msgid "Generate document page image"
+msgstr "Изображение страницы документа"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -641,24 +697,24 @@ msgstr "Язык документов по умолчанию (в формате
 msgid "List of supported document languages."
 msgstr "Список поддерживаемых языков документов"
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr "Страницы документа: %s"
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr " Нет более страниц в этом документе"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Вы уже на первой странице этого документа"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr "Изображение для: %s"
@@ -1269,9 +1325,6 @@ msgstr "Изображение страницы документа"
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1297,9 +1350,6 @@ msgstr "Изображение страницы документа"
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1455,9 +1505,6 @@ msgstr "Изображение страницы документа"
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.mo
index 8e7bf419d8..d417e7d63a 100644
Binary files a/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.po
index c8db2a0771..5b232d161e 100644
--- a/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-23 16:43+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -20,103 +20,103 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr "Oznaka"
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME tip"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Komentar"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgstr "Nadzorna vsota"
 msgid "Pages"
 msgstr "Strani"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Tip dokumenta"
@@ -307,7 +307,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr "Dokument"
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -474,52 +474,52 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Stran %(page_num)d od %(total_pages)d dokumenta %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr ""
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -591,6 +591,60 @@ msgstr "Uredi tipe dokumentov"
 msgid "View document types"
 msgstr "Poglej tip dokumenta"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Izbiši dokumente"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -634,24 +688,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "Ni več strani v tem dokumentu"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "Ste že na prvi strani dokumenta"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1188,9 +1242,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1259,9 +1310,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1287,9 +1335,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1380,9 +1425,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1445,9 +1487,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.mo
index 4031756d6b..8aa680abce 100644
Binary files a/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.po
index b2b97bc907..da147b2f77 100644
--- a/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "Tài liệu"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME type"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "Chú thích"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr ""
 msgid "Pages"
 msgstr "Trang"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "Kiểu tài liệu"
@@ -304,7 +304,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -342,7 +342,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr "Sửa"
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -469,52 +469,52 @@ msgstr ""
 msgid "File"
 msgstr "File"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Trang %(page_num)d ngoài phạm vi của %(total_pages)d của %(document)s"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "Tên file"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "Người dùng"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -586,6 +586,60 @@ msgstr "Sửa kiểu tài liệu"
 msgid "View document types"
 msgstr ""
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "Xóa tài liệu"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -624,24 +678,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr ""
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr ""
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1165,9 +1219,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1236,9 +1287,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1264,9 +1312,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1357,9 +1402,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1422,9 +1464,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.mo
index 66772a2a8d..0e13c7f0cb 100644
Binary files a/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.po
index 109f3b2bc2..74b8f794ae 100644
--- a/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/documents/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:25+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,103 +19,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:87 apps.py:231 apps.py:453 menus.py:8 models.py:229 permissions.py:7
+#: apps.py:88 apps.py:232 apps.py:454 menus.py:8 models.py:229 permissions.py:7
 #: settings.py:13
 msgid "Documents"
 msgstr "文档"
 
-#: apps.py:110
+#: apps.py:111
 msgid "New pages this month"
 msgstr ""
 
-#: apps.py:119
+#: apps.py:120
 msgid "New documents this month"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:129
 msgid "Total documents"
 msgstr ""
 
-#: apps.py:134 links.py:280 links.py:285 views/document_type_views.py:49
+#: apps.py:135 links.py:280 links.py:285 views/document_type_views.py:49
 msgid "Document types"
 msgstr ""
 
-#: apps.py:140 views/document_views.py:69
+#: apps.py:141 views/document_views.py:69
 msgid "Documents in trash"
 msgstr ""
 
-#: apps.py:145
+#: apps.py:146
 msgid "Create a document type"
 msgstr ""
 
-#: apps.py:147
+#: apps.py:148
 msgid ""
 "Every uploaded document must be assigned a document type, it is the basic "
 "way Mayan EDMS categorizes documents."
 msgstr ""
 
-#: apps.py:154 models.py:65 models.py:157 models.py:639 search.py:21
+#: apps.py:155 models.py:65 models.py:157 models.py:649 search.py:21
 #: search.py:39
 msgid "Label"
 msgstr ""
 
-#: apps.py:159
+#: apps.py:160
 msgid "The MIME type of any of the versions of a document"
 msgstr ""
 
-#: apps.py:160 apps.py:262 search.py:19 search.py:36
+#: apps.py:161 apps.py:263 search.py:19 search.py:36
 msgid "MIME type"
 msgstr "MIME类型"
 
-#: apps.py:202 apps.py:212 apps.py:219 apps.py:243
+#: apps.py:203 apps.py:213 apps.py:220 apps.py:244
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:208 apps.py:226 apps.py:250
+#: apps.py:209 apps.py:227 apps.py:251
 msgid "Type"
 msgstr ""
 
-#: apps.py:238 models.py:641
+#: apps.py:239 models.py:651
 msgid "Enabled"
 msgstr ""
 
-#: apps.py:253
+#: apps.py:254
 msgid "Date time trashed"
 msgstr ""
 
-#: apps.py:258
+#: apps.py:259
 msgid "Time and date"
 msgstr ""
 
-#: apps.py:266
+#: apps.py:267
 msgid "Encoding"
 msgstr ""
 
-#: apps.py:270 models.py:367
+#: apps.py:271 models.py:367
 msgid "Comment"
 msgstr "评论"
 
-#: apps.py:456
+#: apps.py:457
 msgid "New documents per month"
 msgstr ""
 
-#: apps.py:463
+#: apps.py:464
 msgid "New document versions per month"
 msgstr ""
 
-#: apps.py:470
+#: apps.py:471
 msgid "New document pages per month"
 msgstr ""
 
-#: apps.py:477
+#: apps.py:478
 msgid "Total documents at each month"
 msgstr ""
 
-#: apps.py:484
+#: apps.py:485
 msgid "Total document versions at each month"
 msgstr ""
 
-#: apps.py:491
+#: apps.py:492
 msgid "Total document pages at each month"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr "校验码"
 msgid "Pages"
 msgstr "页面"
 
-#: forms.py:179 models.py:105 models.py:153 models.py:636 search.py:16
+#: forms.py:179 models.py:105 models.py:153 models.py:646 search.py:16
 #: search.py:32
 msgid "Document type"
 msgstr "文档类型"
@@ -304,7 +304,7 @@ msgstr ""
 msgid "All documents"
 msgstr ""
 
-#: links.py:154 models.py:869 views/document_views.py:341
+#: links.py:154 models.py:889 views/document_views.py:341
 msgid "Recent documents"
 msgstr ""
 
@@ -342,7 +342,7 @@ msgstr ""
 msgid "Next page"
 msgstr ""
 
-#: links.py:205 models.py:228 models.py:361 models.py:851
+#: links.py:205 models.py:228 models.py:361 models.py:871
 msgid "Document"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "Add quick label to document type"
 msgstr ""
 
-#: links.py:276 models.py:647
+#: links.py:276 models.py:657
 msgid "Quick labels"
 msgstr ""
 
@@ -469,52 +469,52 @@ msgstr ""
 msgid "File"
 msgstr "文件"
 
-#: models.py:453 models.py:454 models.py:660
+#: models.py:454 models.py:455 models.py:670
 msgid "Document version"
 msgstr ""
 
-#: models.py:646
+#: models.py:656
 msgid "Quick label"
 msgstr ""
 
-#: models.py:664
+#: models.py:674
 msgid "Page number"
 msgstr ""
 
-#: models.py:669
+#: models.py:679
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "文档%(document)s页%(page_num)d超出%(total_pages)d"
 
-#: models.py:685 models.py:820 models.py:837
+#: models.py:695 models.py:840 models.py:857
 msgid "Document page"
 msgstr ""
 
-#: models.py:686 models.py:838
+#: models.py:696 models.py:858
 msgid "Document pages"
 msgstr ""
 
-#: models.py:822
+#: models.py:842
 msgid "Filename"
 msgstr "文件名"
 
-#: models.py:825
+#: models.py:845
 msgid "Document page cached image"
 msgstr ""
 
-#: models.py:826
+#: models.py:846
 msgid "Document page cached images"
 msgstr ""
 
-#: models.py:848
+#: models.py:868
 msgid "User"
 msgstr "用户"
 
-#: models.py:854
+#: models.py:874
 msgid "Accessed"
 msgstr ""
 
-#: models.py:868
+#: models.py:888
 msgid "Recent document"
 msgstr ""
 
@@ -586,6 +586,60 @@ msgstr "编辑文档类型"
 msgid "View document types"
 msgstr "查看文档类型"
 
+#: queues.py:9
+msgid "Converter"
+msgstr ""
+
+#: queues.py:12
+#, fuzzy
+#| msgid "Document edited"
+msgid "Documents periodic"
+msgstr "Document edited"
+
+#: queues.py:15
+msgid "Uploads"
+msgstr ""
+
+#: queues.py:20
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type delete periods"
+msgstr "Create document types"
+
+#: queues.py:24
+#, fuzzy
+#| msgid "Change document type of: %s"
+msgid "Check document type trash periods"
+msgstr "Create document types"
+
+#: queues.py:28
+#, fuzzy
+#| msgid "Delete documents"
+msgid "Delete document stubs"
+msgstr "删除文档"
+
+#: queues.py:33
+msgid "Clear image cache"
+msgstr ""
+
+#: queues.py:38
+#, fuzzy
+#| msgid "create document type"
+msgid "Generate document page image"
+msgstr "create document type"
+
+#: queues.py:43
+#, fuzzy
+#| msgid "Update office documents' page count"
+msgid "Update document page count"
+msgstr "update office documents' page count"
+
+#: queues.py:47
+#, fuzzy
+#| msgid "upload new documents"
+msgid "Upload new document version"
+msgstr "upload new documents"
+
 #: settings.py:29
 msgid ""
 "Maximum number of recent (created, edited, viewed) documents to remember per "
@@ -620,24 +674,24 @@ msgstr ""
 msgid "List of supported document languages."
 msgstr ""
 
-#: views/document_page_views.py:49
+#: views/document_page_views.py:50
 #, python-format
 msgid "Pages for document: %s"
 msgstr ""
 
-#: views/document_page_views.py:101
+#: views/document_page_views.py:102
 msgid "Unknown view keyword argument schema, unable to redirect."
 msgstr ""
 
-#: views/document_page_views.py:133
+#: views/document_page_views.py:134
 msgid "There are no more pages in this document"
 msgstr "此文档中无更多页"
 
-#: views/document_page_views.py:150
+#: views/document_page_views.py:151
 msgid "You are already at the first page of this document"
 msgstr "你已经在此文档的第一页了"
 
-#: views/document_page_views.py:178
+#: views/document_page_views.py:179
 #, python-format
 msgid "Image of: %s"
 msgstr ""
@@ -1161,9 +1215,6 @@ msgstr ""
 #~ "Are you sure you wish to clear all the page transformations for "
 #~ "documents: %s?"
 
-#~ msgid "Document edited"
-#~ msgstr "Document edited"
-
 #~ msgid "Version"
 #~ msgstr "version"
 
@@ -1232,9 +1283,6 @@ msgstr ""
 #~ msgid "Document data"
 #~ msgstr "document data"
 
-#~ msgid "Change document type of: %s"
-#~ msgstr "Create document types"
-
 #~ msgid "On large databases this operation may take some time to execute."
 #~ msgstr "On large databases this operation may take some time to execute."
 
@@ -1260,9 +1308,6 @@ msgstr ""
 #~ msgid "Use the new version filename as the document filename"
 #~ msgstr "Use the new version filename as the document filename"
 
-#~ msgid "Update office documents' page count"
-#~ msgstr "update office documents' page count"
-
 #~ msgid ""
 #~ "Update the page count of the office type documents.  This is useful when "
 #~ "enabling office document support after there were already office type "
@@ -1353,9 +1398,6 @@ msgstr ""
 #~ msgid "document types"
 #~ msgstr "document types"
 
-#~ msgid "create document type"
-#~ msgstr "create document type"
-
 #~ msgid "filenames"
 #~ msgstr "filenames"
 
@@ -1418,9 +1460,6 @@ msgstr ""
 #~ msgid "Document statistics"
 #~ msgstr "Document statistics"
 
-#~ msgid "upload new documents"
-#~ msgstr "upload new documents"
-
 #~ msgid "clone metadata"
 #~ msgstr "clone metadata"
 
diff --git a/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.mo
index edcf06c875..55b9289563 100644
Binary files a/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.po
index 2f749cbbbf..db5a981048 100644
--- a/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.mo
index 3d35259102..20de276696 100644
Binary files a/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.po
index 896de13f0a..9262f1a082 100644
--- a/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.mo
index c635e865ba..cdfb62aa51 100644
Binary files a/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.po
index a903bad2c2..fed71b65ed 100644
--- a/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.mo
index 0225b08c39..1bf9b9d7e9 100644
Binary files a/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.po
index 533a419ab9..5e3ea1192f 100644
--- a/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo
index ca6bea0ce9..5f5fb3ef87 100644
Binary files a/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.po
index 141577476c..0852a0c39b 100644
--- a/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-24 22:45+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.mo
index 202bb92ec9..d311b4275a 100644
Binary files a/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.po
index afc167ef41..654a24b524 100644
--- a/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.mo
index e43eec8f78..a9b75835c5 100644
Binary files a/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.po
index b114132206..e1903e49bf 100644
--- a/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Translators:
 # jmcainzos <jmcainzos@vodafone.es>, 2014
@@ -12,14 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:55+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: apps.py:16
@@ -38,7 +39,10 @@ msgstr "Parear todos"
 msgid ""
 "When checked, only results that match all fields will be returned. When "
 "unchecked results that match at least one field will be returned."
-msgstr "Cuando se selecciona, sólo se devolverán los resultados que coincidan con todos los campos. Si no se selecciona los resultados que coincidan con al menos un campo se devolverá."
+msgstr ""
+"Cuando se selecciona, sólo se devolverán los resultados que coincidan con "
+"todos los campos. Si no se selecciona los resultados que coincidan con al "
+"menos un campo se devolverá."
 
 #: forms.py:29
 msgid "Search terms"
@@ -62,13 +66,11 @@ msgstr "La cantidad máxima de resultados de búsqueda a recabar y mostrar."
 
 #: views.py:24
 #, python-format
-#| msgid "Search results"
 msgid "Search results for: %s"
 msgstr "Resultados de la búsqueda para: %s"
 
 #: views.py:64
 #, python-format
-#| msgid "Search error: %s"
 msgid "Search for: %s"
 msgstr "Búsqueda para: %s"
 
@@ -96,7 +98,8 @@ msgstr "Búsqueda para: %s"
 #~ msgid "Recent searches (maximum of %d)"
 #~ msgstr "recent searches (maximum of %d)"
 
-#~ msgid "Results, (showing only %(shown_result_count)s out of %(result_count)s)"
+#~ msgid ""
+#~ "Results, (showing only %(shown_result_count)s out of %(result_count)s)"
 #~ msgstr ""
 #~ "results, (showing only %(shown_result_count)s out of %(result_count)s)"
 
diff --git a/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.mo
index 33608af513..46aa78bc73 100644
Binary files a/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.po
index 34365bbeb6..38fc311278 100644
--- a/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.mo
index bff8cca607..a7f551e466 100644
Binary files a/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.po
index af92a22a87..de879a989a 100644
--- a/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.mo
index 0996de828e..9a97ec814f 100644
Binary files a/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.po
index 6f7f97a483..ce09d42482 100644
--- a/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:49-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.mo
index d83ca56697..d4354c9de4 100644
Binary files a/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.po
index 0707891a0e..14eeb9001f 100644
--- a/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.mo
index 3f71b186f7..878b60bd0f 100644
Binary files a/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.po
index 6676f8384a..c63c858655 100644
--- a/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/it/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.mo
index d27a718e54..e4c3c64a5c 100644
Binary files a/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.po
index d656d7032b..55f2886b53 100644
--- a/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/nl_NL/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.mo
index f354348c04..52a5668a0f 100644
Binary files a/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.po
index 18c6cf7978..3882876503 100644
--- a/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/pl/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.mo
index f29d67338c..1c89890f89 100644
Binary files a/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po
index d4efd4b619..68da3f0bce 100644
--- a/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.mo
index 4a31952d75..020fba3dd9 100644
Binary files a/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.po
index 622de32313..50a222a086 100644
--- a/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.mo
index c14c8cf775..1a7be0873e 100644
Binary files a/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.po
index 68764412af..84361b91e2 100644
--- a/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo
index f9ef60ec85..3293d31302 100644
Binary files a/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
index 94b98432d0..5ad80cf237 100644
--- a/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.mo
index b6a481b423..e9da0e2812 100644
Binary files a/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.po
index 958c21f9d4..efc594db10 100644
--- a/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.mo
index 7af83bc5d3..99f3c3b80f 100644
Binary files a/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.po
index 416192858d..0cda31476a 100644
--- a/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.mo
index 063cf8b60c..0daf8fc310 100644
Binary files a/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.po
index 45d50e9d4e..82b560ebab 100644
--- a/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/dynamic_search/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/events/locale/ar/LC_MESSAGES/django.mo
index 1778eb79f0..467bda894e 100644
Binary files a/mayan/apps/events/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/ar/LC_MESSAGES/django.po b/mayan/apps/events/locale/ar/LC_MESSAGES/django.po
index 52fe12aed4..a85a7329b3 100644
--- a/mayan/apps/events/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/events/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/events/locale/bg/LC_MESSAGES/django.mo
index ccc56cb932..9dd98e72b3 100644
Binary files a/mayan/apps/events/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/bg/LC_MESSAGES/django.po b/mayan/apps/events/locale/bg/LC_MESSAGES/django.po
index 5adf16f2b8..e6a01edc82 100644
--- a/mayan/apps/events/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.mo
index 4fb824e09c..cd7c485598 100644
Binary files a/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.po
index ffd581dc22..0d0c867716 100644
--- a/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/events/locale/da/LC_MESSAGES/django.mo b/mayan/apps/events/locale/da/LC_MESSAGES/django.mo
index 35d7ea9ca1..922fd1a2bd 100644
Binary files a/mayan/apps/events/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/da/LC_MESSAGES/django.po b/mayan/apps/events/locale/da/LC_MESSAGES/django.po
index 2ea7b79a2a..29a18fad25 100644
--- a/mayan/apps/events/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.mo
index 84e80f5a10..f3e23cbbdd 100644
Binary files a/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.po
index 682aa9c65d..168bde1897 100644
--- a/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/de_DE/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:02+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/events/locale/en/LC_MESSAGES/django.mo b/mayan/apps/events/locale/en/LC_MESSAGES/django.mo
index a67c07abb0..7c2464b7fe 100644
Binary files a/mayan/apps/events/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/en/LC_MESSAGES/django.po b/mayan/apps/events/locale/en/LC_MESSAGES/django.po
index 7b6e961f79..6491672b3e 100644
--- a/mayan/apps/events/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/mayan/apps/events/locale/es/LC_MESSAGES/django.mo b/mayan/apps/events/locale/es/LC_MESSAGES/django.mo
index 86adf84f31..5b6759cbcc 100644
Binary files a/mayan/apps/events/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/es/LC_MESSAGES/django.po b/mayan/apps/events/locale/es/LC_MESSAGES/django.po
index c121ee38dd..2e52d96a59 100644
--- a/mayan/apps/events/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:02+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/events/locale/fa/LC_MESSAGES/django.mo
index cac92a7fac..e0ff83df8b 100644
Binary files a/mayan/apps/events/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/fa/LC_MESSAGES/django.po b/mayan/apps/events/locale/fa/LC_MESSAGES/django.po
index d6e62b0780..7bf4bfdb2d 100644
--- a/mayan/apps/events/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:02+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/events/locale/fr/LC_MESSAGES/django.mo
index 12e1dcbe6d..d0930737f0 100644
Binary files a/mayan/apps/events/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/fr/LC_MESSAGES/django.po b/mayan/apps/events/locale/fr/LC_MESSAGES/django.po
index f58be34d7b..f18c319766 100644
--- a/mayan/apps/events/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/fr/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:02+0000\n"
 "Last-Translator: Thierry Schott <DarkDare@users.noreply.github.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/events/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/events/locale/hu/LC_MESSAGES/django.mo
index 9ed93d2a90..492ae54e8c 100644
Binary files a/mayan/apps/events/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/hu/LC_MESSAGES/django.po b/mayan/apps/events/locale/hu/LC_MESSAGES/django.po
index 0af102f610..1cb4c5619c 100644
--- a/mayan/apps/events/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/id/LC_MESSAGES/django.mo b/mayan/apps/events/locale/id/LC_MESSAGES/django.mo
index fc681bab0a..a780fd53ea 100644
Binary files a/mayan/apps/events/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/id/LC_MESSAGES/django.po b/mayan/apps/events/locale/id/LC_MESSAGES/django.po
index 8787eba9e1..2cbb7fcb79 100644
--- a/mayan/apps/events/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/it/LC_MESSAGES/django.mo b/mayan/apps/events/locale/it/LC_MESSAGES/django.mo
index 3442d52647..4ba3b5ae70 100644
Binary files a/mayan/apps/events/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/it/LC_MESSAGES/django.po b/mayan/apps/events/locale/it/LC_MESSAGES/django.po
index fbc0d414d1..7f72996207 100644
--- a/mayan/apps/events/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-09-24 09:51+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.mo
index 643eee3741..46897fe40b 100644
Binary files a/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.po
index afc428905d..173cbdc25c 100644
--- a/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-10-28 12:33+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/events/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/events/locale/pl/LC_MESSAGES/django.mo
index db5eccc22b..363d7a2fff 100644
Binary files a/mayan/apps/events/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/pl/LC_MESSAGES/django.po b/mayan/apps/events/locale/pl/LC_MESSAGES/django.po
index 37d17594fe..f8243e0426 100644
--- a/mayan/apps/events/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/pl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:02+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/events/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/events/locale/pt/LC_MESSAGES/django.mo
index d4755b5fd3..c38df9ddbf 100644
Binary files a/mayan/apps/events/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/pt/LC_MESSAGES/django.po b/mayan/apps/events/locale/pt/LC_MESSAGES/django.po
index 31f07dbfb2..4b78632806 100644
--- a/mayan/apps/events/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.mo
index 7742fe96d9..30cc1f18ce 100644
Binary files a/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.po
index a2f19eb158..a043a31e47 100644
--- a/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:02+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.mo
index 119b89e1f6..c59ddc6a84 100644
Binary files a/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.po
index c8e7d0b151..4d4845f5f7 100644
--- a/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/events/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/events/locale/ru/LC_MESSAGES/django.mo
index 547366a0cc..ead2d217c1 100644
Binary files a/mayan/apps/events/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/ru/LC_MESSAGES/django.po b/mayan/apps/events/locale/ru/LC_MESSAGES/django.po
index 4cf29eade6..dfce16af1f 100644
--- a/mayan/apps/events/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-07-19 20:01+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.mo
index 3d73e2761e..748895c612 100644
Binary files a/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.po
index f4f59a7679..ebcd9e4654 100644
--- a/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.mo
index 11afdfa3fb..6b47b71c58 100644
Binary files a/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.po
index d5f637a8fa..cc362c8cc0 100644
--- a/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.mo
index b26565ae3f..befce90f5b 100644
Binary files a/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.po
index 87c507adc4..05926291fe 100644
--- a/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/events/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/ar/LC_MESSAGES/django.mo
index 39909d5bde..08df382cf2 100644
Binary files a/mayan/apps/folders/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/ar/LC_MESSAGES/django.po b/mayan/apps/folders/locale/ar/LC_MESSAGES/django.po
index f7a478b115..078de52530 100644
--- a/mayan/apps/folders/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/folders/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/bg/LC_MESSAGES/django.mo
index 7bccdb201a..3781b72d02 100644
Binary files a/mayan/apps/folders/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/bg/LC_MESSAGES/django.po b/mayan/apps/folders/locale/bg/LC_MESSAGES/django.po
index aba6e09643..ace061531d 100644
--- a/mayan/apps/folders/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/bg/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.mo
index 36cc2b70c4..da44471dd2 100644
Binary files a/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.po
index 729c5c6971..bcd2f227da 100644
--- a/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/folders/locale/da/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/da/LC_MESSAGES/django.mo
index dde260b712..97339fa9e6 100644
Binary files a/mayan/apps/folders/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/da/LC_MESSAGES/django.po b/mayan/apps/folders/locale/da/LC_MESSAGES/django.po
index 486512ec8e..92935b8ef5 100644
--- a/mayan/apps/folders/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.mo
index 20a54cf1f0..4fbf6c5458 100644
Binary files a/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.po
index 3e2409cdef..460f10b516 100644
--- a/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/de_DE/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-24 22:43+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/folders/locale/en/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/en/LC_MESSAGES/django.mo
index 5383fad5ca..f879ab1d8b 100644
Binary files a/mayan/apps/folders/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/en/LC_MESSAGES/django.po b/mayan/apps/folders/locale/en/LC_MESSAGES/django.po
index 6c0cc5c5df..b885e773a0 100644
--- a/mayan/apps/folders/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/folders/locale/es/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/es/LC_MESSAGES/django.mo
index fdfd376d76..26a4d6b5b7 100644
Binary files a/mayan/apps/folders/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/es/LC_MESSAGES/django.po b/mayan/apps/folders/locale/es/LC_MESSAGES/django.po
index 5fb2b69aa8..81221f721d 100644
--- a/mayan/apps/folders/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/es/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 17:50+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/fa/LC_MESSAGES/django.mo
index ab910ffa60..9837e4fd5d 100644
Binary files a/mayan/apps/folders/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/fa/LC_MESSAGES/django.po b/mayan/apps/folders/locale/fa/LC_MESSAGES/django.po
index 9be9867035..29ee32a840 100644
--- a/mayan/apps/folders/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/fr/LC_MESSAGES/django.mo
index 54c7c913b1..09868e1b91 100644
Binary files a/mayan/apps/folders/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/fr/LC_MESSAGES/django.po b/mayan/apps/folders/locale/fr/LC_MESSAGES/django.po
index f624fc357c..7f745e65c8 100644
--- a/mayan/apps/folders/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/folders/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/hu/LC_MESSAGES/django.mo
index fa6c9f9b6d..d8edd2ed76 100644
Binary files a/mayan/apps/folders/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/hu/LC_MESSAGES/django.po b/mayan/apps/folders/locale/hu/LC_MESSAGES/django.po
index f562bacbde..07fb4a6c0b 100644
--- a/mayan/apps/folders/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/id/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/id/LC_MESSAGES/django.mo
index d0417860ff..c434126fb3 100644
Binary files a/mayan/apps/folders/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/id/LC_MESSAGES/django.po b/mayan/apps/folders/locale/id/LC_MESSAGES/django.po
index d587b927ed..64e3968346 100644
--- a/mayan/apps/folders/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/it/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/it/LC_MESSAGES/django.mo
index d00d914b02..640b3f7d1b 100644
Binary files a/mayan/apps/folders/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/it/LC_MESSAGES/django.po b/mayan/apps/folders/locale/it/LC_MESSAGES/django.po
index 9af8f4389f..9cfdd45138 100644
--- a/mayan/apps/folders/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/it/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.mo
index 7eb3a18071..2bceb97c91 100644
Binary files a/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.po
index f10c59d996..a26b934841 100644
--- a/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/folders/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/pl/LC_MESSAGES/django.mo
index 68d6f06531..7da412f4f3 100644
Binary files a/mayan/apps/folders/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/pl/LC_MESSAGES/django.po b/mayan/apps/folders/locale/pl/LC_MESSAGES/django.po
index c195434b0e..de5cff88f1 100644
--- a/mayan/apps/folders/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/pl/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/folders/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/pt/LC_MESSAGES/django.mo
index cf40685cc4..4a2a5b25a6 100644
Binary files a/mayan/apps/folders/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/pt/LC_MESSAGES/django.po b/mayan/apps/folders/locale/pt/LC_MESSAGES/django.po
index ecb6f54e2c..13e09a5662 100644
--- a/mayan/apps/folders/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.mo
index f602785537..67bcabb0f1 100644
Binary files a/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.po
index d6baa4ce91..4041983a32 100644
--- a/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/pt_BR/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.mo
index 425efcf398..d538154521 100644
Binary files a/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.po
index 3c8db9b0a2..39798c6d34 100644
--- a/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/folders/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/ru/LC_MESSAGES/django.mo
index 4d813aacf6..68116c79ab 100644
Binary files a/mayan/apps/folders/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/ru/LC_MESSAGES/django.po b/mayan/apps/folders/locale/ru/LC_MESSAGES/django.po
index 02c2ce58b1..b654ea50cf 100644
--- a/mayan/apps/folders/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.mo
index 9f6cddc3f7..ffbf08842c 100644
Binary files a/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.po
index 0071508016..a071d9e7d9 100644
--- a/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.mo
index 724125bebc..e6527a6209 100644
Binary files a/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.po
index eb9e1713b5..d55829811f 100644
--- a/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.mo
index 0cf11f9426..ad700d9570 100644
Binary files a/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.po
index a3e208f666..231cf1c273 100644
--- a/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/folders/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/ar/LC_MESSAGES/django.mo
index 21dca3fc9f..73319a66c8 100644
Binary files a/mayan/apps/linking/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/ar/LC_MESSAGES/django.po b/mayan/apps/linking/locale/ar/LC_MESSAGES/django.po
index 2813de3a6c..1920d842f8 100644
--- a/mayan/apps/linking/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/linking/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/bg/LC_MESSAGES/django.mo
index fb0676d52b..fa38065590 100644
Binary files a/mayan/apps/linking/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/bg/LC_MESSAGES/django.po b/mayan/apps/linking/locale/bg/LC_MESSAGES/django.po
index 0db0d339a4..bee7f7f607 100644
--- a/mayan/apps/linking/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.mo
index bd559fdc01..9175e10341 100644
Binary files a/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.po
index 555f3689f3..5af35e27fd 100644
--- a/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/linking/locale/da/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/da/LC_MESSAGES/django.mo
index 602473ec81..1fed35dc18 100644
Binary files a/mayan/apps/linking/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/da/LC_MESSAGES/django.po b/mayan/apps/linking/locale/da/LC_MESSAGES/django.po
index 58ad689ef4..98b045bca3 100644
--- a/mayan/apps/linking/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.mo
index edffb1de6f..b06b4264c7 100644
Binary files a/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po
index 4a619bca3f..ee09e7eda9 100644
--- a/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/linking/locale/en/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/en/LC_MESSAGES/django.mo
index 778ddab37d..bc07261d2e 100644
Binary files a/mayan/apps/linking/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/en/LC_MESSAGES/django.po b/mayan/apps/linking/locale/en/LC_MESSAGES/django.po
index 655495c01e..df5fdac243 100644
--- a/mayan/apps/linking/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:06+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/linking/locale/es/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/es/LC_MESSAGES/django.mo
index 6be0ad0e41..72a2d72268 100644
Binary files a/mayan/apps/linking/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/es/LC_MESSAGES/django.po b/mayan/apps/linking/locale/es/LC_MESSAGES/django.po
index 47283b4d93..65bb930d6c 100644
--- a/mayan/apps/linking/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/fa/LC_MESSAGES/django.mo
index 3d16510f1f..00e4921654 100644
Binary files a/mayan/apps/linking/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/fa/LC_MESSAGES/django.po b/mayan/apps/linking/locale/fa/LC_MESSAGES/django.po
index a8d443514a..6bd58309c4 100644
--- a/mayan/apps/linking/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/fr/LC_MESSAGES/django.mo
index c413635728..061ba92d52 100644
Binary files a/mayan/apps/linking/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/fr/LC_MESSAGES/django.po b/mayan/apps/linking/locale/fr/LC_MESSAGES/django.po
index be383545a6..e1ee4ce287 100644
--- a/mayan/apps/linking/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/fr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/linking/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/hu/LC_MESSAGES/django.mo
index 7d1e8e62ac..9c233854da 100644
Binary files a/mayan/apps/linking/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/hu/LC_MESSAGES/django.po b/mayan/apps/linking/locale/hu/LC_MESSAGES/django.po
index 1fb8c3c6d9..fc78d2a5e6 100644
--- a/mayan/apps/linking/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/id/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/id/LC_MESSAGES/django.mo
index acdb49855f..07cb600773 100644
Binary files a/mayan/apps/linking/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/id/LC_MESSAGES/django.po b/mayan/apps/linking/locale/id/LC_MESSAGES/django.po
index 224dbd744d..8ef4120340 100644
--- a/mayan/apps/linking/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/it/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/it/LC_MESSAGES/django.mo
index b8f7eec328..caa39bc59b 100644
Binary files a/mayan/apps/linking/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/it/LC_MESSAGES/django.po b/mayan/apps/linking/locale/it/LC_MESSAGES/django.po
index ee52949304..eec8ee7ef8 100644
--- a/mayan/apps/linking/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.mo
index 8061adf2da..f2b2a40bcf 100644
Binary files a/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.po
index ed51dab429..8b5bdfe2ab 100644
--- a/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/linking/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/pl/LC_MESSAGES/django.mo
index be825e7b13..9ea63630a1 100644
Binary files a/mayan/apps/linking/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/pl/LC_MESSAGES/django.po b/mayan/apps/linking/locale/pl/LC_MESSAGES/django.po
index 4d9386ad22..8eed96c811 100644
--- a/mayan/apps/linking/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/pl/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/linking/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/pt/LC_MESSAGES/django.mo
index 353cc9d9bc..3a0b64fe73 100644
Binary files a/mayan/apps/linking/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/pt/LC_MESSAGES/django.po b/mayan/apps/linking/locale/pt/LC_MESSAGES/django.po
index d47a86fad8..1e762fafd7 100644
--- a/mayan/apps/linking/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.mo
index 9659c414c9..124d8b7921 100644
Binary files a/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.po
index a86c17c364..f003d865b9 100644
--- a/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/pt_BR/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.mo
index 323efe4155..fff296b89f 100644
Binary files a/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.po
index bafa0e3d68..5bef9084bc 100644
--- a/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/linking/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/ru/LC_MESSAGES/django.mo
index 1c017621bb..124ac1cb8e 100644
Binary files a/mayan/apps/linking/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/ru/LC_MESSAGES/django.po b/mayan/apps/linking/locale/ru/LC_MESSAGES/django.po
index 360b53636c..479bcbda1e 100644
--- a/mayan/apps/linking/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.mo
index 9f6cddc3f7..ffbf08842c 100644
Binary files a/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.po
index 22aa897bbc..3ca08018f6 100644
--- a/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.mo
index 2ea4d10359..a4eeb695bc 100644
Binary files a/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.po
index cf6e38325c..ed81db692f 100644
--- a/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.mo
index 2b877b254e..0dfde06a38 100644
Binary files a/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.po
index e2b82f92d7..70eed466e5 100644
--- a/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/linking/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.mo
index b5f818d167..755504c55a 100644
Binary files a/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.po
index 2da49e03e0..d6177af7b2 100644
--- a/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.mo
index 26a09a6ac4..1a420aca6f 100644
Binary files a/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.po
index 8b02a2abee..f54911dc06 100644
--- a/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.mo
index 568092cf4c..d179fbb229 100644
Binary files a/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.po
index f4639fa52f..83db33a66a 100644
--- a/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.mo
index c69cc88af7..56ba319848 100644
Binary files a/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.po
index 27a24f7f4d..dd5eac8d29 100644
--- a/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.mo
index 37940364c9..ffb539088d 100644
Binary files a/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.po
index 2a116463c5..cc09c11a7b 100644
--- a/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/de_DE/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:04+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.mo
index a67c07abb0..7c2464b7fe 100644
Binary files a/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.po
index 970807777a..f7cd48bef4 100644
--- a/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.mo
index 52c179db34..d9c3c68483 100644
Binary files a/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.po
index 581cfd3485..e3aa972535 100644
--- a/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:04+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.mo
index e1d705ab1d..d393eb2c30 100644
Binary files a/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.po
index f528736986..547ea75382 100644
--- a/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.mo
index 747bfbbaaa..48513823b8 100644
Binary files a/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.po
index 9acec7476d..b287ee7911 100644
--- a/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:04+0000\n"
 "Last-Translator: Christophe CHAUVET <christophe.chauvet@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.mo
index 804bc11bcb..3986c9aca0 100644
Binary files a/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.po
index c6df18ba11..8df874724e 100644
--- a/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.mo
index 409d24ab81..3429166a07 100644
Binary files a/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.po
index 67e30f8732..8017feefaf 100644
--- a/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.mo
index 718dc22871..00a36e7fb0 100644
Binary files a/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.po
index 364936fdc4..d1cd83e3be 100644
--- a/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-09-24 09:13+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.mo
index 0922c0cea7..083abfb200 100644
Binary files a/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.po
index 897cb25615..1d36d8ba03 100644
--- a/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-09 16:40+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.mo
index dcca13ad49..74ad3b9ca3 100644
Binary files a/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.po
index aaea832c17..d89fc20a61 100644
--- a/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.mo
index e2df836101..0f75fc4173 100644
Binary files a/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.po
index 520628e2d9..38dc7a59c7 100644
--- a/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.mo
index 3ad3020038..93b4180742 100644
Binary files a/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.po
index 1d7f955851..07a539b8fc 100644
--- a/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-04 19:32+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.mo
index d1550a3bdc..a94512b09b 100644
Binary files a/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.po
index 4b3cd036ca..936737cf08 100644
--- a/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.mo
index bc54edce36..a5170ed68a 100644
Binary files a/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.po
index e17cc40a28..2716374a21 100644
--- a/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.mo
index c485cb7ffb..9bb49a4f80 100644
Binary files a/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.po
index fff447f3f7..23fed0035b 100644
--- a/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.mo
index 7080b698fa..8a3771ec2b 100644
Binary files a/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.po
index 29325e2a26..da8b686077 100644
--- a/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.mo
index ff0f10fe2e..51ebf9635d 100644
Binary files a/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.po
index 0cd5a08635..31a3251d9c 100644
--- a/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/lock_manager/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-08-20 19:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.mo
index f433c57b65..09520dcc93 100644
Binary files a/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.po
index daba3339f0..fe88649479 100644
--- a/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,15 +19,15 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -101,6 +101,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.mo
index 3ebb748f1d..e6870c0540 100644
Binary files a/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.po
index f51f8c2445..c3322c4434 100644
--- a/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,15 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "Изпращане"
 
@@ -101,6 +101,12 @@ msgstr "Изпрати документа по ел. поща"
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Изпрати документа по ел. поща"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Връзка към документ: {{ document }}"
diff --git a/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.mo
index 659eccd083..83be218154 100644
Binary files a/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.po
index c89a9b6c34..1ace343053 100644
--- a/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -19,15 +19,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -101,6 +101,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/da/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/da/LC_MESSAGES/django.mo
index 0027b58311..1bf9b9d7e9 100644
Binary files a/mayan/apps/mailer/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/da/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/da/LC_MESSAGES/django.po
index 0a456e15e8..346376e6b0 100644
--- a/mayan/apps/mailer/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -100,6 +100,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.mo
index 83db4764a0..61a49bfd5e 100644
Binary files a/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.po
index bde5c98c57..c29912cdee 100644
--- a/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/de_DE/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr "Mailer"
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Zeit"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr "Nachricht"
 
@@ -93,7 +93,7 @@ msgstr "Protokolleintrag"
 msgid "Log entries"
 msgstr "Protokolleinträge"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "E-Mail"
 
@@ -109,6 +109,12 @@ msgstr "Dokument als E-Mailanhang senden"
 msgid "View document mailing error log"
 msgstr "Fehlerprotokoll anzeigen"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Dokument als E-Mailanhang senden"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Link für Dokument: {{ document }}"
diff --git a/mayan/apps/mailer/locale/en/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/en/LC_MESSAGES/django.mo
index a67c07abb0..7c2464b7fe 100644
Binary files a/mayan/apps/mailer/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/en/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/en/LC_MESSAGES/django.po
index ddf6a001e0..6ba524e35e 100644
--- a/mayan/apps/mailer/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -99,6 +99,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/es/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/es/LC_MESSAGES/django.mo
index efa209613e..34e2428411 100644
Binary files a/mayan/apps/mailer/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/es/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/es/LC_MESSAGES/django.po
index 2015fd939d..d75acb9d4b 100644
--- a/mayan/apps/mailer/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/es/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Lory977 <helga.carrero@gmail.com>, 2015
 # Roberto Rosario, 2015
@@ -10,25 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-05-28 19:53+0000\n"
 "Last-Translator: Roberto Rosario\n"
-"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr "Correspondencia"
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Fecha y hora"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr "Mensaje"
 
@@ -63,7 +64,13 @@ msgid ""
 "\n"
 " --------\n"
 " This email has been sent from %(project_title)s (%(project_website)s)"
-msgstr "Se adjunta a este correo electrónico es el documento: {{ document }}\n\n\n--------\nEste correo electrónico ha sido enviado desde %(project_title)s (%(project_website)s)"
+msgstr ""
+"Se adjunta a este correo electrónico es el documento: {{ document }}\n"
+"\n"
+"\n"
+"--------\n"
+"Este correo electrónico ha sido enviado desde %(project_title)s "
+"(%(project_website)s)"
 
 #: literals.py:13
 #, python-format
@@ -72,7 +79,13 @@ msgid ""
 "\n"
 "--------\n"
 " This email has been sent from %(project_title)s (%(project_website)s)"
-msgstr "Para acceder a este documento, haga clic en el siguiente enlace: {{ link }}\n\n\n--------\nEste correo electrónico ha sido enviado desde %(project_title)s (%(project_website)s)"
+msgstr ""
+"Para acceder a este documento, haga clic en el siguiente enlace: {{ link }}\n"
+"\n"
+"\n"
+"--------\n"
+"Este correo electrónico ha sido enviado desde %(project_title)s "
+"(%(project_website)s)"
 
 #: models.py:13
 msgid "Date time"
@@ -86,7 +99,7 @@ msgstr "Entrada de bitácora"
 msgid "Log entries"
 msgstr "Entradas de bitácora"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "Correspondencia"
 
@@ -102,17 +115,27 @@ msgstr "Enviar documento por correo electrónico"
 msgid "View document mailing error log"
 msgstr "Ver bitácora de errores de envío"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Enviar documento por correo electrónico"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Enlace para el documento: {{ documento }}"
 
 #: settings.py:15
 msgid "Template for the document link email form subject line."
-msgstr "Plantilla para la línea de asunto del correo electrónico para envío de enlace del documento."
+msgstr ""
+"Plantilla para la línea de asunto del correo electrónico para envío de "
+"enlace del documento."
 
 #: settings.py:20
 msgid "Template for the document link email form body line."
-msgstr "Plantilla para el cuerpo del correo electrónico de envío de enlace de documento."
+msgstr ""
+"Plantilla para el cuerpo del correo electrónico de envío de enlace de "
+"documento."
 
 #: settings.py:24
 msgid "Document: {{ document }}"
@@ -120,11 +143,15 @@ msgstr "Documento: {{ document }}"
 
 #: settings.py:25
 msgid "Template for the document email form subject line."
-msgstr "Plantilla para la línea de sujeto del correo electrónico de envio de documento."
+msgstr ""
+"Plantilla para la línea de sujeto del correo electrónico de envio de "
+"documento."
 
 #: settings.py:30
 msgid "Template for the document email form body line."
-msgstr "Plantilla para la línea de cuerpo del correo electrónico para envío de documento."
+msgstr ""
+"Plantilla para la línea de cuerpo del correo electrónico para envío de "
+"documento."
 
 #: views.py:35
 #, python-format
@@ -143,9 +170,11 @@ msgstr "Enviar"
 #: views.py:100
 #, python-format
 msgid "%(count)d document link queued for email delivery"
-msgstr "%(count)d enlace de documento sometido para entrega por correo electrónico"
+msgstr ""
+"%(count)d enlace de documento sometido para entrega por correo electrónico"
 
 #: views.py:102
 #, python-format
 msgid "%(count)d document links queued for email delivery"
-msgstr "%(count)d enlaces de documento sometido para entrega por correo electrónico"
+msgstr ""
+"%(count)d enlaces de documento sometido para entrega por correo electrónico"
diff --git a/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.mo
index 57a04f50db..8488c90045 100644
Binary files a/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.po
index 169211401d..c82fea785d 100644
--- a/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,15 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "تاریخ و زمان"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Log entries"
 msgstr "ورودیهای لاگ"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "پست کردن"
 
@@ -101,6 +101,12 @@ msgstr "ارسال سند بوسیله ایمیل"
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "ارسال سند بوسیله ایمیل"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "پیوند سند :{{document}}"
diff --git a/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.mo
index e54277a0e2..7c6d74f19a 100644
Binary files a/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.po
index 621335787d..892b60aec3 100644
--- a/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,15 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr "Gestionnaire d'envoi"
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Date et heure"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr "Message"
 
@@ -93,7 +93,7 @@ msgstr "Entrée du journal"
 msgid "Log entries"
 msgstr "Entrées du journal"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "Liste de diffusion"
 
@@ -109,6 +109,12 @@ msgstr "Envoyer le document par courriel"
 msgid "View document mailing error log"
 msgstr "Voir le journal d'erreur du document envoyé"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Envoyer le document par courriel"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Lien pour le document: {{ document }}"
diff --git a/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.mo
index 73512aa024..eab6462d3f 100644
Binary files a/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.po
index 15ea42c327..5229bfa864 100644
--- a/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -100,6 +100,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/id/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/id/LC_MESSAGES/django.mo
index c1384f6abd..00417c48c6 100644
Binary files a/mayan/apps/mailer/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/id/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/id/LC_MESSAGES/django.po
index e907522c8a..bde23faa37 100644
--- a/mayan/apps/mailer/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -100,6 +100,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/it/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/it/LC_MESSAGES/django.mo
index 3b15f5cb28..c6a7d8c295 100644
Binary files a/mayan/apps/mailer/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/it/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/it/LC_MESSAGES/django.po
index 151ac09d4e..fa2c9f1751 100644
--- a/mayan/apps/mailer/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,15 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr "Posta"
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Data e ora"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr "Messaggio"
 
@@ -93,7 +93,7 @@ msgstr "Elemento log"
 msgid "Log entries"
 msgstr "Elementi log"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "Mailing"
 
@@ -109,6 +109,12 @@ msgstr "Invia il documento via mail"
 msgid "View document mailing error log"
 msgstr "Vedi i log di errore del mailing documenti"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Invia il documento via mail"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Link per il documento: {{ document }}"
diff --git a/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.mo
index 07d57c7a14..02a845e407 100644
Binary files a/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.po
index da8ee57e5a..d195f2d118 100644
--- a/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -19,15 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr "Mailer"
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Datum en tijd"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr "Bericht"
 
@@ -85,7 +85,7 @@ msgstr "Loginvoer"
 msgid "Log entries"
 msgstr "Loginvoer"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -101,6 +101,12 @@ msgstr "Verzend document via e-mai"
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Verzend document via e-mai"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Link voor document: {{ document }}"
diff --git a/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.mo
index e87fe3d6ed..75c47eedb2 100644
Binary files a/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.po
index 74d323bc8c..3b6829157d 100644
--- a/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -22,15 +22,15 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Data i godzina"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 msgid "Log entries"
 msgstr "Wpisy rejestru logów"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "Wysyłanie"
 
@@ -104,6 +104,12 @@ msgstr "Wyślij dokument za pomocą e-mail"
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Wyślij dokument za pomocą e-mail"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "link dokumentu : {{ document }}"
diff --git a/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.mo
index 8191f76dff..c5ba68cd65 100644
Binary files a/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.po
index 6d4a1ed648..5e17f91c54 100644
--- a/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -100,6 +100,12 @@ msgstr "Enviar documento através de mensagem"
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Enviar documento através de mensagem"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Hiperligação para o documento: {{ document }}"
diff --git a/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.mo
index d9e947fc36..a9e468a38c 100644
Binary files a/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.po
index 275ac5c5d4..8a8fa5dc13 100644
--- a/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -20,15 +20,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr "Envio de emails"
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Data e hora"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr "Mensagem"
 
@@ -92,7 +92,7 @@ msgstr "Entrada de registro"
 msgid "Log entries"
 msgstr "As entradas de log"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr "Envio de e-mails"
 
@@ -108,6 +108,12 @@ msgstr "Enviar documento por  e-mail"
 msgid "View document mailing error log"
 msgstr "Visualizar registro de erros de envio de e-mails"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Enviar documento por  e-mail"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Link para o documento: {{ document }}"
diff --git a/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.mo
index 55efd002b1..8fc89e4bb0 100644
Binary files a/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.po
index 5f1efa032c..8b72d9f0db 100644
--- a/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -19,15 +19,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -101,6 +101,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.mo
index 39b9d228c9..3bc9f83dc4 100644
Binary files a/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.po
index dfcc972c80..645760586f 100644
--- a/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,15 +21,15 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr "Электронный почтальон"
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr "Дата и время"
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr "Сообщение"
 
@@ -87,7 +87,7 @@ msgstr "Запись журнала"
 msgid "Log entries"
 msgstr "Записи журнала"
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -103,6 +103,12 @@ msgstr "Отослать документ по электронной почте
 msgid "View document mailing error log"
 msgstr "Просмотр журнала ошибок отправки почты"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Send document via email"
+msgid "Send document"
+msgstr "Отослать документ по электронной почте"
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr "Ссылка на документ: {{ document }}"
diff --git a/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.mo
index b6a481b423..e9da0e2812 100644
Binary files a/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.po
index 6c9ddb5208..10d2dcfbfc 100644
--- a/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -19,15 +19,15 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -101,6 +101,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.mo
index 2f4a11fd46..393b136a81 100644
Binary files a/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.po
index 30528a42ca..82e95ea311 100644
--- a/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -100,6 +100,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.mo
index 78c94095c9..f9346f16e6 100644
Binary files a/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.po
index 33466488ab..0fcf0a145f 100644
--- a/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/mailer/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:26
+#: apps.py:27
 msgid "Mailer"
 msgstr ""
 
-#: apps.py:38
+#: apps.py:39
 msgid "Date and time"
 msgstr ""
 
-#: apps.py:42 models.py:16
+#: apps.py:43 models.py:16
 msgid "Message"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Log entries"
 msgstr ""
 
-#: permissions.py:7 settings.py:11
+#: permissions.py:7 queues.py:8 settings.py:11
 msgid "Mailing"
 msgstr ""
 
@@ -100,6 +100,10 @@ msgstr ""
 msgid "View document mailing error log"
 msgstr ""
 
+#: queues.py:12
+msgid "Send document"
+msgstr ""
+
 #: settings.py:14
 msgid "Link for document: {{ document }}"
 msgstr ""
diff --git a/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.mo
index 9f36864478..9d675345cf 100644
Binary files a/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.po
index 49d188bc7b..c6c6901834 100644
--- a/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,98 +21,93 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "البيانات الوصفية"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "قيمة"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "نوع البيانات الوصفية"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "قيمة البيانات الوصفية"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "'metadata' object has no attribute '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "اسم"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "تحديث"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "إزالة"
 
@@ -144,11 +139,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "تحرير"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "أنواع البيانات الوصفية"
 
@@ -158,7 +153,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -168,7 +163,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Default"
 
@@ -179,7 +174,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -189,7 +184,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -198,7 +193,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -274,6 +269,18 @@ msgstr "حذف نوع من البيانات الوصفية"
 msgid "View metadata types"
 msgstr "عرض أنواع البيانات الوصفية"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Edit metadata types"
+msgid "Add required metadata type"
+msgstr "تحرير أنواع البيانات الوصفية"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -292,7 +299,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -315,31 +322,42 @@ msgstr[5] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 "تم اضافة نوع البيانات الوصفية %(metadata_type)s بنجاح للوثيقة %(document)s ."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 "نوع البيانات الوصفية %(metadata_type)s موجود مسبقا للوثيقة %(document)s ."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
@@ -349,37 +367,37 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "قم بتعديل البيانات الوصفية للوثيقة: %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "تم تعديل البيانات الوصفية للوثيقة %s بنجاح"
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
@@ -389,61 +407,64 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
-#, python-format
-msgid "Optional metadata types for document type: %s"
-msgstr ""
-
 #: views.py:581
 #, python-format
+msgid "Optional metadata types for document type: %s"
+msgstr ""
+
+#: views.py:599
+#, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "'metadata' object has no attribute '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -456,13 +477,6 @@ msgstr ""
 #~ msgstr[4] "bae23547be942683f3c566589b362141_pl_4"
 #~ msgstr[5] "bae23547be942683f3c566589b362141_pl_5"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
@@ -619,9 +633,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.mo
index 02bea27f0c..53a796e3aa 100644
Binary files a/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.po
index fe89e86e2d..0eb72d8847 100644
--- a/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,98 +20,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr ""
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Стойност"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr ""
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Стойност на мета данни"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr ""
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Име"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Актуализация"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Премахване"
 
@@ -143,11 +138,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Редактиране"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr ""
 
@@ -157,7 +152,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -167,7 +162,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -178,7 +173,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -188,7 +183,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -197,7 +192,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -273,6 +268,18 @@ msgstr ""
 msgid "View metadata types"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Missing required metadata"
+msgid "Add required metadata type"
+msgstr "document metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -291,7 +298,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -310,121 +317,132 @@ msgstr[1] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr ""
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr ""
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
@@ -437,19 +455,9 @@ msgstr ""
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
-#~ msgid "Missing required metadata"
-#~ msgstr "document metadata"
-
 #~ msgid "Title"
 #~ msgstr "title"
 
@@ -588,9 +596,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.mo
index d1e4c9f260..da04afea3a 100644
Binary files a/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.po
index ea6796752b..b1128d2206 100644
--- a/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -21,98 +21,93 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadata"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Vrijednost"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Metadata tip"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Metadata vrijednost"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "'metadata' objekt nema atributa '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Ime"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Update"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Ukloni"
 
@@ -144,11 +139,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Urediti"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Metadata tip"
 
@@ -158,7 +153,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -168,7 +163,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "default"
 
@@ -179,7 +174,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -189,7 +184,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -198,7 +193,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -274,6 +269,18 @@ msgstr "Izbriši metadata tip"
 msgid "View metadata types"
 msgstr "Pregledaj metadata tip"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Edit metadata types"
+msgid "Add required metadata type"
+msgstr "Izmjeni tipove metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -292,7 +299,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -312,128 +319,142 @@ msgstr[2] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 "Metadata tip: %(metadata_type)s uspješno dodan u dokument %(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr "Metadata tip: %(metadata_type)s već postoji u dokumentu %(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Izmjeni metadata za dokument: %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadata za dokument %s uspješno izmjenjen."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
-#, python-format
-msgid "Optional metadata types for document type: %s"
-msgstr ""
-
 #: views.py:581
 #, python-format
+msgid "Optional metadata types for document type: %s"
+msgstr ""
+
+#: views.py:599
+#, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "'metadata' objekt nema atributa '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -443,13 +464,6 @@ msgstr ""
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 #~ msgstr[2] "bae23547be942683f3c566589b362141_pl_2"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
@@ -597,9 +611,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/da/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/da/LC_MESSAGES/django.mo
index a0bf6f1078..82067ce54c 100644
Binary files a/mayan/apps/metadata/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/da/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/da/LC_MESSAGES/django.po
index 8cccb3212d..2879536b7b 100644
--- a/mayan/apps/metadata/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,98 +20,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr ""
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr ""
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Metadata type"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Metadata værdi"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr ""
-
 #: forms.py:13
 msgid "ID"
 msgstr ""
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Navn"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr ""
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr ""
 
@@ -143,11 +138,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr ""
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr ""
 
@@ -157,7 +152,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -167,7 +162,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Standard"
 
@@ -178,7 +173,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -188,7 +183,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -197,7 +192,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -273,6 +268,18 @@ msgstr ""
 msgid "View metadata types"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Missing required metadata"
+msgid "Add required metadata type"
+msgstr "document metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -291,7 +298,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -310,121 +317,132 @@ msgstr[1] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr ""
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr ""
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
@@ -437,19 +455,9 @@ msgstr ""
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
-#~ msgid "Missing required metadata"
-#~ msgstr "document metadata"
-
 #~ msgid "Title"
 #~ msgstr "title"
 
@@ -588,9 +596,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.mo
index ca644d86e0..ac4917d6b1 100644
Binary files a/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po
index db77121b94..66c504a449 100644
--- a/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-24 23:12+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -24,20 +24,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "Dokumente mit fehlenden erforderlichen Metadaten"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr "Dokumente mit fehlenden optionalen Metadaten"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
@@ -45,79 +45,74 @@ msgstr ""
 "Queryset enthaltend eine Referenz auf eine Metadatentyp Instanz und einen "
 "Wert für diesen Metadatentyp"
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "Name Metadatentyp"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "Metadatentypwert"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "Metadatenwert"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr "Gibt den Wert einer spezifischen Dokumentmetadatums zurück"
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Wert"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "erforderlich"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Metadatentyp"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Metadatenwert"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "'metadata'-Objekt hat kein Attribut '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Name"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr "Fehler für Suchwert: %s"
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr "Fehler für Standardwert: %s"
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr "\"%s\" wird für diesen Dokumententyp benötigt."
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr "Metadatentypen für die ausgewählten Dokumente."
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr "Verfügbare Kontextvariablen:"
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -149,11 +144,11 @@ msgstr "Erstellen"
 msgid "Delete"
 msgstr "Löschen"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Metadatentypen"
 
@@ -165,7 +160,7 @@ msgstr ""
 "Name unter dem andere Apps diesen Wert referenzieren. Keine reservierten "
 "Worte aus Python oder Leerzeichen verwenden."
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Bezeichner"
 
@@ -178,7 +173,7 @@ msgstr ""
 "Sprache benutzen (https://docs.djangoproject.com/en/1.7/ref/templates/"
 "builtins/)"
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Standard"
 
@@ -192,7 +187,7 @@ msgstr ""
 "Zeichenkette ausgeben (https://docs.djangoproject.com/en/1.7/ref/templates/"
 "builtins/)"
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr "Suche"
 
@@ -204,7 +199,7 @@ msgstr ""
 "Der Validierer wird den eingegebenen Wert zurückweisen, wenn er dem "
 "geforderten Format nicht entspricht."
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr "Validierer"
 
@@ -215,7 +210,7 @@ msgstr ""
 "Der Parser wird den eingegebenen Wert so reformatieren, dass er dem "
 "geforderten Format entspricht."
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr "Parser"
 
@@ -291,6 +286,18 @@ msgstr "Metadatentypen löschen"
 msgid "View metadata types"
 msgstr "Metadatentypen anzeigen"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Metadaten entfernen"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Erforderliche Metadaten"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr "Primärschlüssel des hinzuzufügenden Metadatentyps"
@@ -309,7 +316,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -328,7 +335,18 @@ msgstr[1] "Metadatentypen zu Dokumenten hinzufügen"
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
@@ -336,73 +354,73 @@ msgstr ""
 "Metadatentyp %(metadata_type)s erfolgreich hinzugefügt zu Dokument "
 "%(document)s"
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 "Metadatentyp %(metadata_type)s bereits vorhanden für Dokument %(document)s"
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "Metadaten bearbeiten"
 msgstr[1] "Metadaten bearbeiten"
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Metadaten des Dokuments %s bearbeiten"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 "Fehler bei der Bearbeitung der Metadaten für Dokument %(document)s: "
 "%(exception)s"
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadaten des Dokuments %s erfolgreich bearbeitet."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "Metadaten von Dokument %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "Metadatentypen von Dokument entfernen"
 msgstr[1] "Metadatentypen von Dokumenten entfernen"
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
@@ -411,7 +429,7 @@ msgstr ""
 "Metadatentyp \"%(metadata_type)s\" erfolgreich entfernt von Dokument "
 "%(document)s"
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -420,42 +438,45 @@ msgstr ""
 "Fehler bei der Entfernung von Metadatentyp \"%(metadata_type)s\" von "
 "Dokument %(document)s: %(exception)s"
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr "Metadatentyp erstellen"
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr "Metadatentyp %s  löschen?"
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr "Metadatentyp %s bearbeiten"
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr "Interner Name"
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr "Verfügbare Metadatentypen"
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr "Zugewiesene Metadatentypen"
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "Optionale Metadatentypen für Dokumententyp %s"
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "Erforderliche Metadatentypen für Dokumententyp %s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "'metadata'-Objekt hat kein Attribut '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -464,13 +485,6 @@ msgstr "Erforderliche Metadatentypen für Dokumententyp %s"
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/en/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/en/LC_MESSAGES/django.mo
index f122c2dfd1..9ba5194331 100644
Binary files a/mayan/apps/metadata/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/en/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/en/LC_MESSAGES/django.po
index 260f17e7a7..0cf0fbbbe7 100644
--- a/mayan/apps/metadata/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:06+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,108 +18,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadata"
 
-#: apps.py:79
+#: apps.py:81
 #, fuzzy
 msgid "Documents missing required metadata"
 msgstr "document metadata"
 
-#: apps.py:96
+#: apps.py:98
 #, fuzzy
 msgid "Documents missing optional metadata"
 msgstr "document metadata"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 #, fuzzy
 msgid "Metadata type name"
 msgstr "Metadata type"
 
-#: apps.py:124
+#: apps.py:126
 #, fuzzy
 msgid "Metadata type value"
 msgstr "Metadata type"
 
-#: apps.py:128
+#: apps.py:130
 #, fuzzy
 msgid "Value of a metadata"
 msgstr "default metadata"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Value"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 #, fuzzy
 msgid "Required"
 msgstr "required"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Metadata type"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 #, fuzzy
 msgid "Metadata value"
 msgstr "Metadata type"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "'metadata' object has no attribute '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr ""
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Name"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Update"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, fuzzy, python-format
 msgid "\"%s\" is required for this document type."
 msgstr "Add metadata type to document: %s"
 
-#: forms.py:117
+#: forms.py:119
 #, fuzzy
 msgid "Metadata types to be added to the selected documents."
 msgstr "Add metadata type to document: %s"
 
-#: forms.py:146
+#: forms.py:148
 #, fuzzy
 #| msgid " Available models: %s"
 msgid " Available template context variables: "
 msgstr " Available models: %s"
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Remove"
 
@@ -158,11 +153,11 @@ msgstr "create new"
 msgid "Delete"
 msgstr "delete"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr ""
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Metadata types"
 
@@ -174,7 +169,7 @@ msgid ""
 "words, or spaces."
 msgstr "Do not use python reserved words, or spaces."
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -184,7 +179,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 #, fuzzy
 msgid "Default"
 msgstr "default"
@@ -196,7 +191,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 #, fuzzy
 msgid "Lookup"
 msgstr "lookup"
@@ -207,7 +202,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -216,7 +211,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -299,6 +294,16 @@ msgstr "Delete metadata types"
 msgid "View metadata types"
 msgstr "View metadata types"
 
+#: queues.py:12
+#, fuzzy
+msgid "Remove metadata type"
+msgstr "remove metadata"
+
+#: queues.py:16
+#, fuzzy
+msgid "Add required metadata type"
+msgstr "remove metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -318,7 +323,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 #, fuzzy
 msgid "Selected documents must be of the same type."
 msgstr "The selected document doesn't have any metadata."
@@ -339,80 +344,88 @@ msgstr[1] "Add metadata type to documents: %s"
 msgid "Add metadata types to document: %s"
 msgstr "Add metadata type to documents: %s"
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 
-#: views.py:176
+#: views.py:194
 #, fuzzy, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr "Add metadata type to document: %s"
 
-#: views.py:179
+#: views.py:197
 #, fuzzy, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr "Add metadata type to document: %s"
 
-#: views.py:231
+#: views.py:249
 #, fuzzy
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "Edit a document's metadata"
 msgstr[1] "Edit a document's metadata"
 
-#: views.py:242
+#: views.py:260
 #, fuzzy, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Edit metadata for documents: %s"
 
-#: views.py:295
+#: views.py:313
 #, fuzzy, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr "Error editing metadata for document %(document)s; %(error)s."
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadata for document %s edited successfully."
 
-#: views.py:330
+#: views.py:348
 #, fuzzy, python-format
 msgid "Metadata for document: %s"
 msgstr "Edit metadata for documents: %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 #, fuzzy
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "Remove metadata types from documents: %s"
 msgstr[1] "Remove metadata types from documents: %s"
 
-#: views.py:408
+#: views.py:426
 #, fuzzy, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr "Remove metadata types from documents: %s"
 
-#: views.py:455
+#: views.py:473
 #, fuzzy, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
@@ -421,7 +434,7 @@ msgstr ""
 "Successfully remove metadata type: %(metadata_type)s from document: "
 "%(document)s."
 
-#: views.py:465
+#: views.py:483
 #, fuzzy, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -429,48 +442,51 @@ msgid ""
 msgstr ""
 "Error removing metadata type: %(metadata_type)s from document: %(document)s."
 
-#: views.py:476
+#: views.py:494
 #, fuzzy
 msgid "Create metadata type"
 msgstr "create metadata type"
 
-#: views.py:492
+#: views.py:510
 #, fuzzy, python-format
 #| msgid "Delete metadata types"
 msgid "Delete the metadata type: %s?"
 msgstr "Delete metadata types"
 
-#: views.py:505
+#: views.py:523
 #, fuzzy, python-format
 msgid "Edit metadata type: %s"
 msgstr "edit metadata type: %s"
 
-#: views.py:519
+#: views.py:537
 #, fuzzy
 msgid "Internal name"
 msgstr "internal name"
 
-#: views.py:531
+#: views.py:549
 #, fuzzy
 #| msgid "View metadata types"
 msgid "Available metadata types"
 msgstr "View metadata types"
 
-#: views.py:532
+#: views.py:550
 #, fuzzy
 msgid "Metadata types assigned"
 msgstr "Metadata type"
 
-#: views.py:563
+#: views.py:581
 #, fuzzy, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "Remove metadata types from document: %s"
 
-#: views.py:581
+#: views.py:599
 #, fuzzy, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "Remove metadata types from document: %s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "'metadata' object has no attribute '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -480,14 +496,6 @@ msgstr "Remove metadata types from document: %s"
 #~ msgstr[0] "The selected document doesn't have any metadata."
 #~ msgstr[1] "The selected document doesn't have any metadata."
 
-#, fuzzy
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #, fuzzy
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
diff --git a/mayan/apps/metadata/locale/es/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/es/LC_MESSAGES/django.mo
index 2c63726c4c..5e1f53bf26 100644
Binary files a/mayan/apps/metadata/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/es/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/es/LC_MESSAGES/django.po
index ac6c77bf74..7518fb7322 100644
--- a/mayan/apps/metadata/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/es/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,20 +23,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "Documentos que sin metadatos requeridos"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr "Documentos sin metadatos opcionales"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
@@ -44,79 +44,74 @@ msgstr ""
 "QuerySet que contiene una referencia de instancia de tipo de meta datos y un "
 "valor para ese tipo de meta datos "
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "Nombre del tipo de metadatos"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "Valor del tipo de metadatos"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "Valor de un metadato"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr "Retornar al valor de metadata de un documento específico"
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Valor"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "Requerido"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Tipo de metadato"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Valor de metadato"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "Objeto 'metadata' no tiene atributo '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Nombre"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Actualizar"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr "Error en valor de búsqueda: %s"
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr "Error en valor por defecto: %s"
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr "\"%s\" es requerido para este tipo de documento."
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr "Variables de contexto de plantilla disponibles:"
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -148,11 +143,11 @@ msgstr "Crear nuevo"
 msgid "Delete"
 msgstr "Borrar"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Editar"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Tipos de metadatos"
 
@@ -164,7 +159,7 @@ msgstr ""
 "Nombre usado por otros módulos para hacer referencia a este valor. No "
 "utilize palabras reservadas de Python o espacios."
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -176,7 +171,7 @@ msgstr ""
 "Introduzca una plantilla para generar. Use el lenguaje de plantillas de "
 "Django (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/). "
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Por defecto"
 
@@ -190,7 +185,7 @@ msgstr ""
 "delimitada por comas. Use el lenguaje de plantillas de Django (https://docs."
 "djangoproject.com/en/1.7/ref/templates/builtins/). "
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr "Lista de opciones"
 
@@ -202,7 +197,7 @@ msgstr ""
 "El validador rechazará la entrada de datos si el valor introducido no se "
 "ajusta al formato esperado."
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr "Validador"
 
@@ -213,7 +208,7 @@ msgstr ""
 "El analizador volverá a formatear el valor introducido para ajustarse al "
 "formato esperado."
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr "Analizador"
 
@@ -289,6 +284,18 @@ msgstr "Eliminar tipos de metadatos"
 msgid "View metadata types"
 msgstr "Ver los tipos de metadatos"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Remover metadatos"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Metadatos requeridos"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr "Llave principal del tipo de meta datos a ser agregada."
@@ -307,7 +314,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -326,7 +333,18 @@ msgstr[1] "Añadir tipos de meta datos a los documentos"
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
@@ -334,7 +352,7 @@ msgstr ""
 "Tipo de metadatos: %(metadata_type)s añadido con éxito al documento "
 "%(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
@@ -342,64 +360,64 @@ msgstr ""
 "Tipo de metadatos: %(metadata_type)s ya presente en el documento "
 "%(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "Editar meta datos de documento"
 msgstr[1] "Editar meta datos de documentos"
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Editar metadatos del documento: %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr "Error editando metadato para el documento %(document)s; %(exception)s."
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadatos del documento %s editados con éxito."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "Meta datos para el documento: %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "Remover tipos de meta datos del documento"
 msgstr[1] "Remover tipos de meta datos de los documentos"
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
@@ -408,7 +426,7 @@ msgstr ""
 "Remoción con éxito el tipo de meta datos \"%(metadata_type)s\" del "
 "documento: %(document)s."
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -417,42 +435,45 @@ msgstr ""
 "Error al eliminar el tipo de metadatos \"%(metadata_type)s\" del documento: "
 "%(document)s; %(exception)s"
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr "Crear tipo de metadatos"
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr "¿Borrar el tipo de metadato: %s?"
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr "Editar tipo de metadatos: %s"
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr "Nombre interno"
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr "Tipos de metadatos disponibles"
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr "Tipos de metadatos asignados"
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "Tipos de metadatos opcionales para tipo de documento: %s"
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "Tipos de metadata requerida para tipo de documento: %s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "Objeto 'metadata' no tiene atributo '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -461,13 +482,6 @@ msgstr "Tipos de metadata requerida para tipo de documento: %s"
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.mo
index 96647b4326..8ca2b62661 100644
Binary files a/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.po
index cbf7d4a7be..0239fd47c0 100644
--- a/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,20 +20,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "متادیتا"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "اسناد متا داده مورد نیاز را ندارد"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
@@ -41,79 +41,74 @@ msgstr ""
 "محتوای مجموعه درخواستها شامل یک نمونه مرجع و یک مقدار برای متا داده مورد نظر "
 "است"
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "نام نوع متا داده"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "مقدار نوع متاداده"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "مقدار متا داده"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr "مقدار خاص مستندات متا داده"
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "مقدار"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "الزامی"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "نوع متادیتا"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "مقدار متادیتا"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "متادیتا دارا هیچ خصوصیتی نیست: %s"
-
 #: forms.py:13
 msgid "ID"
 msgstr "شناسه"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "نام"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "به‌روزرسانی"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "حذف"
 
@@ -145,11 +140,11 @@ msgstr "ایجاد"
 msgid "Delete"
 msgstr "حذف"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "ویرایش"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "انواه متادیتا"
 
@@ -159,7 +154,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "برچسب"
 
@@ -169,7 +164,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "پیش فرض"
 
@@ -180,7 +175,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr "بررسی و یا پیدا کردن"
 
@@ -190,7 +185,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -199,7 +194,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -275,6 +270,18 @@ msgstr "حذف انواع متادیتا"
 msgid "View metadata types"
 msgstr "دیدن انواع متادیتا"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "حذف کردن متادیتا"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "متادیتای الزامی"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr "کلید اولیه برای نوع متا داده اضافه گردد"
@@ -293,7 +300,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -311,81 +318,92 @@ msgstr[0] "ًانواع متا داده را به اسناد اضافه کنید
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr "جذف موفق متادیتای ندع : %(metadata_type)s برای سند : %(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr "متادیتای نوع : %(metadata_type)s  در سند  %(document)s. موجود است."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "اسناد متاداده را ویرایش کنید"
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "ویرایش متادیتای سند : %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "متادیتای سند %s با موفقیت ویرایش شد."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "متا داده برای سند : %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "انواع متا داده را از اسناد حذف کنید"
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr "حذف موفق متادیتای نوع \"%(metadata_type)s\" از سند  %(document)s."
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -394,42 +412,45 @@ msgstr ""
 "خطا در حذف متادیتای نوع\"%(metadata_type)s\" ازسند: %(document)s; "
 "%(exception)s"
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr "ایجاد نوع متا دیتا"
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr "ویرایش نوع متا دیتا : %s"
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr "نام داخلی"
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "متادیتا نوع اختیاری برای نوع ستئ %s"
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "متادیتای نوع الزامی برای نوع سند :%s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "متادیتا دارا هیچ خصوصیتی نیست: %s"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -437,13 +458,6 @@ msgstr "متادیتای نوع الزامی برای نوع سند :%s"
 #~ msgid_plural "The selected documents don't have any metadata."
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.mo
index ea46d50cce..e339643953 100644
Binary files a/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.po
index 1e33ba75d0..c92a333033 100644
--- a/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/fr/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -24,20 +24,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "Documents avec des métadonnées manquantes"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr "Documents avec métadonnées optionnelles manquantes"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
@@ -45,79 +45,74 @@ msgstr ""
 "Jeu de requête contenant une référence d'instance MetadataType et une valeur "
 "pour ce type de métadonnées"
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "Nom du type de métadonnée"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "Valeur du type de métadonnée"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "Valeur de la métadonnées"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr "Retourne la valeur de la métadonnée du document spécifié"
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Valeur"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "Requis"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Type de métadonnée"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Valeur de la métadonnée"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "l'objet 'metadata' n'a pas d'attribut '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Nom"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr "Erreur de recherche de valeur : %s"
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr "Erreur de valeur par défaut : %s"
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr "\"%s\" est requis pour ce type de document."
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr "Variable de contexte du modèle disponibles :"
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -149,11 +144,11 @@ msgstr "Créer une nouvelle"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Modifier"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Types de métadonnées"
 
@@ -165,7 +160,7 @@ msgstr ""
 "Nom utilisé par d'autres applications pour référencer cette valeur. Veuillez "
 "ne pas utiliser de mots réservés Python ou d'espaces."
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Libellé"
 
@@ -177,7 +172,7 @@ msgstr ""
 "Indiquez un modèle à restituer. Utilise le langage de rendu de Django par "
 "défaut (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Par défaut"
 
@@ -191,7 +186,7 @@ msgstr ""
 "caractères délimitée par des virgules. Utilise le langage de rendu de Django "
 "par défaut (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr "Recherche"
 
@@ -203,7 +198,7 @@ msgstr ""
 "Le système de validation rejettera les données saisies si elles ne sont pas "
 "conformes au format attendu."
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr "Validateur"
 
@@ -214,7 +209,7 @@ msgstr ""
 "L'analyseur syntaxique reformatera la valeur saisie pour la rendre conforme "
 "au format attendu."
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr "Analyseur"
 
@@ -290,6 +285,18 @@ msgstr "Supprimer des types de métadonnées"
 msgid "View metadata types"
 msgstr "Voir les types de métadonnées"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Supprimer la métadonnée"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Metadonnée requise"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr "Clé primaire du type de la métadonnée à ajouter."
@@ -308,7 +315,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -327,7 +334,18 @@ msgstr[1] "Ajouter des types de métadonnées aux documents"
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
@@ -335,7 +353,7 @@ msgstr ""
 "Le type de métadonnées: %(metadata_type)s ajouter avec succès au document "
 "%(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
@@ -343,66 +361,66 @@ msgstr ""
 "Le type de métadonnée: %(metadata_type)s est déjà présent dans le document "
 "%(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "Modifier les méta-données du document"
 msgstr[1] "Modifier les métadonnées des documents"
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Modifier les métadonnées pour le document: %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 "Erreur lors de la modification des métadonnées du document %(document)s; "
 "%(exception)s."
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Métadonnées pour le document %s modifiées avec succès."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "Métadonnées du document: %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "Supprimer les types de métadonnées du document"
 msgstr[1] "Supprimer les types de métadonnées des documents"
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
@@ -411,7 +429,7 @@ msgstr ""
 "Type de métadonnées supprimer avec succès \"%(metadata_type)s\" pour le "
 "document: %(document)s."
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -420,42 +438,45 @@ msgstr ""
 "Erreur lors de la suppression du type de métadonnée \"%(metadata_type)s\" "
 "pour le document: %(document)s; %(exception)s"
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr "Créer un type de métadonnée"
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr "Êtes vous certain de vouloir supprimer le type de métadonnées : %s?"
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr "Modifier le type de métadonnée: %s"
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr "Nom interne"
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr "Types de métadonnées disponibles"
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr "Types de métadonnées attribués"
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "Types de métadonnées optionnelles pour le type de document: %s"
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "Types de métadonnées requises pour le type de document: %s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "l'objet 'metadata' n'a pas d'attribut '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -464,13 +485,6 @@ msgstr "Types de métadonnées requises pour le type de document: %s"
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.mo
index e8145a6469..d4f31910d5 100644
Binary files a/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.po
index c876a82726..400c24884d 100644
--- a/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,98 +19,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr ""
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr ""
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Metaadat típus"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Metaadat érték"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr ""
-
 #: forms.py:13
 msgid "ID"
 msgstr ""
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr ""
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr ""
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr ""
 
@@ -142,11 +137,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr ""
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr ""
 
@@ -156,7 +151,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -166,7 +161,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr ""
 
@@ -177,7 +172,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -187,7 +182,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -196,7 +191,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -272,6 +267,18 @@ msgstr ""
 msgid "View metadata types"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Missing required metadata"
+msgid "Add required metadata type"
+msgstr "document metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -290,7 +297,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -309,121 +316,132 @@ msgstr[1] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr ""
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr ""
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
@@ -436,19 +454,9 @@ msgstr ""
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
-#~ msgid "Missing required metadata"
-#~ msgstr "document metadata"
-
 #~ msgid "Title"
 #~ msgstr "title"
 
@@ -587,9 +595,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/id/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/id/LC_MESSAGES/django.mo
index 5b9023f544..0d225acc28 100644
Binary files a/mayan/apps/metadata/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/id/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/id/LC_MESSAGES/django.po
index 2f57167ba4..3a5ed47281 100644
--- a/mayan/apps/metadata/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,98 +19,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr ""
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr ""
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Jenis 'metadata'"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Nilai 'metadata'"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr ""
-
 #: forms.py:13
 msgid "ID"
 msgstr ""
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr ""
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr ""
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "hapus"
 
@@ -142,11 +137,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr ""
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr ""
 
@@ -156,7 +151,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -166,7 +161,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr ""
 
@@ -177,7 +172,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -187,7 +182,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -196,7 +191,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -272,6 +267,18 @@ msgstr ""
 msgid "View metadata types"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Missing required metadata"
+msgid "Add required metadata type"
+msgstr "document metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -290,7 +297,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -308,119 +315,130 @@ msgstr[0] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr ""
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr ""
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
@@ -432,19 +450,9 @@ msgstr ""
 #~ msgid_plural "The selected documents don't have any metadata."
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
-#~ msgid "Missing required metadata"
-#~ msgstr "document metadata"
-
 #~ msgid "Title"
 #~ msgstr "title"
 
@@ -580,9 +588,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/it/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/it/LC_MESSAGES/django.mo
index ac2ba46a99..6afeeec26d 100644
Binary files a/mayan/apps/metadata/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/it/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/it/LC_MESSAGES/django.po
index 00ac4fbee1..427613f8e1 100644
--- a/mayan/apps/metadata/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,99 +21,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadati"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "Nel documento manca un metadato obbligatorio"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr "Nel documento mancano metadati opzionali"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 "Queryset che contiene il riferimento all'istanza MetadataType e il valore "
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "Nome tipo metadato"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "Valore del tipo metadato"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "Valore del metadato"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr "Ritorna il valore di un metadato specifico del documento"
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Valore"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Tipo di metadato"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Valore metadata"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "'metadato' non ha gli attributi '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Nome"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Aggiornato"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr "Errore nel valore di ricerca: %s"
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr "Valore di default errore: %s"
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr "\"%s\" è richiesto per questo tipo di documento.."
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr "Variabili di contesto template disponibili:"
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Revoca"
 
@@ -145,11 +140,11 @@ msgstr "Crea nuovo"
 msgid "Delete"
 msgstr "Cancella"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Modifica"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Tipi di Metadati"
 
@@ -161,7 +156,7 @@ msgstr ""
 "Nome usato dalle altre app per riferirsi a questo valore. Non utilizzare "
 "parole riservate di python o spazi."
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Etichetta"
 
@@ -173,7 +168,7 @@ msgstr ""
 "Inserisci il template da renderizzare. Usa il linguaggio di template di "
 "Django (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Default"
 
@@ -187,7 +182,7 @@ msgstr ""
 "virgole. Usa il linguaggio di template di Django (https://docs.djangoproject."
 "com/en/1.7/ref/templates/builtins/)"
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr "Ricerca"
 
@@ -199,7 +194,7 @@ msgstr ""
 "Il validatore rifiuterà l'inserimento se il valore immesso non è conforme al "
 "formato richiesto."
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr "Validatore"
 
@@ -210,7 +205,7 @@ msgstr ""
 "Il parser riformatta il valore immesso per renderlo conforme al formato "
 "voluto."
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr "Parser"
 
@@ -286,6 +281,18 @@ msgstr "Cancella il tipo di metadato"
 msgid "View metadata types"
 msgstr "Visualizza il tipo di metadato"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Rimuovi metadato"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Metadato obbligatorio"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr "Chiave primaria del tipo metadato da aggiungere."
@@ -304,7 +311,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -323,7 +330,18 @@ msgstr[1] "Aggiungi tipo metadati ai documenti "
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
@@ -331,72 +349,72 @@ msgstr ""
 "Tipo metadata: %(metadata_type)s aggiunto con successo al documento "
 "%(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 "Tipo Metadata: %(metadata_type)s già presente per il documento %(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "Modifica metadato documento"
 msgstr[1] "Modifica metadato documenti"
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Modifica metadata per il documento: %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 "Errore modifica metadato per il documento: %(document)s; %(exception)s."
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadata per il documento %s modificato con successo."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "Metadati per il documento: %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "Rimuovi tipi matadato dal documento"
 msgstr[1] "Rimuovi tipi matadato dai documenti"
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
@@ -405,7 +423,7 @@ msgstr ""
 "Rimosso con successo il tipo metadato \"%(metadata_type)s\" dal documento: "
 "%(document)s."
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -414,42 +432,45 @@ msgstr ""
 "Errore rimuovendo il tipo metadato \"%(metadata_type)s\" dal documento: "
 "%(document)s; %(exception)s"
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr "Crea tipo metadato"
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr "Cancellare il tipo metadato: %s?"
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr "Modifica il tipo metadato: %s"
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr "Nome interno"
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr "Tipo metadato disponibili"
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr "Tipi metadato assegnati"
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "Tipi metadati opzionali per il tipo documento: %s"
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "Tipi metadati obbligatori per il tipo documento: %s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "'metadato' non ha gli attributi '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -458,13 +479,6 @@ msgstr "Tipi metadati obbligatori per il tipo documento: %s"
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.mo
index 99bbce4866..dcf46d7f18 100644
Binary files a/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.po
index adfdacabbc..01fd8e1a30 100644
--- a/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Johan Braeken\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -21,98 +21,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadata"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "Documenten missen vereiste metadata"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr "Documenten met ontbrekende optionele metadata"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "Metadata soortnaam"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "Metadata typenaam"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "Waarde van een metadata"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Waarde"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "Verplicht"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Metadata type"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Metadata waarde"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr ""
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Naam"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Updaten"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr "Standaard waardefout: %s"
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr "\"%s\" is vereist voor deze documentsoort."
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -144,11 +139,11 @@ msgstr "Maak nieuwe aan"
 msgid "Delete"
 msgstr "Verwijder"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "bewerken"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Metadatasoorten"
 
@@ -158,7 +153,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Label"
 
@@ -168,7 +163,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Verstekwaarde"
 
@@ -179,7 +174,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -189,7 +184,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -198,7 +193,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -274,6 +269,18 @@ msgstr "Verwijder metadatatypes"
 msgid "View metadata types"
 msgstr "Bekijk metadatatypes"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Verwijder metadata"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Vereiste metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -292,7 +299,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -311,121 +318,132 @@ msgstr[1] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr ""
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr ""
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
@@ -438,13 +456,6 @@ msgstr ""
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.mo
index d2927c2138..f1732c453d 100644
Binary files a/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.po
index 5def0d5a52..fbb765a2ec 100644
--- a/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/pl/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -25,20 +25,20 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadane"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "Dokumenty, w których brak jest wymaganych metadanych"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr "Dokumenty, w których brak jest opcjonalnych metadanych"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
@@ -46,79 +46,74 @@ msgstr ""
 "Queryset zawierający referencję do instancji MetadataType i wartość dla tego "
 "typu metadanych"
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "Nazwa typu metadanych"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "Wartość typu metadanych"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "Wartość metadanych"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Wartość"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "Wymagane"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Typ metadanych"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Wartość metadanych"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "objekt 'metadata' nie posiada atrybutu '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Nazwa"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr "Błąd dotyczący domyślnej wartości: %s"
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr "Dostępne zmienne kontekstowe szablonu:"
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Usuń"
 
@@ -150,11 +145,11 @@ msgstr "Utwórz nowy"
 msgid "Delete"
 msgstr "Usuń"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Edytuj"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Typy metadanych"
 
@@ -164,7 +159,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Etykieta"
 
@@ -176,7 +171,7 @@ msgstr ""
 "Podaj szablon do wyrenderowania. Użyj domyślnego języka szablonów Django "
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Domyślny"
 
@@ -190,7 +185,7 @@ msgstr ""
 "rozdzielony przecinkami. Użyj domyślnego języka szablonów Django (https://"
 "docs.djangoproject.com/en/1.7/ref/templates/builtins/)."
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr "Wyszukanie"
 
@@ -202,7 +197,7 @@ msgstr ""
 "Walidator odrzuci dane jeśli podana wartość nie będzie zgodna z oczekiwanym "
 "formatem."
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr "Walidator"
 
@@ -211,7 +206,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr "Parser zmieni format podanej wartości na format oczekiwany."
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr "Parser"
 
@@ -287,6 +282,18 @@ msgstr "Usuń typy metadanych"
 msgid "View metadata types"
 msgstr "Przeglądaj typy metadanych"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Usuń metadane"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Metadane wymagane"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -305,7 +312,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -326,29 +333,40 @@ msgstr[3] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
@@ -356,38 +374,38 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 "Błąd podczas edycji metadanych dla dokumentu: %(document)s; %(exception)s."
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadane dla dokumentu %s zostały pomyślnie zmodyfikowane."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "Metadane dokumentu: %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
@@ -395,61 +413,64 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
-#, python-format
-msgid "Optional metadata types for document type: %s"
-msgstr ""
-
 #: views.py:581
 #, python-format
+msgid "Optional metadata types for document type: %s"
+msgstr ""
+
+#: views.py:599
+#, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "objekt 'metadata' nie posiada atrybutu '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -460,13 +481,6 @@ msgstr ""
 #~ msgstr[2] "bae23547be942683f3c566589b362141_pl_2"
 #~ msgstr[3] "bae23547be942683f3c566589b362141_pl_3"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.mo
index cad86a15be..c48b8c1c84 100644
Binary files a/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.po
index 327f4def70..1764b81bb7 100644
--- a/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,98 +22,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadados"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Valor"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Tipo de metadados"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Valor de metadados"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "O objeto 'metadata' não tem nenhum atributo '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Nome"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Atualizar"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Remover"
 
@@ -145,11 +140,11 @@ msgstr ""
 msgid "Delete"
 msgstr "Eliminar"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Editar"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Tipos de metadados"
 
@@ -159,7 +154,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Nome"
 
@@ -169,7 +164,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Padrão"
 
@@ -180,7 +175,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -190,7 +185,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -199,7 +194,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -275,6 +270,18 @@ msgstr "Excluir tipos de metadados"
 msgid "View metadata types"
 msgstr "Ver tipos de metadados"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Edit metadata types"
+msgid "Add required metadata type"
+msgstr "Editar tipos de metadados"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -293,7 +300,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -312,7 +319,18 @@ msgstr[1] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
@@ -320,120 +338,123 @@ msgstr ""
 "Tipo de metadados: %(metadata_type)s  adicionado com sucesso ao documento "
 "%(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 "Tipo de metadados: %(metadata_type)s  já existe no documento %(document)s ."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Editar os metadados do documento: %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadados do documento %s alterados com sucesso."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
-#, python-format
-msgid "Optional metadata types for document type: %s"
-msgstr ""
-
 #: views.py:581
 #, python-format
+msgid "Optional metadata types for document type: %s"
+msgstr ""
+
+#: views.py:599
+#, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "O objeto 'metadata' não tem nenhum atributo '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -442,13 +463,6 @@ msgstr ""
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
@@ -593,9 +607,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.mo
index e87b6b8b15..e2628e825f 100644
Binary files a/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.po
index 95faf41579..a7f603b281 100644
--- a/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/pt_BR/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -23,20 +23,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadados"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr "Documentos em falta metadados necessários"
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr "Documentos sem metadados opcionais"
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
@@ -44,79 +44,74 @@ msgstr ""
 "Contendo queryset para MetadataType, referência de instância e um valor para "
 "esse tipo de metadados"
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr "Metadados nome do tipo"
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr "Metadados valor do tipo"
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr "Valor do metadata"
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr "Devolver o valor de um documento específico de metadados"
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Valor"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "exigido"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Tipo de metadados"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Valor de metadados"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "Objeto 'metadados' tem nenhum atributo '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Nome"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Atualizar"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr "Erro de valor de pesquisa: %s"
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr "Erro de valor padrão: %s"
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr "\"%s\" é necessário para este tipo de documento."
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr "Variáveis de contexto do modelo disponíveis:"
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Remover"
 
@@ -148,11 +143,11 @@ msgstr "Criar novo"
 msgid "Delete"
 msgstr "Excluir"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Editar"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Tipos de metadados"
 
@@ -164,7 +159,7 @@ msgstr ""
 "Nome usado por outros aplicativos em referência a este valor. Não usar "
 "palavras reservadas de python, ou espaços."
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Label"
 
@@ -176,7 +171,7 @@ msgstr ""
 "Insira um modelo para renderizar. Use a linguagem de modelo padrão do Django "
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Padrão"
 
@@ -190,7 +185,7 @@ msgstr ""
 "caracteres delimitada por vírgulas. Use a linguagem de modelo padrão do "
 "Django (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr "Tipo de metadados não é válido, para o tipo de documento"
 
@@ -202,7 +197,7 @@ msgstr ""
 "O validador rejeitará a entrada de dados se o valor inserido não estiver de "
 "acordo com o formato esperado."
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr "Validador"
 
@@ -213,7 +208,7 @@ msgstr ""
 "O analisador irá reformatar o valor inserido para estar em conformidade com "
 "o formato esperado."
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr "Analisador"
 
@@ -289,6 +284,18 @@ msgstr "Excluir tipos de metadados"
 msgid "View metadata types"
 msgstr "Ver tipos de metadados"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Remover metadado"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Necessita do metadato"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr "Chave primária do tipo de metadados a ser adicionado."
@@ -307,7 +314,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -326,7 +333,18 @@ msgstr[1] "Adicionar tipos de metadados para os documentos"
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
@@ -334,71 +352,71 @@ msgstr ""
 "Tipo Metadado %(metadata_type)s adicionado com sucesso para o documento "
 "%(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 "Tipo Metadado: %(metadata_type)s já está presente no documento%(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "Editar metadado do documento"
 msgstr[1] "Editar metadados dos documentos"
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Editar os metadados do documento: %s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr "Erro editando metadados para o documento: %(document)s; %(exception)s."
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadados para o documento %s alterados com sucesso."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "Metadados para documento: %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "Remover tipos de metadados do documento"
 msgstr[1] "Remover tipos de metadados dos documentos"
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
@@ -407,7 +425,7 @@ msgstr ""
 "Removido com sucesso o Stipo de  metadato \"%(metadata_type)s\" do "
 "documento: %(document)s."
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -416,42 +434,45 @@ msgstr ""
 "Erro para remover o tipo de metadado \"%(metadata_type)s\" do documento: "
 "%(document)s; %(exception)s"
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr "Criar Tipo de documento"
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr "Apagar o tipo de metadados: %s?"
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr "Editar o tipo de documento: %s"
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr "nome interno"
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr "Tipos de metadados disponíveis"
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr "Tipos de metadados atribuídos"
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "Tipo de metadado opicional para os tipos de documentos : %s"
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "Tipos de metadados requeridos para documento do tipo: %s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "Objeto 'metadados' tem nenhum atributo '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -460,13 +481,6 @@ msgstr "Tipos de metadados requeridos para documento do tipo: %s"
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.mo
index dc90515325..5629784e8b 100644
Binary files a/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.po
index b347259fc8..cb8fcb677a 100644
--- a/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -21,98 +21,93 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Metadate"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Valoare"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Metadate de tip"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Valoare metadate "
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "obiectul 'metadata' nu are nici un atribut &'%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID-ul"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Nume"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Actualizați"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Scoate"
 
@@ -144,11 +139,11 @@ msgstr ""
 msgid "Delete"
 msgstr "Șterge"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Editează"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Metadate tipuri de"
 
@@ -158,7 +153,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Etichetă"
 
@@ -168,7 +163,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Iniţial"
 
@@ -179,7 +174,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -189,7 +184,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -198,7 +193,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -274,6 +269,18 @@ msgstr "Ștergeți tipuri de metadate"
 msgid "View metadata types"
 msgstr "Vezi tipuri de metadate"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Edit metadata types"
+msgid "Add required metadata type"
+msgstr "Editați tipuri de metadate"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -292,7 +299,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -312,7 +319,18 @@ msgstr[2] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
@@ -320,7 +338,7 @@ msgstr ""
 "Tipul de metadate:%(metadata_type)s au fost adăugate cu succes documentul "
 "%(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
@@ -328,115 +346,118 @@ msgstr ""
 "Tipul de metadate:%(metadata_type)s e deja prezent în documentul "
 "%(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Editați metadate pentru document:% s"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Metadate pentru documentul %s editat cu succes."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
-#, python-format
-msgid "Optional metadata types for document type: %s"
-msgstr ""
-
 #: views.py:581
 #, python-format
+msgid "Optional metadata types for document type: %s"
+msgstr ""
+
+#: views.py:599
+#, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "obiectul 'metadata' nu are nici un atribut &'%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -446,13 +467,6 @@ msgstr ""
 #~ msgstr[1] "bae23547be942683f3c566589b362141_pl_1"
 #~ msgstr[2] "bae23547be942683f3c566589b362141_pl_2"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
@@ -600,9 +614,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.mo
index 1e03f44ddf..855c14108f 100644
Binary files a/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.po
index 23d96baa0b..667a7d7e77 100644
--- a/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,98 +22,93 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Значение"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr "Требуется"
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Тип метаданных"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Значение метаданных"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "объект метаданных не имеет аттрибута '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Имя"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Обновить"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Удалить"
 
@@ -145,11 +140,11 @@ msgstr "Создать новые"
 msgid "Delete"
 msgstr "Удалить"
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Редактировать"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "Типы метаданных"
 
@@ -159,7 +154,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Надпись"
 
@@ -169,7 +164,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Умолчание"
 
@@ -180,7 +175,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -190,7 +185,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr "Валидатор"
 
@@ -201,7 +196,7 @@ msgstr ""
 "Введённое значение будет переформатировано парсером так, чтобы удовлетворять "
 "требованиям формата."
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr "Парсер"
 
@@ -277,6 +272,18 @@ msgstr "Удаление типов метаданных"
 msgid "View metadata types"
 msgstr "Просмотр типов метаданных"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "Remove metadata"
+msgid "Remove metadata type"
+msgstr "Удалить метаданные"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Required metadata"
+msgid "Add required metadata type"
+msgstr "Обязательные метаданные"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr "Первичный ключ добавляемого типа метаданных."
@@ -295,7 +302,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -316,30 +323,41 @@ msgstr[3] "Добавить типы метаданных к документа
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 "Тип метаданных: %(metadata_type)s успешно добавлены к документу %(document)s."
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr "Тип метаданных: %(metadata_type)s уже есть в документе %(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] "Редактировать метаданные документа."
@@ -347,38 +365,38 @@ msgstr[1] "Редактировать метаданные документов.
 msgstr[2] "Редактировать метаданные документов."
 msgstr[3] "Редактировать метаданные документов."
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "Редактировать метаданные документа:%s."
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 "Ошибка при редактировании метаданных документа: %(document)s; %(exception)s."
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "Метаданные для документов %s изменены."
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr "Метаданные документа: %s"
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] "Удалить тип метаданных из документов"
@@ -386,12 +404,12 @@ msgstr[1] "Удалить типы метаданных из документо
 msgstr[2] "Удалить типы метаданных из документов"
 msgstr[3] "Удалить типы метаданных из документов"
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
@@ -400,7 +418,7 @@ msgstr ""
 "Успешно удалён тип метаданных \"%(metadata_type)s\" из документа "
 "%(document)s."
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
@@ -409,42 +427,45 @@ msgstr ""
 "Ошибка удаления метаданных типа \"%(metadata_type)s\" от документа: "
 "%(document)s; %(exception)s"
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr "Создать тип метаданных"
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr "Удалить тип метаданных: %s?"
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr "Редактировать тип метаданных: %s"
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr "Внутреннее имя"
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr "Доступные типы метаданных"
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr "Назначенные типы метаданных"
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr "Дополнительные типы метаданных для типов документов: %s"
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr "Обязательные типы метаданных для типов документов: %s"
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "объект метаданных не имеет аттрибута '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -455,13 +476,6 @@ msgstr "Обязательные типы метаданных для типов
 #~ msgstr[2] "bae23547be942683f3c566589b362141_pl_2"
 #~ msgstr[3] "bae23547be942683f3c566589b362141_pl_3"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
diff --git a/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.mo
index ea118ab352..b8f5b79550 100644
Binary files a/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.po
index 32be49541a..ae71af914a 100644
--- a/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-23 16:43+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -20,98 +20,93 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr ""
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr ""
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Tip metapodatkov"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Vrednost metapodatkov"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr ""
-
 #: forms.py:13
 msgid "ID"
 msgstr ""
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Ime"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr ""
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr ""
 
@@ -143,11 +138,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr ""
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr ""
 
@@ -157,7 +152,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr "Oznaka"
 
@@ -167,7 +162,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr ""
 
@@ -178,7 +173,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -188,7 +183,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -197,7 +192,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -273,6 +268,18 @@ msgstr ""
 msgid "View metadata types"
 msgstr ""
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Missing required metadata"
+msgid "Add required metadata type"
+msgstr "document metadata"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -291,7 +298,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -312,29 +319,40 @@ msgstr[3] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
@@ -342,37 +360,37 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr ""
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
@@ -380,57 +398,57 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
+#: views.py:581
 #, python-format
 msgid "Optional metadata types for document type: %s"
 msgstr ""
 
-#: views.py:581
+#: views.py:599
 #, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
@@ -445,19 +463,9 @@ msgstr ""
 #~ msgstr[2] "bae23547be942683f3c566589b362141_pl_2"
 #~ msgstr[3] "bae23547be942683f3c566589b362141_pl_3"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
-#~ msgid "Missing required metadata"
-#~ msgstr "document metadata"
-
 #~ msgid "Title"
 #~ msgstr "title"
 
@@ -602,9 +610,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.mo
index 991ca29a58..7089af567a 100644
Binary files a/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.po
index 189af167ff..4053eeeae5 100644
--- a/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -20,98 +20,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "Siêu dữ liệu"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "Giá trị"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "Loại siêu dữ liệu"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr ""
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "đối tượng 'siêu dữ liệu' không có thuộc tính: %s"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "Tên"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "Cập nhật"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "Xóa"
 
@@ -143,11 +138,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr "Sửa"
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr ""
 
@@ -157,7 +152,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -167,7 +162,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr "Mặc định"
 
@@ -178,7 +173,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -188,7 +183,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -197,7 +192,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -273,6 +268,18 @@ msgstr "Xóa loại siêu dữ liệu"
 msgid "View metadata types"
 msgstr "Xem các loại siêu dữ liệu"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Edit metadata types"
+msgid "Add required metadata type"
+msgstr "Sửa các loại  siêu dữ liệu"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -291,7 +298,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -309,123 +316,137 @@ msgstr[0] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr ""
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr ""
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
-#, python-format
-msgid "Optional metadata types for document type: %s"
-msgstr ""
-
 #: views.py:581
 #, python-format
+msgid "Optional metadata types for document type: %s"
+msgstr ""
+
+#: views.py:599
+#, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "đối tượng 'siêu dữ liệu' không có thuộc tính: %s"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -433,13 +454,6 @@ msgstr ""
 #~ msgid_plural "The selected documents don't have any metadata."
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
@@ -581,9 +595,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.mo
index 7773b71345..519f65e372 100644
Binary files a/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.po
index 6dffdeb178..73a9a4c7a4 100644
--- a/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/metadata/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,98 +20,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:52 apps.py:145 apps.py:150 links.py:39 permissions.py:7
+#: apps.py:54 apps.py:147 apps.py:152 links.py:39 permissions.py:7 queues.py:8
 #: settings.py:10
 msgid "Metadata"
 msgstr "元数据"
 
-#: apps.py:79
+#: apps.py:81
 msgid "Documents missing required metadata"
 msgstr ""
 
-#: apps.py:96
+#: apps.py:98
 msgid "Documents missing optional metadata"
 msgstr ""
 
-#: apps.py:115
+#: apps.py:117
 msgid ""
 "Queryset containing a MetadataType instance reference and a value for that "
 "metadata type"
 msgstr ""
 
-#: apps.py:121
+#: apps.py:123
 msgid "Metadata type name"
 msgstr ""
 
-#: apps.py:124
+#: apps.py:126
 msgid "Metadata type value"
 msgstr ""
 
-#: apps.py:128
+#: apps.py:130
 msgid "Value of a metadata"
 msgstr ""
 
-#: apps.py:130
+#: apps.py:132
 msgid "Return the value of a specific document metadata"
 msgstr ""
 
-#: apps.py:157 forms.py:19 models.py:159
+#: apps.py:159 forms.py:20 models.py:159
 msgid "Value"
 msgstr "值"
 
-#: apps.py:161 forms.py:44 models.py:209
+#: apps.py:163 forms.py:46 models.py:209
 msgid "Required"
 msgstr ""
 
-#: apps.py:183 apps.py:191 forms.py:118 models.py:91 models.py:207
+#: apps.py:185 apps.py:193 forms.py:120 models.py:91 models.py:207
 msgid "Metadata type"
 msgstr "元数据类型"
 
-#: apps.py:186 apps.py:195
+#: apps.py:188 apps.py:197
 msgid "Metadata value"
 msgstr "Metadata值"
 
-#: classes.py:21
-#, python-format
-msgid "'metadata' object has no attribute '%s'"
-msgstr "元数据对象没有属性  '%s'"
-
 #: forms.py:13
 msgid "ID"
 msgstr "ID"
 
-#: forms.py:16 models.py:45
+#: forms.py:16 models.py:45 search.py:16
 msgid "Name"
 msgstr "名称"
 
-#: forms.py:23
+#: forms.py:25
 msgid "Update"
 msgstr "更新"
 
-#: forms.py:70
+#: forms.py:72
 #, python-format
 msgid "Lookup value error: %s"
 msgstr ""
 
-#: forms.py:83
+#: forms.py:85
 #, python-format
 msgid "Default value error: %s"
 msgstr ""
 
-#: forms.py:99 models.py:124
+#: forms.py:101 models.py:124
 #, python-format
 msgid "\"%s\" is required for this document type."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:119
 msgid "Metadata types to be added to the selected documents."
 msgstr ""
 
-#: forms.py:146
+#: forms.py:148
 msgid " Available template context variables: "
 msgstr ""
 
-#: forms.py:157 views.py:395
+#: forms.py:159 views.py:413
 msgid "Remove"
 msgstr "移除"
 
@@ -143,11 +138,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: links.py:59 views.py:229
+#: links.py:59 views.py:247
 msgid "Edit"
 msgstr ""
 
-#: links.py:64 models.py:92 views.py:524
+#: links.py:64 models.py:92 views.py:542
 msgid "Metadata types"
 msgstr "元数据类型"
 
@@ -157,7 +152,7 @@ msgid ""
 "words, or spaces."
 msgstr ""
 
-#: models.py:47
+#: models.py:47 search.py:19
 msgid "Label"
 msgstr ""
 
@@ -167,7 +162,7 @@ msgid ""
 "(https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)"
 msgstr ""
 
-#: models.py:55
+#: models.py:55 search.py:22
 msgid "Default"
 msgstr ""
 
@@ -178,7 +173,7 @@ msgid ""
 "ref/templates/builtins/)."
 msgstr ""
 
-#: models.py:65
+#: models.py:65 search.py:25
 msgid "Lookup"
 msgstr ""
 
@@ -188,7 +183,7 @@ msgid ""
 "to the expected format."
 msgstr ""
 
-#: models.py:72
+#: models.py:72 search.py:28
 msgid "Validator"
 msgstr ""
 
@@ -197,7 +192,7 @@ msgid ""
 "The parser will reformat the value entered to conform to the expected format."
 msgstr ""
 
-#: models.py:78
+#: models.py:78 search.py:31
 msgid "Parser"
 msgstr ""
 
@@ -273,6 +268,18 @@ msgstr "删除元数据类型"
 msgid "View metadata types"
 msgstr "查看元数据类型"
 
+#: queues.py:12
+#, fuzzy
+#| msgid "metadata type"
+msgid "Remove metadata type"
+msgstr "metadata type"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Edit metadata types"
+msgid "Add required metadata type"
+msgstr "编辑元数据类型"
+
 #: serializers.py:49
 msgid "Primary key of the metadata type to be added."
 msgstr ""
@@ -291,7 +298,7 @@ msgstr ""
 msgid "Metadata add request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:56 views.py:192 views.py:358
+#: views.py:56 views.py:210 views.py:376
 msgid "Selected documents must be of the same type."
 msgstr ""
 
@@ -309,123 +316,137 @@ msgstr[0] ""
 msgid "Add metadata types to document: %s"
 msgstr ""
 
-#: views.py:152
+#: views.py:154
+#, fuzzy, python-format
+#| msgid ""
+#| "Error adding metadata type \"%(metadata_type)s\" to document: "
+#| "%(document)s; %(exception)s"
+msgid ""
+"Error adding metadata type \"%(metadata_type)s\" to document: %(document)s; "
+"%(exception)s"
+msgstr ""
+"Error removing metadata type: %(metadata_type)s from document: %(document)s."
+
+#: views.py:170
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr "元数据类型: %(metadata_type)s成功加入到文档%(document)s"
 
-#: views.py:162
+#: views.py:180
 #, python-format
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr "元数据类型: %(metadata_type)s 已经存在于文档%(document)s."
 
-#: views.py:176
+#: views.py:194
 #, python-format
 msgid "Metadata edit request performed on %(count)d document"
 msgstr ""
 
-#: views.py:179
+#: views.py:197
 #, python-format
 msgid "Metadata edit request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:231
+#: views.py:249
 msgid "Edit document metadata"
 msgid_plural "Edit documents metadata"
 msgstr[0] ""
 
-#: views.py:242
+#: views.py:260
 #, python-format
 msgid "Edit metadata for document: %s"
 msgstr "编辑文档 %s 元数据"
 
-#: views.py:295
+#: views.py:313
 #, python-format
 msgid "Error editing metadata for document: %(document)s; %(exception)s."
 msgstr ""
 
-#: views.py:306
+#: views.py:324
 #, python-format
 msgid "Metadata for document %s edited successfully."
 msgstr "文档 %s 的元数据编辑成功。"
 
-#: views.py:330
+#: views.py:348
 #, python-format
 msgid "Metadata for document: %s"
 msgstr ""
 
-#: views.py:342
+#: views.py:360
 #, python-format
 msgid "Metadata remove request performed on %(count)d document"
 msgstr ""
 
-#: views.py:345
+#: views.py:363
 #, python-format
 msgid "Metadata remove request performed on %(count)d documents"
 msgstr ""
 
-#: views.py:397
+#: views.py:415
 msgid "Remove metadata types from the document"
 msgid_plural "Remove metadata types from the documents"
 msgstr[0] ""
 
-#: views.py:408
+#: views.py:426
 #, python-format
 msgid "Remove metadata types from the document: %s"
 msgstr ""
 
-#: views.py:455
+#: views.py:473
 #, python-format
 msgid ""
 "Successfully remove metadata type \"%(metadata_type)s\" from document: "
 "%(document)s."
 msgstr ""
 
-#: views.py:465
+#: views.py:483
 #, python-format
 msgid ""
 "Error removing metadata type \"%(metadata_type)s\" from document: "
 "%(document)s; %(exception)s"
 msgstr ""
 
-#: views.py:476
+#: views.py:494
 msgid "Create metadata type"
 msgstr ""
 
-#: views.py:492
+#: views.py:510
 #, python-format
 msgid "Delete the metadata type: %s?"
 msgstr ""
 
-#: views.py:505
+#: views.py:523
 #, python-format
 msgid "Edit metadata type: %s"
 msgstr ""
 
-#: views.py:519
+#: views.py:537
 msgid "Internal name"
 msgstr ""
 
-#: views.py:531
+#: views.py:549
 msgid "Available metadata types"
 msgstr ""
 
-#: views.py:532
+#: views.py:550
 msgid "Metadata types assigned"
 msgstr ""
 
-#: views.py:563
-#, python-format
-msgid "Optional metadata types for document type: %s"
-msgstr ""
-
 #: views.py:581
 #, python-format
+msgid "Optional metadata types for document type: %s"
+msgstr ""
+
+#: views.py:599
+#, python-format
 msgid "Required metadata types for document type: %s"
 msgstr ""
 
+#~ msgid "'metadata' object has no attribute '%s'"
+#~ msgstr "元数据对象没有属性  '%s'"
+
 #~ msgid "Must provide at least one document."
 #~ msgstr "Must provide at least one document."
 
@@ -433,13 +454,6 @@ msgstr ""
 #~ msgid_plural "The selected documents don't have any metadata."
 #~ msgstr[0] "bae23547be942683f3c566589b362141_pl_0"
 
-#~ msgid ""
-#~ "Error adding metadata type \"%(metadata_type)s\" to document: "
-#~ "%(document)s; %(exception)s"
-#~ msgstr ""
-#~ "Error removing metadata type: %(metadata_type)s from document: "
-#~ "%(document)s."
-
 #~ msgid "Missing metadata"
 #~ msgstr "edit metadata"
 
@@ -581,9 +595,6 @@ msgstr ""
 #~ msgid "name"
 #~ msgstr "name"
 
-#~ msgid "metadata type"
-#~ msgstr "metadata type"
-
 #~ msgid "metadata set"
 #~ msgstr "metadata set"
 
diff --git a/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.mo
index 746c3a5003..b8d7d14d47 100644
Binary files a/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.po
index 2e837f61b5..c33bf2003d 100644
--- a/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.mo
index 2db5210aa5..83adb80a86 100644
Binary files a/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.po
index 11afbe7dff..bf2e2d95a6 100644
--- a/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.mo
index d2ed956a3e..ffc22ec8c1 100644
Binary files a/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.po
index 47940e7b61..1b2d84dacf 100644
--- a/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.mo
index cc5a688b7e..876397cdc2 100644
Binary files a/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.po
index 8ed63d1b7b..979ff4f8d4 100644
--- a/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.mo
index b3201fa291..669d50412e 100644
Binary files a/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.po
index af4355dfce..ada8c06f9e 100644
--- a/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:08+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.mo
index a67c07abb0..7c2464b7fe 100644
Binary files a/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.po
index 0520580f2c..3d7dc4a4b1 100644
--- a/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.mo
index c2dd1cd363..7d00f66172 100644
Binary files a/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.po
index 9d6264842a..9ca4921480 100644
--- a/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:21+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.mo
index 73028f60ac..39e07150d7 100644
Binary files a/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.po
index b03825e79d..38ec711efb 100644
--- a/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.mo
index 9f306eb8f5..ec1ff044ed 100644
Binary files a/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.po
index 5f11e6df72..166fb2bf03 100644
--- a/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:08+0000\n"
 "Last-Translator: Thierry Schott <DarkDare@users.noreply.github.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.mo
index 6b92c7868b..c9028dfe2d 100644
Binary files a/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.po
index 06819f51a4..99e40c6ced 100644
--- a/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.mo
index d275d77dca..4178e6ff49 100644
Binary files a/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.po
index 135304099f..4b478107d6 100644
--- a/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.mo
index 98a00ed17b..767bd81384 100644
Binary files a/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.po
index 34d1514602..68a45c0a21 100644
--- a/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-09-24 08:52+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.mo
index d47946894d..f29e062b52 100644
Binary files a/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.po
index 82688a5923..ad25d597bf 100644
--- a/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-09 16:40+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.mo
index 92732f093a..1e80992207 100644
Binary files a/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.po
index 414f42b51a..64e2110440 100644
--- a/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.mo
index 99a6cf891a..0ed5e7ec08 100644
Binary files a/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.po
index e7f04a4cf9..e60b42e5d8 100644
--- a/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.mo
index b3c3507b97..312968127f 100644
Binary files a/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.po
index c44a192ca1..1cabcd4bd1 100644
--- a/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-04 19:01+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.mo
index 6719fad5f5..8892937708 100644
Binary files a/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.po
index e26cfb9cfc..6480fe3c78 100644
--- a/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.mo
index f67be7a88f..a5ba934386 100644
Binary files a/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.po
index b6a84828b3..406c482eaa 100644
--- a/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-07-19 20:05+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.mo
index 586b5a8607..7d68ee18df 100644
Binary files a/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.po
index d975c9f5ef..da18a34fe9 100644
--- a/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.mo
index f720dc92b2..a550b8cf8e 100644
Binary files a/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.po
index 4945a87694..91c43f0719 100644
--- a/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.mo
index f717381a5b..3c97d45483 100644
Binary files a/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.po
index 1898fc882d..e174975b11 100644
--- a/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/mirroring/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/ar/LC_MESSAGES/django.mo
index 56f5c1d6ef..299264fbc1 100644
Binary files a/mayan/apps/motd/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/ar/LC_MESSAGES/django.po b/mayan/apps/motd/locale/ar/LC_MESSAGES/django.po
index 6a520ab71b..624bd42d3a 100644
--- a/mayan/apps/motd/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/motd/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/bg/LC_MESSAGES/django.mo
index f05b1c7f97..d2e09b556d 100644
Binary files a/mayan/apps/motd/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/bg/LC_MESSAGES/django.po b/mayan/apps/motd/locale/bg/LC_MESSAGES/django.po
index 1f2c58cbd1..89b9a0143f 100644
--- a/mayan/apps/motd/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.mo
index 9f7e3245d4..0ca4a543a5 100644
Binary files a/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.po
index 349aabde10..64ec2c766a 100644
--- a/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/motd/locale/da/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/da/LC_MESSAGES/django.mo
index 66641a2dcc..dad13c7483 100644
Binary files a/mayan/apps/motd/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/da/LC_MESSAGES/django.po b/mayan/apps/motd/locale/da/LC_MESSAGES/django.po
index e73f4ccf76..d604d36b8a 100644
--- a/mayan/apps/motd/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.mo
index 163b9d086a..c8187ea48c 100644
Binary files a/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.po
index fc036376ca..3d49909735 100644
--- a/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/de_DE/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-05-20 21:31+0000\n"
 "Last-Translator: Tobias Paepke <tobias.paepke@paepke.net>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/motd/locale/en/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/en/LC_MESSAGES/django.mo
index a67c07abb0..7c2464b7fe 100644
Binary files a/mayan/apps/motd/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/en/LC_MESSAGES/django.po b/mayan/apps/motd/locale/en/LC_MESSAGES/django.po
index 2ce0aff2dd..7ef60447c8 100644
--- a/mayan/apps/motd/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/mayan/apps/motd/locale/es/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/es/LC_MESSAGES/django.mo
index 4433174d65..933febcfa7 100644
Binary files a/mayan/apps/motd/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/es/LC_MESSAGES/django.po b/mayan/apps/motd/locale/es/LC_MESSAGES/django.po
index 03c0011320..37669455f1 100644
--- a/mayan/apps/motd/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 21:13+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/fa/LC_MESSAGES/django.mo
index d8f25c3e4e..04e017a6b6 100644
Binary files a/mayan/apps/motd/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/fa/LC_MESSAGES/django.po b/mayan/apps/motd/locale/fa/LC_MESSAGES/django.po
index 3d84bc7819..2545470528 100644
--- a/mayan/apps/motd/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/fr/LC_MESSAGES/django.mo
index b10a0f8c31..476045b68a 100644
Binary files a/mayan/apps/motd/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/fr/LC_MESSAGES/django.po b/mayan/apps/motd/locale/fr/LC_MESSAGES/django.po
index 0b4e0b550e..7e57474788 100644
--- a/mayan/apps/motd/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-04-26 07:54+0000\n"
 "Last-Translator: Baptiste GAILLET <baptiste.gaillet@cstb.fr>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/motd/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/hu/LC_MESSAGES/django.mo
index 2360cfb219..ab9ca54e1c 100644
Binary files a/mayan/apps/motd/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/hu/LC_MESSAGES/django.po b/mayan/apps/motd/locale/hu/LC_MESSAGES/django.po
index 91956ae3de..88e3a3c66f 100644
--- a/mayan/apps/motd/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/id/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/id/LC_MESSAGES/django.mo
index c237220dcb..d5ec2c2771 100644
Binary files a/mayan/apps/motd/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/id/LC_MESSAGES/django.po b/mayan/apps/motd/locale/id/LC_MESSAGES/django.po
index ca54c1cbb1..6e11f4fa31 100644
--- a/mayan/apps/motd/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/it/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/it/LC_MESSAGES/django.mo
index 3c9b36b898..90de4123c5 100644
Binary files a/mayan/apps/motd/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/it/LC_MESSAGES/django.po b/mayan/apps/motd/locale/it/LC_MESSAGES/django.po
index cf323be689..4a71bf0a06 100644
--- a/mayan/apps/motd/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-09-24 10:04+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.mo
index a97bae1f01..e1c7ec44de 100644
Binary files a/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.po
index a2a48d071d..e7c5313fbb 100644
--- a/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-01 09:04+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/motd/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/pl/LC_MESSAGES/django.mo
index 5e3c880c01..d03192af79 100644
Binary files a/mayan/apps/motd/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/pl/LC_MESSAGES/django.po b/mayan/apps/motd/locale/pl/LC_MESSAGES/django.po
index bf857417a1..cd8402bc6f 100644
--- a/mayan/apps/motd/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/motd/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/pt/LC_MESSAGES/django.mo
index 017cf10283..3b51dd639b 100644
Binary files a/mayan/apps/motd/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/pt/LC_MESSAGES/django.po b/mayan/apps/motd/locale/pt/LC_MESSAGES/django.po
index e2e3279b8f..f828cb4ef9 100644
--- a/mayan/apps/motd/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.mo
index 9abbb0210f..bba2bf1e3e 100644
Binary files a/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.po
index aae326d49e..76c9b1242c 100644
--- a/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-17 23:07+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.mo
index ab6d397328..b1be88c69e 100644
Binary files a/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.po
index 675dceee14..4f42b20599 100644
--- a/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/motd/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/ru/LC_MESSAGES/django.mo
index dd481931d5..6f6110491c 100644
Binary files a/mayan/apps/motd/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/ru/LC_MESSAGES/django.po b/mayan/apps/motd/locale/ru/LC_MESSAGES/django.po
index be16c6c10e..831e740a03 100644
--- a/mayan/apps/motd/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-11-02 04:15+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.mo
index 5afc010959..b77c5685b4 100644
Binary files a/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.po
index 1aab2b3a6f..edf19480a3 100644
--- a/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.mo
index 02802112ca..2b17e73dc1 100644
Binary files a/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.po
index 77606bd16d..c244e5b9dc 100644
--- a/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.mo
index 7f3bffeabe..678dd90f06 100644
Binary files a/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.po
index ec97a941ce..892cf008c0 100644
--- a/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/motd/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2016-03-21 20:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.mo
index d79aaa2d29..c4e5bc35a1 100644
Binary files a/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.po
index 97f8b65a5b..ec3b89a0b4 100644
--- a/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.mo
index d323281d60..876519f585 100644
Binary files a/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.po
index 5489407d5b..05974323c4 100644
--- a/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.mo
index f03f1e17ad..1466ea0edf 100644
Binary files a/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.po
index 5deed43e66..64083b3315 100644
--- a/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/bs_BA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/navigation/locale/da/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/da/LC_MESSAGES/django.mo
index a52bbfef50..3e1e72b780 100644
Binary files a/mayan/apps/navigation/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/da/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/da/LC_MESSAGES/django.po
index e859d30667..827b656740 100644
--- a/mayan/apps/navigation/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.mo
index 4726008f6a..53d00d8da2 100644
Binary files a/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.po
index c2cee40d8e..de9371fc5f 100644
--- a/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/de_DE/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/navigation/locale/en/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/en/LC_MESSAGES/django.mo
index 18edf6e20f..0388a8cd19 100644
Binary files a/mayan/apps/navigation/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/en/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/en/LC_MESSAGES/django.po
index 697787aa24..6a25de3e31 100644
--- a/mayan/apps/navigation/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2012-12-12 06:06+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/es/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/es/LC_MESSAGES/django.mo
index 4616773577..9e59518b3a 100644
Binary files a/mayan/apps/navigation/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/es/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/es/LC_MESSAGES/django.po
index 1a02b67c99..253205556d 100644
--- a/mayan/apps/navigation/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.mo
index 02e2318cda..646fcb8cb7 100644
Binary files a/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.po
index ff890f5021..ba0a384876 100644
--- a/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.mo
index 3f9dd40452..6715fd5dad 100644
Binary files a/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.po
index d5ef2a5489..a6729bcb63 100644
--- a/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/fr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.mo
index e541527282..6f568c1b4c 100644
Binary files a/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.po
index 4ad0c318d8..244979157e 100644
--- a/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/id/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/id/LC_MESSAGES/django.mo
index 6ba75bf706..94579e6833 100644
Binary files a/mayan/apps/navigation/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/id/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/id/LC_MESSAGES/django.po
index 5bea58f84e..025d2dc3d9 100644
--- a/mayan/apps/navigation/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/it/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/it/LC_MESSAGES/django.mo
index 17ed12d408..83d4eca4fc 100644
Binary files a/mayan/apps/navigation/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/it/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/it/LC_MESSAGES/django.po
index 970f1c9d52..88d5e234e2 100644
--- a/mayan/apps/navigation/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.mo
index 976a83901c..7434d3edf7 100644
Binary files a/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.po
index 15dec1da80..0b7be73da6 100644
--- a/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.mo
index efd296709f..51260bddff 100644
Binary files a/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.po
index fcc59ee276..94b42173ae 100644
--- a/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/pl/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.mo
index 03494aa5f4..70fffa87f1 100644
Binary files a/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.po
index 42943e7993..e8dd1a0bb9 100644
--- a/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.mo
index 2bab6839f7..a14c4b63ef 100644
Binary files a/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.po
index 9b34522073..051eb0c8b4 100644
--- a/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/pt_BR/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.mo
index 07e93c8c3d..bff392d878 100644
Binary files a/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.po
index 34abfe78cd..221c2bd310 100644
--- a/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:39-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.mo
index 13d733132a..4be3750532 100644
Binary files a/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.po
index b83ed20fb6..bdaaf7b635 100644
--- a/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.mo
index 69ee6eb7cd..3140842b68 100644
Binary files a/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.po
index d04d9d5e5c..fdc6659233 100644
--- a/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.mo
index 90e1f1faa2..ce7d186848 100644
Binary files a/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.po
index a97ee3b87b..92c2fd2ad1 100644
--- a/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.mo
index d21e346c35..ce550f57ac 100644
Binary files a/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.po
index 56dd6c393b..fe5e953a4e 100644
--- a/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/navigation/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-09-24 05:15+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.mo
index f5e31c9ce0..b981ebd967 100644
Binary files a/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.po
index 98f7b5e564..35c668798a 100644
--- a/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,20 +21,20 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -83,35 +83,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "المحتوى"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -137,6 +137,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -194,6 +200,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -309,9 +320,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.mo
index 7ccefa1970..8029b364fc 100644
Binary files a/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.po
index 7243ae0bb9..86dd4befc9 100644
--- a/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,20 +20,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -82,35 +82,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Съдържание"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -136,6 +136,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -192,6 +198,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -299,9 +310,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.mo
index fe8549584b..84c7fefd44 100644
Binary files a/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.po
index 8dcbf01b27..4aafd44abe 100644
--- a/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -21,20 +21,20 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -83,35 +83,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Sadržaj"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -137,6 +137,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -194,6 +200,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -303,9 +314,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/da/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/da/LC_MESSAGES/django.mo
index 1c0b8cf67f..6ca697e8b7 100644
Binary files a/mayan/apps/ocr/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/da/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/da/LC_MESSAGES/django.po
index 59d169290f..bf130e0a9d 100644
--- a/mayan/apps/ocr/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/da/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,20 +21,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -83,35 +83,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Indhold"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -137,6 +137,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -195,6 +201,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -302,9 +313,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.mo
index 4ce9e41c8a..f65ae0a7d8 100644
Binary files a/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po
index 4a519faeda..3415b9f919 100644
--- a/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -24,20 +24,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR-Schrifterkennung"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Dokument"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "Hinzugefügt"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "Ergebnis"
 
@@ -66,7 +66,7 @@ msgstr "OCR Einrichtung"
 msgid "OCR documents per type"
 msgstr "Texterkennung pro Dokumententyp durchführen"
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "OCR Fehler"
 
@@ -86,35 +86,35 @@ msgstr "Dokumententyp Einstellungen"
 msgid "Document types settings"
 msgstr "Dokumententypen Einstellungen"
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Dokumentenversion"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Einstellunsgzeit"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "Dokumentenversion OCR Fehler"
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "Dokumentenversion OCR Fehler"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "Dokumentenseite"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Inhalt"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr "Seiteninhalt"
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr "Seiteninhalt"
 
@@ -140,6 +140,12 @@ msgstr "Verarbeiteten Text des Dokuments anzeigen"
 msgid "Change document type OCR settings"
 msgstr "OCR-Einstellungen für Dokumententyp beabeiten"
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Dokumentenversion"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -204,6 +210,12 @@ msgstr "OCR-Einstellungen für Dokumententyp %s bearbeiten"
 msgid "OCR result for document: %s"
 msgstr "Ergebnis der OCR-Texterkennung für Dokument %s"
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "OCR result for document: %s"
+msgid "OCR errors for document: %s"
+msgstr "Ergebnis der OCR-Texterkennung für Dokument %s"
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/en/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/en/LC_MESSAGES/django.mo
index b9336b9d91..b76d74c74f 100644
Binary files a/mayan/apps/ocr/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/en/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/en/LC_MESSAGES/django.po
index 75b7776122..46783596d5 100644
--- a/mayan/apps/ocr/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2012-06-17 22:12+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,21 +18,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 #, fuzzy
 msgid "Document"
 msgstr "document"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 #, fuzzy
 msgid "Result"
 msgstr "result"
@@ -66,7 +66,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr "document"
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 #, fuzzy
 msgid "OCR errors"
 msgstr "error"
@@ -90,39 +90,39 @@ msgstr "document queues"
 msgid "Document types settings"
 msgstr "document queues"
 
-#: models.py:31
+#: models.py:32
 #, fuzzy
 msgid "Document version"
 msgstr "document queues"
 
-#: models.py:34
+#: models.py:35
 #, fuzzy
 msgid "Date time submitted"
 msgstr "date time submitted"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 #, fuzzy
 msgid "Document page"
 msgstr "document"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr ""
 
-#: models.py:62
+#: models.py:63
 #, fuzzy
 msgid "Document page content"
 msgstr "clean up pages content"
 
-#: models.py:63
+#: models.py:64
 #, fuzzy
 #| msgid "Document pages content clean up error: %s"
 msgid "Document pages contents"
@@ -150,6 +150,11 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+msgid "Document version OCR"
+msgstr "document queues"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -214,6 +219,12 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr "Queued documents: %d"
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "Queued documents: %d"
+msgid "OCR errors for document: %s"
+msgstr "Queued documents: %d"
+
 #, fuzzy
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
diff --git a/mayan/apps/ocr/locale/es/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/es/LC_MESSAGES/django.mo
index df537c4667..e66f93eb6b 100644
Binary files a/mayan/apps/ocr/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/es/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/es/LC_MESSAGES/django.po
index 4cca888d6f..3a4dcdd1b8 100644
--- a/mayan/apps/ocr/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,20 +22,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Documento"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "Añadido"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "Resultado"
 
@@ -64,7 +64,7 @@ msgstr "Configurar OCR"
 msgid "OCR documents per type"
 msgstr "Realizar OCR por tipo de documento"
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "Errores de OCR"
 
@@ -84,35 +84,35 @@ msgstr "Configuración del tipo de documento"
 msgid "Document types settings"
 msgstr "Configuraciones de tipos de documento"
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Versión de documento"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Fecha y hora en que fue sometido"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "Error de OCR en versión de documento"
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "Errores de OCR en versiones de documentos"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "Página de documento"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Contenido"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr "Contenido de página de documento"
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr "Contenido de página de documento"
 
@@ -138,6 +138,12 @@ msgstr "Ver el texto transcrito de los documentos"
 msgid "Change document type OCR settings"
 msgstr "Cambiar opciones OCR por tipo de documento"
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Versión de documento"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -196,6 +202,12 @@ msgstr "Editar opciones OCR para el tipo de documento: %s"
 msgid "OCR result for document: %s"
 msgstr "Resultados del OCR para documento: %s"
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "OCR result for document: %s"
+msgid "OCR errors for document: %s"
+msgstr "Resultados del OCR para documento: %s"
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.mo
index f196eb4bdc..4ef60ca4da 100644
Binary files a/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.po
index 9fe041317c..131bfa9a0f 100644
--- a/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,20 +19,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "سند"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "اضافه شده"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "جواب"
 
@@ -61,7 +61,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "خطای OCR "
 
@@ -81,35 +81,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "نسخه مستندات"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "تاریخ و زمان ارسال"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "خطای OCR نسخه مستندات"
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "خطاهای OCR نسخه مستندات"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "صفحه سند"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "محتوا"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -135,6 +135,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "نسخه مستندات"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -191,6 +197,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.mo
index 3b6b52a316..e57e6e02e7 100644
Binary files a/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.po
index 1ea91d8399..4fcb8e3043 100644
--- a/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/fr/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -24,20 +24,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR - Reconnaissance de caractères"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Document"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "Ajouté"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "Résultat"
 
@@ -66,7 +66,7 @@ msgstr "Paramétrage de l'OCR"
 msgid "OCR documents per type"
 msgstr "OCR documents par type"
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "Erreurs OCR"
 
@@ -87,35 +87,35 @@ msgstr "Paramétrages de type de document"
 msgid "Document types settings"
 msgstr "Paramétrages de types de documents"
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Version du document"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Date et heure de soumission"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "Erreur OCR sur la version du document"
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "Erreurs OCR sur la version du document"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "Pages du document"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Contenu"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr "Contenu de la page du document"
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr "Contenu des pages du document"
 
@@ -141,6 +141,12 @@ msgstr "Afficher la transcription du texte depuis le document"
 msgid "Change document type OCR settings"
 msgstr "Modifier les paramétrages OCR du type de document"
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Version du document"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -201,6 +207,12 @@ msgstr "Modifier les paramètres OCR pour le type de document : %s"
 msgid "OCR result for document: %s"
 msgstr "Résultats de l'OCR pour le document: %s"
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "OCR result for document: %s"
+msgid "OCR errors for document: %s"
+msgstr "Résultats de l'OCR pour le document: %s"
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.mo
index 7f562198e5..ffb05524c5 100644
Binary files a/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.po
index dba92d6540..db2cdda295 100644
--- a/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,20 +19,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr ""
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -81,35 +81,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Tartalom"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -135,6 +135,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -191,6 +197,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -298,9 +309,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/id/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/id/LC_MESSAGES/django.mo
index 5875d49129..b802e9dafc 100644
Binary files a/mayan/apps/ocr/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/id/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/id/LC_MESSAGES/django.po
index 590769f726..eed9c92b7a 100644
--- a/mayan/apps/ocr/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,20 +19,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr ""
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -81,35 +81,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Isi"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -135,6 +135,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -191,6 +197,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -296,9 +307,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/it/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/it/LC_MESSAGES/django.mo
index b0ec06486d..5e2d2cd7b9 100644
Binary files a/mayan/apps/ocr/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/it/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/it/LC_MESSAGES/django.po
index be2a3cd60f..2a0f2e8d3e 100644
--- a/mayan/apps/ocr/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,20 +21,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Documento"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "Aggiunto"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "Risultato"
 
@@ -63,7 +63,7 @@ msgstr "Configura OCR"
 msgid "OCR documents per type"
 msgstr "OCR per tipo documento"
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "Errori OCR"
 
@@ -83,35 +83,35 @@ msgstr "Impostazioni tipo documento"
 msgid "Document types settings"
 msgstr "Impostazioni tipi documento"
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Versione documento"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Data e ora di invio"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "Document Version OCR Error"
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "Document Version OCR Errors"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "Pagina del documento"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Contenuto "
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr "Contenuto pagina del documento"
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr "Contenuti pagine documento"
 
@@ -137,6 +137,12 @@ msgstr "Vedi il testo trascritto dal documento"
 msgid "Change document type OCR settings"
 msgstr "Cambia impostazioni OCR per tipo documento "
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Versione documento"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -198,6 +204,12 @@ msgstr "Modifica le impostazioni OCR per il tipo documento: %s"
 msgid "OCR result for document: %s"
 msgstr "Risultati OCR per il documento: %s"
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "OCR result for document: %s"
+msgid "OCR errors for document: %s"
+msgstr "Risultati OCR per il documento: %s"
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.mo
index 787a5af03c..f79624028a 100644
Binary files a/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.po
index 7f80107bfb..89232262fb 100644
--- a/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/nl_NL/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -22,20 +22,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Document"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "Toegevoegd"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "Resultaat"
 
@@ -64,7 +64,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "OCR-fouten"
 
@@ -84,35 +84,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Documentversie"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Indientijdstip"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "Documentpagina"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Inhoud"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -138,6 +138,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Documentversie"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -196,6 +202,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.mo
index 42bc015d86..35fdf4158e 100644
Binary files a/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.po
index 9d33d0836f..9cc4e8b9d2 100644
--- a/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/pl/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -23,20 +23,20 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Dokument"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "Dodano"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "Wynik"
 
@@ -65,7 +65,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "Błędy OCR"
 
@@ -85,35 +85,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Wersja dokumentu"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Data dodania"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "Błąd OCR wersji dokumentu"
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "Błędy OCR wersji dokumentu"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "Strona dokumentu"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Zawartość"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -139,6 +139,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Wersja dokumentu"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -195,6 +201,12 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "OCR all documents"
+msgid "OCR errors for document: %s"
+msgstr "OCR wszystkich dokumentów"
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.mo
index 5685fb3346..f869f9f88f 100644
Binary files a/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.po
index 3003c24c2b..56535c40c9 100644
--- a/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,20 +22,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -84,35 +84,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Conteúdo"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -138,6 +138,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -196,6 +202,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -303,9 +314,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.mo
index 7eba09bc6d..c3c9a83156 100644
Binary files a/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.po
index 99f16696aa..c7738cf2ec 100644
--- a/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -22,20 +22,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "Enviar para a  fila de OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Documento"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "adicionado"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "resultado"
 
@@ -64,7 +64,7 @@ msgstr "Configurar OCR"
 msgid "OCR documents per type"
 msgstr "Realizar OCR de documentos por tipo"
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "Erros de OCR"
 
@@ -84,35 +84,35 @@ msgstr "Configuração do tipo de documento"
 msgid "Document types settings"
 msgstr "Configurações de tipos de documentos"
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Versão do Documento"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Data e Hora Submetida"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "OCR erro: Versão do documento  "
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "OCR erros: Versão do documento"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "página do documento"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Conteúdo"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr "Conteúdo de página de documento"
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr "Conteúdo de páginas de documento"
 
@@ -138,6 +138,12 @@ msgstr "Ver o texto transcrito dos documentos"
 msgid "Change document type OCR settings"
 msgstr "Alterar configurações de OCR para tipo de documento"
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Versão do Documento"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -196,6 +202,12 @@ msgstr "Editar configurações de OCR para documento de tipo: %s"
 msgid "OCR result for document: %s"
 msgstr "Resultados de OCR para documento: %s"
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "OCR result for document: %s"
+msgid "OCR errors for document: %s"
+msgstr "Resultados de OCR para documento: %s"
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.mo
index ba02e81321..193fd477de 100644
Binary files a/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.po
index d5d2a11564..48a09d213a 100644
--- a/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -21,20 +21,20 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -83,35 +83,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Versiune document"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Conținut"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -137,6 +137,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Versiune document"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -195,6 +201,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.mo
index 53b2e22a0b..fff2c2eca1 100644
Binary files a/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.po
index 460ed583d0..7e67e46fe4 100644
--- a/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,20 +22,20 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "Распознавание текста"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Документ"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr "Добавлено"
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr "Результат"
 
@@ -64,7 +64,7 @@ msgstr "Настройки распознавания"
 msgid "OCR documents per type"
 msgstr "Распознавание документов с определенным типом"
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr "Ошибки распознавания"
 
@@ -84,35 +84,35 @@ msgstr "Настройки типа документа"
 msgid "Document types settings"
 msgstr "Настройки типов документа"
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr "Версия документа"
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr "Дата и время отправления"
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr "Ошибка распознавания для версии документа"
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr "Ошибки распознавания для версий документов"
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr "Страница документа"
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Содержимое"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr "Содержимое страницы документа"
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr "Содержимое страниц документа"
 
@@ -138,6 +138,12 @@ msgstr "Просмотр распознанного текста докумен
 msgid "Change document type OCR settings"
 msgstr "Изменить настройки распознавания документа"
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document version"
+msgid "Document version OCR"
+msgstr "Версия документа"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -200,6 +206,12 @@ msgstr "Редактировать настройки распознавания
 msgid "OCR result for document: %s"
 msgstr "Результат распозанвания для документа: %s"
 
+#: views.py:172
+#, fuzzy, python-format
+#| msgid "OCR result for document: %s"
+msgid "OCR errors for document: %s"
+msgstr "Результат распозанвания для документа: %s"
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
diff --git a/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.mo
index 4d51beeefa..15e3789c20 100644
Binary files a/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.po
index a2a67ee460..f466de7946 100644
--- a/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-23 16:43+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -20,20 +20,20 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr ""
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr "Dokument"
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -82,35 +82,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Vsebina"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -136,6 +136,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -192,6 +198,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -303,9 +314,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.mo
index cd751b4774..960dc18817 100644
Binary files a/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.po
index b0830e1f15..4bc6bd89fe 100644
--- a/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -20,20 +20,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "OCR"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -82,35 +82,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "Nội dung"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -136,6 +136,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -192,6 +198,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -297,9 +308,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.mo
index 8e35b30a1d..3b2d267ab3 100644
Binary files a/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.po
index 7f848f1fab..9b8901b447 100644
--- a/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/ocr/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,20 +20,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:53 apps.py:111 apps.py:115 links.py:14 permissions.py:7
+#: apps.py:55 apps.py:113 apps.py:117 links.py:14 permissions.py:7 queues.py:7
 #: settings.py:7
 msgid "OCR"
 msgstr "扫描输入"
 
-#: apps.py:86
+#: apps.py:88
 msgid "Document"
 msgstr ""
 
-#: apps.py:90
+#: apps.py:92
 msgid "Added"
 msgstr ""
 
-#: apps.py:94 models.py:36
+#: apps.py:96 models.py:37
 msgid "Result"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "OCR documents per type"
 msgstr ""
 
-#: links.py:37 views.py:154
+#: links.py:37 links.py:41 views.py:154
 msgid "OCR errors"
 msgstr ""
 
@@ -82,35 +82,35 @@ msgstr ""
 msgid "Document types settings"
 msgstr ""
 
-#: models.py:31
+#: models.py:32
 msgid "Document version"
 msgstr ""
 
-#: models.py:34
+#: models.py:35
 msgid "Date time submitted"
 msgstr ""
 
-#: models.py:43
+#: models.py:44
 msgid "Document Version OCR Error"
 msgstr ""
 
-#: models.py:44
+#: models.py:45
 msgid "Document Version OCR Errors"
 msgstr ""
 
-#: models.py:54
+#: models.py:55
 msgid "Document page"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "Content"
 msgstr "内容"
 
-#: models.py:62
+#: models.py:63
 msgid "Document page content"
 msgstr ""
 
-#: models.py:63
+#: models.py:64
 msgid "Document pages contents"
 msgstr ""
 
@@ -136,6 +136,12 @@ msgstr ""
 msgid "Change document type OCR settings"
 msgstr ""
 
+#: queues.py:9
+#, fuzzy
+#| msgid "Document queues: %d"
+msgid "Document version OCR"
+msgstr "Document queues: %d"
+
 #: settings.py:12
 msgid ""
 "File path to poppler's pdftotext program used to extract text from PDF files."
@@ -192,6 +198,11 @@ msgstr ""
 msgid "OCR result for document: %s"
 msgstr ""
 
+#: views.py:172
+#, python-format
+msgid "OCR errors for document: %s"
+msgstr ""
+
 #~ msgid "pdftotext version"
 #~ msgstr "document queues"
 
@@ -297,9 +308,6 @@ msgstr ""
 #~ msgid "OCR queue statistics"
 #~ msgstr "OCR statistics"
 
-#~ msgid "Document queues: %d"
-#~ msgstr "Document queues: %d"
-
 #~ msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 #~ msgstr "Document: %(document)s was re-queued to the OCR queue: %(queue)s"
 
diff --git a/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.mo
index b666fbc87c..da19e1b9a1 100644
Binary files a/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.po
index 9aee99616d..e461c4bde6 100644
--- a/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.mo
index 74647e8282..a0ec8c3bf0 100644
Binary files a/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.po
index 283defa46d..2caae384c8 100644
--- a/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.mo
index af040b8a98..f0acd6e1b0 100644
Binary files a/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.po
index 051226d1d0..f87d72f7c5 100644
--- a/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/permissions/locale/da/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/da/LC_MESSAGES/django.mo
index d7f33d648a..d43232ac85 100644
Binary files a/mayan/apps/permissions/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/da/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/da/LC_MESSAGES/django.po
index 258d05d026..1b4702ccd0 100644
--- a/mayan/apps/permissions/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.mo
index ffaaba9914..294cf604c3 100644
Binary files a/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.po
index 9bc9a4b988..c433057f25 100644
--- a/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/de_DE/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-24 23:14+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/permissions/locale/en/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/en/LC_MESSAGES/django.mo
index 85a77117c0..05b56ccd29 100644
Binary files a/mayan/apps/permissions/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/en/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/en/LC_MESSAGES/django.po
index 4072b1bb13..ae93dbfe3e 100644
--- a/mayan/apps/permissions/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2012-02-02 18:18+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/es/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/es/LC_MESSAGES/django.mo
index b2825f834b..f2e80a5620 100644
Binary files a/mayan/apps/permissions/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/es/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/es/LC_MESSAGES/django.po
index 353becd173..2be70f3982 100644
--- a/mayan/apps/permissions/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-23 03:03+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.mo
index e2ac0e1df2..07a0a308b9 100644
Binary files a/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.po
index 04722bc001..78e53b10cc 100644
--- a/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/fa/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.mo
index ebe7314167..eb0c039d0b 100644
Binary files a/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.po
index 32d752f631..a701900598 100644
--- a/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.mo
index 73512aa024..d874247e19 100644
Binary files a/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.po
index f292accb50..629d3a3bdc 100644
--- a/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/id/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/id/LC_MESSAGES/django.mo
index d83ca56697..deaa6bcd55 100644
Binary files a/mayan/apps/permissions/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/id/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/id/LC_MESSAGES/django.po
index c1a177e459..e571adb5f3 100644
--- a/mayan/apps/permissions/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/it/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/it/LC_MESSAGES/django.mo
index 15391723ab..14ad37b33f 100644
Binary files a/mayan/apps/permissions/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/it/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/it/LC_MESSAGES/django.po
index 404934fbda..adf998125f 100644
--- a/mayan/apps/permissions/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.mo
index df5e5598be..d4291d2525 100644
Binary files a/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.po
index d9f40d33cf..e5405ab5c4 100644
--- a/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.mo
index eb3df4a221..d4f44258d6 100644
Binary files a/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.po
index b1a8322e5a..c67a18c6de 100644
--- a/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.mo
index c2fe1e863d..c2b53a62be 100644
Binary files a/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.po
index 4f00d58633..e53f6b876b 100644
--- a/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.mo
index 2a6e347f56..09e80be8c9 100644
Binary files a/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.po
index 771e6dc29f..257521bdce 100644
--- a/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/pt_BR/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.mo
index 79017a42e1..c753c5aba4 100644
Binary files a/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.po
index f5344d6c9b..2aee66ddda 100644
--- a/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.mo
index 34d43d8d4e..5bb92ab758 100644
Binary files a/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.po
index 4e13e51519..9c1bbfd848 100644
--- a/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.mo
index de42ae297e..a1c4748d61 100644
Binary files a/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.po
index 377de432ff..6f9386508a 100644
--- a/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.mo
index 4a9e65d19d..ab102375b5 100644
Binary files a/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.po
index 51a8570b7a..c7307e81b9 100644
--- a/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.mo
index 097ea82837..7ae4f19b3c 100644
Binary files a/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.po
index 27c1f69560..2939c68231 100644
--- a/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/permissions/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.mo
index f433c57b65..952d5a8b0f 100644
Binary files a/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.po
index 6fce48e2ed..d6d4ad7cd3 100644
--- a/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.mo
index 52582c2f3f..5a5865ba71 100644
Binary files a/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.po
index 67bff959bb..7a4bac4131 100644
--- a/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.mo
index 659eccd083..111602f41a 100644
Binary files a/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.po
index bf68d4725b..1c1f4df325 100644
--- a/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.mo
index 0027b58311..1c4ec66d11 100644
Binary files a/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.po
index d15cfb06b3..1a5edf9225 100644
--- a/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.mo
index df3e93f1da..fa4cd4603a 100644
Binary files a/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.po
index a5b43e8745..89e224b337 100644
--- a/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-24 21:12+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.mo
index a67c07abb0..a29869aedc 100644
Binary files a/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.po
index 0d6179d170..9919b20400 100644
--- a/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.mo
index 1de62f32de..852333b39b 100644
Binary files a/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.po
index 6ed67f873e..ad0c27e058 100644
--- a/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-23 03:03+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.mo
index 1621125bf6..00d1f25e2d 100644
Binary files a/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.po
index 0e39430237..8dc5f3f0e5 100644
--- a/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.mo
index ae1ea4970e..3256a4eb56 100644
Binary files a/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.po
index 92dc3917ac..42fd4ba5c6 100644
--- a/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.mo
index 73512aa024..d874247e19 100644
Binary files a/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.po
index 118ac5ed2b..4d3fa07f15 100644
--- a/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.mo
index d83ca56697..deaa6bcd55 100644
Binary files a/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.po
index 9e1adb7648..fdc5e93bb4 100644
--- a/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.mo
index 43c319691c..5517e78aa6 100644
Binary files a/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.po
index 32910009e1..8589a2eb43 100644
--- a/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.mo
index 74f5f65d37..6da36c8e19 100644
Binary files a/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.po
index b4faf96d9b..2e5dbfe6f8 100644
--- a/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.mo
index 71294fafeb..9058d0f7f2 100644
Binary files a/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.po
index c8fabdd02f..febd943a1f 100644
--- a/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/pl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.mo
index fa8b22b1ed..eeab002fff 100644
Binary files a/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.po
index bea7e4691b..85438f5537 100644
--- a/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.mo
index fdb6e99091..18f77f3b92 100644
Binary files a/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.po
index f8a4dc84ae..33698176df 100644
--- a/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.mo
index 265f9d9749..cf3476bd32 100644
Binary files a/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.po
index d2c244acbc..ca69b0cee0 100644
--- a/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/ro_RO/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.mo
index ed47c015d6..58a9c83bec 100644
Binary files a/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.po
index c206a90303..8415151765 100644
--- a/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.mo
index b6a481b423..ce35783c38 100644
Binary files a/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.po
index 411bba7af9..af803e7910 100644
--- a/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.mo
index 2f4a11fd46..b178ce6f98 100644
Binary files a/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.po
index 545e95684c..2064ad7e0e 100644
--- a/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.mo
index 78c94095c9..f9177d1d5c 100644
Binary files a/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.po
index bf0b71c287..d543073a2a 100644
--- a/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/rest_api/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.mo
index 4e1388b047..294fac92d7 100644
Binary files a/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po
index 7dd89fca14..f3084f5035 100644
--- a/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.mo
index be80e8afdc..1e750da1c4 100644
Binary files a/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po
index ae77c993cf..b746be483b 100644
--- a/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.mo
index ec5be07761..144536943b 100644
Binary files a/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po
index b914ad6ea0..7b14133779 100644
--- a/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.mo
index d7f33d648a..d43232ac85 100644
Binary files a/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.po
index 39eb41a757..bb8852f449 100644
--- a/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo
index 66dc425407..1e546cbb09 100644
Binary files a/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po
index 1c079d553d..cd48b35035 100644
--- a/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.mo
index 18edf6e20f..979d5d2e94 100644
Binary files a/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po
index 4a1a735fcd..817cd0f674 100644
--- a/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2012-12-12 06:06+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.mo
index 6149605e5c..10f05b903e 100644
Binary files a/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po
index 0ef06b5a09..d5d1b1470f 100644
--- a/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.mo
index f45bf330cb..9b8d45b664 100644
Binary files a/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po
index 7d4ec29cb0..ee77ce7abd 100644
--- a/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.mo
index c64faba21e..d8b7c38147 100644
Binary files a/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po
index ce039c4f82..07d3c59dd0 100644
--- a/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.mo
index 73512aa024..d874247e19 100644
Binary files a/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po
index 437849979e..9187f23b5b 100644
--- a/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.mo
index d83ca56697..deaa6bcd55 100644
Binary files a/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po
index dd0b752331..0639a8f1f2 100644
--- a/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.mo
index fa89f4c73a..5295916328 100644
Binary files a/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po
index 299c3e549c..e7896d9443 100644
--- a/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.mo
index 55d9e917d6..5555f88dad 100644
Binary files a/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po
index c7b585150f..494be4d905 100644
--- a/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.mo
index 82ed24a801..7a700cbee2 100644
Binary files a/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po
index e4ee004701..4f9833107c 100644
--- a/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.mo
index c152acfc71..a6592250db 100644
Binary files a/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po
index dec4e22c59..44c045da7f 100644
--- a/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:50-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo
index ace0954f5e..195e1be9a2 100644
Binary files a/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po
index fe02b78531..7fa0eaab61 100644
--- a/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.mo
index e222551f78..ee77f4f42e 100644
Binary files a/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po
index 203b92bcce..70c087ffa7 100644
--- a/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.mo
index da9fb167ef..c096d372b9 100644
Binary files a/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po
index aefffb4649..53b61e7d18 100644
--- a/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.mo
index d043638661..4c2068edd7 100644
Binary files a/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po
index bfe993d48a..6a7f0e5210 100644
--- a/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.mo
index 6e6ca1a07d..cdfb76204b 100644
Binary files a/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po
index 03acb4d237..0a07952d54 100644
--- a/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.mo
index 4d9aefa828..bc332558db 100644
Binary files a/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.po
index 2b7e13d1d1..3e63224119 100644
--- a/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/smart_settings/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/sources/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/ar/LC_MESSAGES/django.mo
index c8bf9b3ffc..0dbc43c343 100644
Binary files a/mayan/apps/sources/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/ar/LC_MESSAGES/django.po b/mayan/apps/sources/locale/ar/LC_MESSAGES/django.po
index 84d9477d22..4fb966dee2 100644
--- a/mayan/apps/sources/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,34 +21,34 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgstr "فك الملفات المضغوطة"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "تحميل الملفات في ملف مضغوط كوثائق منفردة"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "ملف الاعداد"
 
@@ -100,289 +100,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "تحرير"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "مصادر الوثائق"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "نوع الوثيقة"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "دائما"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "لا"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "اسئل المستخدم"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "مسار نظام الملفات على الخادم"
-
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr "قيمة العرض لتمريرها إلى نظام المعالجة"
+#: models.py:178
+msgid "Device name"
+msgstr ""
 
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "مسار نظام الملفات على الخادم"
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr "قيمة العرض لتمريرها إلى نظام المعالجة"
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "قيمة الارتفاع لتمريرها إلى نظام المعالجة"
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "هل يتم فك الملفات المضغوطة أم لا."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "حذف الملف بعد رفعه بنجاح."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "غير قادر على ايجاد قائمة بملفات الاعداد: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "نوع الوثيقة"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -410,6 +512,30 @@ msgstr "عرض مصادر الوثائق الحالية"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "إعداد المصادر"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -419,73 +545,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "انشاء مصدر جديد من النوع: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -613,9 +743,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/bg/LC_MESSAGES/django.mo
index 80ccc262eb..24c75c3ae4 100644
Binary files a/mayan/apps/sources/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/bg/LC_MESSAGES/django.po b/mayan/apps/sources/locale/bg/LC_MESSAGES/django.po
index c58c46eb1c..f9a598d129 100644
--- a/mayan/apps/sources/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,34 +20,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr ""
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr ""
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr ""
 
@@ -99,289 +99,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Редактиране"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Източници на документи"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Вид на документа"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Винаги"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Никога"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Питане на потребителя"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:178
+msgid "Device name"
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr ""
-
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr ""
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr ""
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr ""
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr ""
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr ""
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Вид на документа"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -409,6 +511,30 @@ msgstr "Преглед на съществуващи източници на д
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Настройка на източници"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -418,73 +544,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr ""
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -612,9 +742,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.mo
index 8b46004587..8b8de59b98 100644
Binary files a/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.po
index 55e48e3d05..553e6b2b7c 100644
--- a/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -21,34 +21,34 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgstr "Otpakuj kompresovane datoteke"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Upload kompresovane datoteke koja sadrži individualne dokumente"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Osnovna datoteka"
 
@@ -100,289 +100,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Urediti"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "izvori dokumenata"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Tip dokumenta"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Uvijek"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Nikada"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Pitaj korisnika"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "Serverska putanja na filesystem-u"
-
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr "Vrijednost za širinu za konvertovanje na backend-u."
+#: models.py:178
+msgid "Device name"
+msgstr ""
 
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "Serverska putanja na filesystem-u"
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr "Vrijednost za širinu za konvertovanje na backend-u."
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Vrijednost za visinu za konvertovanje na backend-u."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Otpakuj ili ne kompresovane datoteke"
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Obriši datoteku nakon što bude uspješno upload-ana."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Onemogući dobivanje liste osnovnih datoteka: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Tip dokumenta"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -410,6 +512,30 @@ msgstr "Pregledaj postojeće izvore dokumenata"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Setup izvora"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -419,73 +545,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Kreiraj novi tip izvora: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -613,9 +743,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/da/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/da/LC_MESSAGES/django.mo
index e7e7a76146..13f88be27f 100644
Binary files a/mayan/apps/sources/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/da/LC_MESSAGES/django.po b/mayan/apps/sources/locale/da/LC_MESSAGES/django.po
index 41297ee0f2..116bee1662 100644
--- a/mayan/apps/sources/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,34 +20,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr "Udpak komprimerede filer"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Upload individuelle filer fra komprimeret arkiv"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Staging fil"
 
@@ -99,289 +99,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr ""
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Document kilder"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Dokumenttype"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Altid"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Aldrig"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Spørg bruger"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "Serverside filsystem sti."
-
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr "Bredde, der overføres til konverter backend."
+#: models.py:178
+msgid "Device name"
+msgstr ""
 
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "Serverside filsystem sti."
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr "Bredde, der overføres til konverter backend."
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Højde, der overføres til konverter backend."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Hvorvidt et pakket arkiv skal udpakkes eller ikke"
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Slet filen, efter upload."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Kan ikke danne en liste med staging filer: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Dokumenttype"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -409,6 +511,30 @@ msgstr "Se eksisterende dokument kilder"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Kilde setup"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -418,73 +544,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Dan en ny kilde af typen: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -612,9 +742,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.mo
index 52aba6c4f7..a61e7fbe86 100644
Binary files a/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po
index 55e0138433..03e1c403c6 100644
--- a/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -25,15 +25,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "Quellen"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr "Quelle definieren"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
@@ -43,19 +43,19 @@ msgstr ""
 "in Mayan EDMS. Minimal ein Webformular für das Hochladen mittels Browser ist "
 "erforderlich."
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Erstellt"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Bild"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Zeit"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr "Nachricht"
 
@@ -71,7 +71,7 @@ msgstr "Komprimierte Dateien entpacken"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Ein komprimiertes Archiv hochladen, das einzelne Dokumente enthält"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Arbeitsdatei"
 
@@ -107,181 +107,286 @@ msgstr "Neuen Beobachtungs-Ordner hinzufügen"
 msgid "Add new webform source"
 msgstr "Neue Quelle für Webformular hinzufügen"
 
-#: links.py:64 links.py:78
+#: links.py:64
+#, fuzzy
+#| msgid "Add new staging folder"
+msgid "Add new SANE scanner"
+msgstr "Neuen Staging-Ordner hinzufügen"
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Löschen"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Dokumentenquelle"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Neue Version hochladen"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr "Protokolle"
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Dokumententyp"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Immer"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Niemals"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Benutzer fragen"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr "Webformular"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr "Staging-Ordner"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr "Beobachtungs-Ordner"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "POP3"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "IMAP"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Bezeichner"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "Quelle"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "Interaktive Quelle"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "Interaktive Quellen"
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Interval source"
+msgid "Paper source"
+msgstr "Intarvall Quelle"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+#| msgid "Error deleting staging file; %s"
+msgid "Error while scanning; %s"
+msgstr "Fehler beim Löschen von Staging-Datei: %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "Pfad auf dem Server"
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 msgid "Folder path"
 msgstr "Ordnerpfad"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr "Breite, die an den Konverter übergeben wird"
 
-#: models.py:181
+#: models.py:296
 msgid "Preview width"
 msgstr "Vorschaubreite"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Höhe, die an den Konverter übergeben wird"
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr "Vorschauhöhe"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Sollen komprimierte Archive entpackt werden?"
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "Entpacken"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Datei nach erfolgreichem Hochladen löschen."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr "Nach Hochladen löschen"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Die Liste der Arbeitsdateien kann nicht ermittelt werden: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr "Fehler beim Löschen von Staging-Datei: %s"
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr "Staging-Ordner"
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr "Webformular"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr "Außer Kontrolle"
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr "Intervall in Sekunden zwischen den Überprüfungen auf neue Dokumente"
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr "Intervall"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr "Ordnen Sie einen Dokumententyp für Dokumente aus dieser Quelle zu"
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Dokumententyp"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "Ob komprimierte Archive entpackt werden sollen"
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr "Intarvall Quelle"
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr "Intarvall Quellen"
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr "Host"
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
@@ -289,19 +394,19 @@ msgstr ""
 "Typische Werte sind 110 für POP3, 995 für POP3 über SSL, 143 für IMAP, 993 "
 "für IMAP über SSL"
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr "Port"
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr "Benutzer"
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Passwort"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
@@ -311,11 +416,11 @@ msgstr ""
 "die folgenden Anhänge enthält (Bemerkung: dieser Anhang muss der erste "
 "Anhang sein)."
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr "Name Metadatenattachment"
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
@@ -323,11 +428,11 @@ msgstr ""
 "Wählen Sie einen Metadatentyp zur Speicherung des E-Mail-Betreffs, der für "
 "den ausgewählten Dokumententyp zulässig ist"
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr "Metadatentyp des Betreffs"
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
@@ -335,19 +440,19 @@ msgstr ""
 "Wählen Sie einen Metadatentyp zur Speicherung des E-Mail-Absenders, der für "
 "den ausgewählten Dokumententyp zulässig ist"
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr "Metadatentyp des Absenders"
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr "Textkörper der Nachricht als Textdokument speichern"
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr "Textkörper der E-Mail speichern"
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -356,7 +461,7 @@ msgstr ""
 "Metadatentyp  \"%(metadata_type)s\" des Betreffs ist für den Dokumententyp "
 "\"%(document_type)s\" nicht zulässig."
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -365,44 +470,44 @@ msgstr ""
 "Metadatentyp  \"%(metadata_type)s\" des Absenders ist für den Dokumententyp "
 "\"%(document_type)s\" nicht zulässig."
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "Anhang-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr "E-Mail Quelle"
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr "E-Mail Quellen"
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr "Timeout"
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "POP email"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr "IMAP-Mailbox, die auf Nachrichten überprüft werden soll. "
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr "Beobachtungs-Ordner"
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr "Protokolleintrag"
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "Logeinträge"
 
@@ -430,6 +535,32 @@ msgstr "Existierende Dokumentenquellen anzeigen"
 msgid "Delete staging files"
 msgstr "Staging-Datei löschen"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Quellen-Einrichtung"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interval source"
+msgid "Check interval source"
+msgstr "Intarvall Quelle"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -439,12 +570,12 @@ msgstr "Fehler bei der Verarbeitung der Quelle %s"
 msgid "Clear"
 msgstr "Löschen"
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr "Logeinträge für Quelle %s"
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
@@ -452,65 +583,69 @@ msgstr ""
 "Es wurden keine interaktiven Dokumentenquellen konfiguriert. Bitte erstellen "
 "oder aktivieren Sie eine bevor Sie fortsetzen."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr "Dokumenteneigenschaften"
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr "Dateien im Staging Pfad"
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 "Neues Dokument in die Upload-Warteschlange eingereiht und demnächst verfügbar"
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr "Ein Dokument aus Quelle %s hochladen"
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr "Vom Dokument \"%s\" können keine neuen Versionen hochgeladen werden."
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 "Neue Dokumentenvrsion in die Upload-Warteschlange eingereiht und demnächst "
 "verfügbar"
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr "Eine neue Version von Quelle %s hochladen"
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Quelle des Typs %s erstellen"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr "Quelle %s wirklich löschen?"
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr "Quelle %s bearbeiten"
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Typ"
 
@@ -638,9 +773,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/en/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/en/LC_MESSAGES/django.mo
index 9e6f89c2e5..65d517a3a1 100644
Binary files a/mayan/apps/sources/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/en/LC_MESSAGES/django.po b/mayan/apps/sources/locale/en/LC_MESSAGES/django.po
index d60d4c6235..e7e1ed9c46 100644
--- a/mayan/apps/sources/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2013-11-20 13:14+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,38 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 #, fuzzy
 msgid "Sources"
 msgstr "sources"
 
-#: apps.py:54
+#: apps.py:57
 #, fuzzy
 #| msgid "Create new document sources"
 msgid "Create a document source"
 msgstr "Create new document sources"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 #, fuzzy
 msgid "Thumbnail"
 msgstr "thumbnail"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgstr "Expand compressed files"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Upload a compressed file's contained files as individual documents"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Staging file"
 
@@ -105,317 +105,418 @@ msgstr "server watch folders"
 msgid "Add new webform source"
 msgstr "add new source"
 
-#: links.py:64 links.py:78
+#: links.py:64
+#, fuzzy
+msgid "Add new SANE scanner"
+msgstr "server staging folders"
+
+#: links.py:69 links.py:83
 #, fuzzy
 msgid "Delete"
 msgstr "delete"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr ""
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Document sources"
 
-#: links.py:84
+#: links.py:89
 #, fuzzy
 msgid "Upload new version"
 msgstr "upload new version"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+msgid "Document feeder"
+msgstr "Current document type"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Always"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Never"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Ask user"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 #, fuzzy
 msgid "Web form"
 msgstr "web form"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 #, fuzzy
 msgid "Staging folder"
 msgstr "staging folder"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 #, fuzzy
 msgid "Watch folder"
 msgstr "watch folder"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 #, fuzzy
 msgid "Enabled"
 msgstr "enabled"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 #, fuzzy
 msgid "Source"
 msgstr "source"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+msgid "Paper source"
+msgstr "interval"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+msgid "Error while scanning; %s"
+msgstr "Unable to delete staging file: %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "Server side filesystem path."
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 #, fuzzy
 msgid "Folder path"
 msgstr "folder path"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr "Width value to be passed to the converter backend."
 
-#: models.py:181
+#: models.py:296
 #, fuzzy
 msgid "Preview width"
 msgstr "preview width"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Height value to be passed to the converter backend."
 
-#: models.py:186
+#: models.py:301
 #, fuzzy
 msgid "Preview height"
 msgstr "preview height"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Whether to expand or not compressed archives."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 #, fuzzy
 msgid "Uncompress"
 msgstr "uncompress"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Delete the file after is has been successfully uploaded."
 
-#: models.py:198
+#: models.py:313
 #, fuzzy
 msgid "Delete after upload"
 msgstr "delete after upload"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Unable get list of staging files: %s"
 
-#: models.py:243
+#: models.py:358
 #, fuzzy, python-format
 msgid "Error deleting staging file; %s"
 msgstr "Unable to delete staging file: %s"
 
-#: models.py:248
+#: models.py:363
 #, fuzzy
 msgid "Staging folders"
 msgstr "staging folders"
 
-#: models.py:276
+#: models.py:392
 #, fuzzy
 msgid "Web forms"
 msgstr "web forms"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 #, fuzzy
 msgid "Out of process"
 msgstr "out of process"
 
-#: models.py:290
+#: models.py:406
 #, fuzzy
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 "Inverval in seconds where the watch folder path is checked for new documents."
 
-#: models.py:291
+#: models.py:407
 #, fuzzy
 msgid "Interval"
 msgstr "interval"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 #, fuzzy
 msgid "Document type"
 msgstr "Current document type"
 
-#: models.py:302
+#: models.py:418
 #, fuzzy
 msgid "Whether to expand or not, compressed archives."
 msgstr "Whether to expand or not compressed archives."
 
-#: models.py:352
+#: models.py:468
 #, fuzzy
 msgid "Interval source"
 msgstr "interval"
 
-#: models.py:353
+#: models.py:469
 #, fuzzy
 msgid "Interval sources"
 msgstr "interval"
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 #, fuzzy
 #| msgid "Current metadata"
 msgid "Subject metadata type"
 msgstr "Current metadata"
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 #, fuzzy
 msgid "From metadata type"
 msgstr "Current metadata"
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 #, fuzzy
 msgid "Email source"
 msgstr "edit source: %s"
 
-#: models.py:513
+#: models.py:629
 #, fuzzy
 msgid "Email sources"
 msgstr "edit source: %s"
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 #, fuzzy
 msgid "Watch folders"
 msgstr "watch folders"
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -444,6 +545,31 @@ msgstr "View existing document sources"
 msgid "Delete staging files"
 msgstr "Unable to delete staging file: %s"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Sources setup"
+
+#: queues.py:16
+#, fuzzy
+msgid "Check interval source"
+msgstr "interval"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, fuzzy, python-format
 #| msgid "Error creating source; %s"
@@ -454,12 +580,12 @@ msgstr "Error creating source; %s"
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, fuzzy, python-format
 msgid "Log entries for source: %s"
 msgstr "upload a new version from source: %s"
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 #, fuzzy
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
@@ -467,67 +593,71 @@ msgid ""
 msgstr ""
 "No interactive document sources have been defined or none have been enabled."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 #, fuzzy
 #| msgid "Document sources"
 msgid "Document properties"
 msgstr "Document sources"
 
-#: views.py:162
+#: views.py:141
 #, fuzzy
 msgid "Files in staging path"
 msgstr "files in staging path"
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, fuzzy, python-format
 msgid "Upload a local document from source: %s"
 msgstr "upload a local document from source: %s"
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 #, fuzzy
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr "New document version uploaded successfully."
 
-#: views.py:418
+#: views.py:420
 #, fuzzy, python-format
 msgid "Upload a new version from source: %s"
 msgstr "upload a new version from source: %s"
 
-#: views.py:458
+#: views.py:460
 #, fuzzy, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr "upload a new version from source: %s"
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Create new source of type: %s"
 
-#: views.py:505
+#: views.py:507
 #, fuzzy, python-format
 #| msgid "Delete document sources"
 msgid "Delete the source: %s?"
 msgstr "Delete document sources"
 
-#: views.py:524
+#: views.py:526
 #, fuzzy, python-format
 msgid "Edit source: %s"
 msgstr "edit source: %s"
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -666,9 +796,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #, fuzzy
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
diff --git a/mayan/apps/sources/locale/es/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/es/LC_MESSAGES/django.mo
index f607d7f30f..4635033cc1 100644
Binary files a/mayan/apps/sources/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/es/LC_MESSAGES/django.po b/mayan/apps/sources/locale/es/LC_MESSAGES/django.po
index 5e04b8fcf1..6cff9169b1 100644
--- a/mayan/apps/sources/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/es/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-23 03:02+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,15 +23,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "Fuentes"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr "Crear una nueva fuente de documentos"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
@@ -41,19 +41,19 @@ msgstr ""
 "documentos en Mayan EDMS. Crea por lo menos una fuente del tipo formulario "
 "web para poder cargar documentos desde un navegador."
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Creado"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Foto miniatura"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Fecha y hora"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr "Mensaje"
 
@@ -70,7 +70,7 @@ msgid "Upload a compressed file's contained files as individual documents"
 msgstr ""
 "Subir los archivos de un archivo comprimido como documentos individuales"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Archivo provisional"
 
@@ -106,182 +106,287 @@ msgstr "Añadir nueva carpeta observada"
 msgid "Add new webform source"
 msgstr "Añadir nueva fuente en formato web"
 
-#: links.py:64 links.py:78
+#: links.py:64
+#, fuzzy
+#| msgid "Add new staging folder"
+msgid "Add new SANE scanner"
+msgstr "Añadir nueva carpeta de ensayo"
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Borrar"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Editar"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Fuentes de documentos"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Subir versión nueva"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr "Bitácoras"
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr "Revisar ahora"
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Tipo de documento"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Siempre"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Nunca"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Preguntar al usuario"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr "Formulario web"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr "Archivos provisionales"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr "Carpeta observada"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "Correo electrónico POP3"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "Correo electrónico IMAP"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Etiqueta"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "Fuente"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "Fuente interactiva"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "Fuentes interactivas"
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Interval source"
+msgid "Paper source"
+msgstr "Intervalo de fuente."
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+#| msgid "Error deleting staging file; %s"
+msgid "Error while scanning; %s"
+msgstr "Error al borrar archivo de ensayo; %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "Ruta a los archivos en el servidor."
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 msgid "Folder path"
 msgstr "Ruta de la carpeta"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr "Valor de la anchura que se pasa al backend convertidor."
 
-#: models.py:181
+#: models.py:296
 msgid "Preview width"
 msgstr "Ancho de muestra"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Valor de la altura que se pasa al backend convertidor."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr "Alto de muestra"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Expandir o no archivos comprimidos."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "Descomprimir"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Eliminar el archivo después de que se haya cargado correctamente."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr "Borrar después de subir"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "No es posible obtener la lista de los archivos provisionales: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr "Error al borrar archivo de ensayo; %s"
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr "Archivos provisionales"
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr "Formularios web"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr "Fuera de proceso"
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr "Intérvalo en segundos para detectar documentos nuevos"
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr "Intérvalo"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 "Asignar un tipo de documento a los documentos subidos desde esta fuente"
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Tipo de documento"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "Expandir o no archivos comprimidos."
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr "Intervalo de fuente."
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr "Intervalo de fuentes"
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr "Host"
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
@@ -289,19 +394,19 @@ msgstr ""
 "Las opciones típicas son 110 para POP3, 995 para POP3 sobre SSL, 143 para "
 "IMAP, 993 para IMAP sobre SSL."
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr "Puerto"
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr "Usuario"
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Contraseña"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
@@ -312,90 +417,90 @@ msgstr ""
 "adjuntos descargados. Nota: Este anejo tiene que ser el primer archivo "
 "adjunto."
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr "Nombre del anejo de metadatos"
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr "Tipo de metadatos de asunto "
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr "Tipo de metadato de remitente"
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr "Almacenar el cuerpo del correo electrónico como un documento de texto."
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr "Almacenar cuerpo del correo electrónico"
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "Anejo-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr "Fuente de correo electrónico"
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr "Fuentes de correo electrónico"
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr "Tiempo de espera"
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "Correo electrónico POP"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr "Buzón IMAP en el cual revisar mensajes."
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr "Buzón"
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr "Carpetas observadas"
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr "Entrada de bitácora"
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "Entradas de bitácora"
 
@@ -423,6 +528,32 @@ msgstr "Ver fuentes de documento existentes"
 msgid "Delete staging files"
 msgstr "Borrar archivos provisionales"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Configuración de fuentes de documentos"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interval source"
+msgid "Check interval source"
+msgstr "Intervalo de fuente."
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -432,12 +563,12 @@ msgstr "Error procesando fuente: %s"
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr "Entradas de bitácora para fuente: %s"
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
@@ -445,64 +576,68 @@ msgstr ""
 "No se han definido fuentes de documentos interactivos o no hay ninguna "
 "habilitada, cree una antes de continuar."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr "Propiedades de documento"
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr "Archivos en ruta de ensayo"
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr "Nuevo documento en cola para ser cargado, estará disponible en breve."
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr "Subir documento local desde la fuente: %s"
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr "Documento \"%s\" esta bloqueado de crear nuevas versiones."
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 "Nueva versión del documento en cola para ser cargado,  estará disponible en "
 "breve."
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr "Subir una nueva versión de la fuente: %s"
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr "¿Lanzar chequeo para la fuenta \"%s\"? "
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Crear nuevo tipo de fuente: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr "¿Eliminar la fuente: %s?"
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr "Editar fuente: %s"
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Tipo"
 
@@ -630,9 +765,6 @@ msgstr "Etiquetas a ser anejadas."
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/fa/LC_MESSAGES/django.mo
index 96766e3767..5473819b1b 100644
Binary files a/mayan/apps/sources/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/fa/LC_MESSAGES/django.po b/mayan/apps/sources/locale/fa/LC_MESSAGES/django.po
index 84f45feb8e..9a9a07fc78 100644
--- a/mayan/apps/sources/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,34 +20,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "سورس"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "ساخته‌شده"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "اندازه کوچک"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "تاریخ زمان"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr "بازگشایی فایلهای فشرده"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "آپلود فایل فشرده شامل فایل اصلی سند."
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "پرونده مرحله ای"
 
@@ -99,183 +99,288 @@ msgstr "ایجاد پرونده تحت نظر"
 msgid "Add new webform source"
 msgstr "اضافه کردن سورس جدید یک وب فرم"
 
-#: links.py:64 links.py:78
+#: links.py:64
+#, fuzzy
+#| msgid "Add new staging folder"
+msgid "Add new SANE scanner"
+msgstr "ایجتد پرونده مرحله ای"
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "حذف"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "ویرایش"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "سورسهای سند"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "آپلود نسخه دید"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "نوع سند"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "همیشه"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "هرگز"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "پرسیدن از کاربر"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 "وب فرم "
 "ا                                                                                                                                                                                                                                                                                                                                                                                                          "
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr "پرونده مرحله ای"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr "پرونده تحت نظر"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "ایمیل POP3"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "ایمیل IMAP"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "برچسب"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "فعال شده"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "سورس"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "سورس محاوره ای"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "سورس های محاوره ای"
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Interval source"
+msgid "Paper source"
+msgstr "فاصله سورس"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+#| msgid "Error deleting staging file; %s"
+msgid "Error while scanning; %s"
+msgstr "خطای حذف فایل مرحله ای : %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "محل قرارگیری برروی سیستم فایل سمت سرور"
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 msgid "Folder path"
 msgstr "محل پرونده"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr "مقداری که به مبدل جهت عرض ارسال خواهد شد."
 
-#: models.py:181
+#: models.py:296
 msgid "Preview width"
 msgstr "عرض پیش بینی"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "مقداری که به مبدل جهت ارتفاع ارسال خواهد شد."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr "ارتفاع پیش بینی"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "گسترش و یا آرشیوهای غیر فشرده"
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "فشرده نشده"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "حدف فایل پس از آپلود موفق آن."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr "حذف پس ار آپ لود"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "قادر به گرفتن لیست فایلهای مرحله ای نیست. %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr "خطای حذف فایل مرحله ای : %s"
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr "پرونده های مرحله ای"
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr "فرمهای وب"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr "خارج از پردازش"
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr "مدت زمان بین بررسی جهت سند جدید."
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr "فاصله"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr "این نوع را به اسناد آپلود شده از این آدرس تخصیص دهید."
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "نوع سند"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "غییر فشرده سازی آرشیوهای فشرده شده: بلی خیر"
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr "فاصله سورس"
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr "فاصله سورسها"
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr "هاست"
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
@@ -283,109 +388,109 @@ msgstr ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr "Port"
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr "نام کاربری"
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "کلمه عبور"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "الضاقیات-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr "ایمیل کردن سورس"
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr "ایمیل کردن سورسها"
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr "اتمام وقت"
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "POP ایمیل"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr "صندوق پستی"
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr "پرونده تحت نظر"
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "ورودیهای لاگ"
 
@@ -413,6 +518,32 @@ msgstr "دیدن سورس اسناد موجود"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "راه اندازی ویا نصب منابع "
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interval source"
+msgid "Check interval source"
+msgstr "فاصله سورس"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -422,12 +553,12 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
@@ -435,62 +566,66 @@ msgstr ""
 "هیچ منبع محاوره ای سند تعریف و یا فعال نشده، قبل از ادامه دادن یک منبع "
 "بسازید."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr "فایلهای درون راه مرحله ای"
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr "سند جدیدی که در صف آپلود است بزودی قابل دسترس خواهد بود."
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr "آپلود کردن فایل محلی از اصل:%s"
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr "نسخه سند جدید که جهت آپلود وارد صف شد بزودی قابل دسترس خواهد بود."
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr "آپلود نسخه ای جدید از اصل : %s"
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "ایجاد سورس جدید از نوع %s."
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr "ویرایش اصل : %s"
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "نوع"
 
@@ -618,9 +753,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/fr/LC_MESSAGES/django.mo
index b1d384f9f4..2b15c2b09c 100644
Binary files a/mayan/apps/sources/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/fr/LC_MESSAGES/django.po b/mayan/apps/sources/locale/fr/LC_MESSAGES/django.po
index c1c8c40191..1b598fbfba 100644
--- a/mayan/apps/sources/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/fr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -23,15 +23,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "Sources"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr "Créer un document source"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
@@ -41,19 +41,19 @@ msgstr ""
 "seront suivis dans Mayan EDMS, créer par au moins un formulaire web pour "
 "téléverser le document depuis le navigateur"
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Créé"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Vignette"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Date et heure"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr "Message"
 
@@ -71,7 +71,7 @@ msgstr ""
 "Importer le contenu d'un ensemble de fichiers compressés comme fichiers "
 "individuels"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "fichier en cours de modification"
 
@@ -107,182 +107,287 @@ msgstr "Ajouter une nouvelle surveillance de dossier"
 msgid "Add new webform source"
 msgstr "Ajouter une nouvelle source de formulaire web"
 
-#: links.py:64 links.py:78
+#: links.py:64
+#, fuzzy
+#| msgid "Add new staging folder"
+msgid "Add new SANE scanner"
+msgstr "Ajouter un nouveau répertoire d'indexation"
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Supprimer"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Modifier"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Sources du document"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Importer une nouvelle version"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr "Journaux évènement"
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Type de document"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Toujours"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Jamais"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Demander à l'utilisateur"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr "Formulaire web"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr "Répertoire dit d'index, modifications en cours"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr "Surveiller le répertoire"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "email POP3"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "email IMAP"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Libellé"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "Activé"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "Source"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "Source interactive"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "Sources interactives "
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Interval source"
+msgid "Paper source"
+msgstr "intervalle pour la source"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+#| msgid "Error deleting staging file; %s"
+msgid "Error while scanning; %s"
+msgstr "Impossible de supprimer le fichier en cours de modification: %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "chemin de répertoire système sur le serveur."
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 msgid "Folder path"
 msgstr "Chemin du dossier"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr "Valeur de largeur à passer au convertisseur en arrière plan"
 
-#: models.py:181
+#: models.py:296
 msgid "Preview width"
 msgstr "Largeur de la prévisualisation"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Valeur de hauteur à passer au convertisseur en arrière plan."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr "Hauteur de prévisualisation"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Indique s'il faut ou non décompresser les fichiers d'archive."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "Décompresser"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "supprimer le fichier après importation avec succès."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr "Supprimer après télé-versement"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Impossible d'obtenir la liste des fichiers en cours de modification:%s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr "Impossible de supprimer le fichier en cours de modification: %s"
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr "Répertoires dit d'index, modifications en cours"
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr "Formulaire Web"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr "Process externe"
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr "Intervalle en secondes entre la vérification de nouveaux documents."
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr "Intervalle"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 "Assigner un type de document aux documents importés à partir de cette source."
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Type de document"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "Choisir de décompresser ou pas les archives compressées."
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr "intervalle pour la source"
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr "intervalle pour les sources"
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr "Hote"
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
@@ -290,19 +395,19 @@ msgstr ""
 "Les choix typiques sont 110 pour le POP3, 995 pour le POP3 over SSL, 143 "
 "pour l'IMAP, 993 pour l'IMAP over SSL."
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr "Port"
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr "Identifiant"
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Mot de passe"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
@@ -312,11 +417,11 @@ msgstr ""
 "aux couple de valeur qui seront assignés au reste des documents téléversés. "
 "Noter que cette pièce jointe sera la première."
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr "Métadonnées de la pièce jointe"
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
@@ -324,11 +429,11 @@ msgstr ""
 "Sélectionner un type de métadonnée correct pour le type de document "
 "sélectionné, dans lequel enregistrer le sujet de l'email"
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr "Type de métadonnée du sujet"
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
@@ -336,19 +441,19 @@ msgstr ""
 "Sélectionner un type de métadonnée correct pour le type de document "
 "sélectionné, dans lequel enregistrer la valeur du champs \"de\""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr "Type de métadonnée du champs \"de\""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr "Sauvegarder le corps de l'email en tant que document texte."
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr "Sauvegarder le corps de l'email"
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -357,7 +462,7 @@ msgstr ""
 "Le type de métadonnée du sujet \"%(metadata_type)s\" n'est pas correct pour "
 "le document de type: %(document_type)s"
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -366,44 +471,44 @@ msgstr ""
 "Le type de métadonnée du champs \"de\" \"%(metadata_type)s\" n'est pas "
 "correct pour le document de type: %(document_type)s"
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "Pièce jointe-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr "source du courriel"
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr "Sources du courriel"
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr "Délai d'attente dépassé"
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "Compte POP"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr "Boîte IMAP où chercher les messages"
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr "surveiller les répertoires"
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr "Entrée du journal"
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "Entrées du journal"
 
@@ -431,6 +536,32 @@ msgstr "Afficher les sources du document en cours"
 msgid "Delete staging files"
 msgstr "Supprimer les fichiers en attente"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Configuration des Sources"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interval source"
+msgid "Check interval source"
+msgstr "intervalle pour la source"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -440,12 +571,12 @@ msgstr "Erreur lors du traitement de la source: %s"
 msgid "Clear"
 msgstr "Effacer"
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr "Entrée du journal pour la source: %s"
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
@@ -453,66 +584,70 @@ msgstr ""
 "Aucune source de document interactifs n'a été définie ou/ni activée, créer "
 "en une avant de continuer."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr "Propriété du document"
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr "Fichiers dans l'index, en cours de modification"
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 "Nouveau document ajouter dans la file d'attente pour transfert et disponible "
 "dans les plus bref délai."
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr "importer un document local à partir de la source: %s"
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr "L'ajout d'une nouvelle version pour le document \"%s\" est bloqué."
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 "Une nouvelle version du document mis en fille d'attente pour importation qui "
 "sera disponible dans les plus brefs délai."
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr "Importer une nouvelle version à partir de la source: %s"
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Créer une nouvelle source de type:%s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr "Supprimer la source: %s?"
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr "Modifier la source: %s"
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Type"
 
@@ -640,9 +775,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/hu/LC_MESSAGES/django.mo
index fa52b889c9..ecc79484ba 100644
Binary files a/mayan/apps/sources/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/hu/LC_MESSAGES/django.po b/mayan/apps/sources/locale/hu/LC_MESSAGES/django.po
index 6b289032a3..ae00dd7d3a 100644
--- a/mayan/apps/sources/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,34 +20,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr "Tömörített fájlok kibontása"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Tömörített fájlokat feltöltése önálló dokumentumként"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Átmeneti fájl"
 
@@ -99,289 +99,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr ""
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Dokumentum források"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Dokumentum típus"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Mindig"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Sohasem"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Kérdezd meg a felhasználót"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:178
+msgid "Device name"
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr ""
-
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr ""
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr ""
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr ""
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr ""
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr ""
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Dokumentum típus"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -409,6 +511,30 @@ msgstr "Létező dokumentum források megtekintése"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Források beállítása"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -418,73 +544,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr ""
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -612,9 +742,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/id/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/id/LC_MESSAGES/django.mo
index 9dc290a4dc..28fb35bfda 100644
Binary files a/mayan/apps/sources/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/id/LC_MESSAGES/django.po b/mayan/apps/sources/locale/id/LC_MESSAGES/django.po
index 000ef0735a..412bddf4b8 100644
--- a/mayan/apps/sources/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/id/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,34 +20,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "tanggal waktu"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgstr ""
 "Unggah berkas terkompresi yang mengandung berkas-berkas sebagai dokumen-"
 "dokumen individual"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr ""
 
@@ -101,289 +101,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr ""
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Sumber-sumber dokumen"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Jenis dokumen"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Selalu"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Tidak pernah"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Tanya pengguna"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:178
+msgid "Device name"
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr ""
-
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr ""
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr ""
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr ""
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Apakah mengembangkan atau tidak mengkompresi arsip-arsip."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Hapus berkas setelah berhasil di unggah."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Jenis dokumen"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Password"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -411,6 +513,28 @@ msgstr "Lihat sumber-sumber dokumen yang telah ada"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+msgid "Sources periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -420,73 +544,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Membuat sumber baru dengan jenis: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -614,9 +742,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/it/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/it/LC_MESSAGES/django.mo
index 766b42d062..fcbb612066 100644
Binary files a/mayan/apps/sources/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/it/LC_MESSAGES/django.po b/mayan/apps/sources/locale/it/LC_MESSAGES/django.po
index 1aa87f06c8..b0d6a2bbd9 100644
--- a/mayan/apps/sources/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/it/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,15 +22,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr "Crea una sorgente documento"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
@@ -39,19 +39,19 @@ msgstr ""
 "Sorgenti documento è il mezzo con cui i nuovi documenti alimentano Mayan "
 "EDMS, crea almeno una modulo web per poter caricare documenti da un browser."
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Creato"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Data e ora"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr "Messaggio"
 
@@ -67,7 +67,7 @@ msgstr "Espandi"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Pubblicare un file compresso contenente singoli documenti"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Mostra file"
 
@@ -103,183 +103,288 @@ msgstr "Aggiungi una nuova cartella monitorata"
 msgid "Add new webform source"
 msgstr "Aggiungi nuova sorgente webform"
 
-#: links.py:64 links.py:78
+#: links.py:64
+#, fuzzy
+#| msgid "Add new staging folder"
+msgid "Add new SANE scanner"
+msgstr "Aggiungi una nuova cartella di stage"
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Cancella"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Modifica"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Sorgente del documento"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Carica nuova versione"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr "Log"
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Tipo documento "
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Sempre"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Mai"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Chiedi all'utente"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr "Form web"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr "Cartella di stage"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr "Cartella monitorata"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "Email POP3"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "Email IMAP"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Etichetta"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "Sorgente"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "Sorgente interattiva"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "Sorgenti interattive"
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Interval source"
+msgid "Paper source"
+msgstr "Intervallo sorgente"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+#| msgid "Error deleting staging file; %s"
+msgid "Error while scanning; %s"
+msgstr "Errore cancellando il file di stage; %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "Path sul filesystem del server"
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 msgid "Folder path"
 msgstr "Percorso cartella"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr ""
 "valore della larghezza da passare per le operazioni di conversione in backend"
 
-#: models.py:181
+#: models.py:296
 msgid "Preview width"
 msgstr "Larghezza anteprima"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr ""
 "valore dell'altezza da passare per le operazioni di conversione in backend"
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr "Altezza anteprima"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Se espandere o meno degli archivi compressi."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "Decomprimi"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Cancella il file dopo essere stato caricato"
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr "Cancella dopo aver caricato"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Impossibile ottenere lista dei file di gestione temporanea: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr "Errore cancellando il file di stage; %s"
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr "Cartelle di stage"
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr "Form web"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr "Fuori dal processo"
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr "Intervallo in secondi tra le ricerche dei nuovi documenti."
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr "Intervallo"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr "Assegna un tipo documento ai documenti caricati da questa sorgente."
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Tipo documento "
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "Determina se espandere o no gli archivi compressi."
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr "Intervallo sorgente"
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr "Intervallo sorgenti"
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr "Host"
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
@@ -287,19 +392,19 @@ msgstr ""
 "Le scelte tipiche sono 110 per POP3, 995 per POP3 su SSL, 143 per IMAP, 993 "
 "per IMAP su SSL."
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr "Porta"
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr "Nome utente"
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Password"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
@@ -309,11 +414,11 @@ msgstr ""
 "coppie di valori che saranno assegnate al resto degli allegati caricati. "
 "Nota: Questo allegato sarà il primo degli allegati."
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr "Nome allegato metadati"
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
@@ -321,11 +426,11 @@ msgstr ""
 "Selezionare il tipo metadato valido per il documento selezionato dove "
 "impostare l'oggetto della mail."
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr "Tipo metadato oggetto"
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
@@ -333,19 +438,19 @@ msgstr ""
 "Selezionare il tipo metadato valido per il documento selezionato dove "
 "impostare il mittente della mail."
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr "Tipo metadato mittente"
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr "Salva il contenuto della mail in un documento di testo"
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr "Salva il contenuto della mail"
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -354,7 +459,7 @@ msgstr ""
 "Il tipo metadato \"oggetto\" \"%(metadata_type)s\" non è valido per il tipo "
 "documento: %(document_type)s"
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -363,44 +468,44 @@ msgstr ""
 "Il tipo metadato \"mittente\" \"%(metadata_type)s\" non è valido per il tipo "
 "documento: %(document_type)s"
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "allegato-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr "Email sorgente"
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr "Email sorgenti"
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr "Timeout"
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "Email POP"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr "Casella di posta IMAP dove controllare i messaggi."
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr "Casella"
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr "Cartelle monitorate"
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr "Elementi log"
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "Elementi log"
 
@@ -428,6 +533,32 @@ msgstr "Visualizza sorgenti documento esistente"
 msgid "Delete staging files"
 msgstr "Cancella i file temporanei"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Setup sorgente"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interval source"
+msgid "Check interval source"
+msgstr "Intervallo sorgente"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -437,12 +568,12 @@ msgstr "Errore processando la sorgente: %s"
 msgid "Clear"
 msgstr "Pulisci"
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr "Log per la sorgente: %s"
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
@@ -450,65 +581,69 @@ msgstr ""
 "Nessuna fonte interattiva dei documenti è stata definita o non ne sono state "
 "attivate."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr "Proprietà documento"
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr "File nel percorso di stage"
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 "Il nuovo documento pronto in coda per il carico e sarà disponibile a breve."
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr "Carica un documento locale dalla sorgente: %s"
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr "Il documento \"%s\" è bloccato per il caricamento di nuove versioni."
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 "La nuova versione del documento è in coda per il caricamento e sarà "
 "disponibile a breve."
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr "Carica la nuova versione dalla sorgente: %s"
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Crea nuovo tipo di sorgente:%s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr "Cancellare la sorgente: %s?"
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr "Modifica sorgente: %s"
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Tipo"
 
@@ -636,9 +771,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.mo
index efadc836ec..01f599f513 100644
Binary files a/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.po
index 5453d8a93b..51212fd085 100644
--- a/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -21,34 +21,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "Bronnen"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr "Maak een documentbron aan"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Aangemaakt"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Thumbnail"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Datum en tijd"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr "Bericht"
 
@@ -65,7 +65,7 @@ msgid "Upload a compressed file's contained files as individual documents"
 msgstr ""
 "Upload een gecomprimeerd archief van bestanden als individuele documenten"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Tijdelijk bestand"
 
@@ -101,292 +101,394 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Verwijder"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "bewerken"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Documentbronnen"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Nieuwe versie uploaden"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr "Logs"
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Documentsoort"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Altijd"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Nooit"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Vraag gebruiker"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr "Webformulier"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "POP3 e-mail"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "IMAP e-mail"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Label"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "BronB"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "Interactieve bro"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "Interactieve bronnen"
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "pad naar filesysteem server"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
 
-#: models.py:177 models.py:621
-msgid "Folder path"
-msgstr "Mappad"
+#: models.py:178
+msgid "Device name"
+msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr "Breedte waarde die moet worden doorgegeven aan de converter backend."
-
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "pad naar filesysteem server"
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr "Mappad"
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr "Breedte waarde die moet worden doorgegeven aan de converter backend."
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Hoogte waarde die moet worden doorgegeven aan de converter backend."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Keuze om te expanderen of uitpakken van archief. (TODO: review this)"
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "Uitpakken"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Verwijder het bestand nadat de 'upload' succesvol is voltooid."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 "Het is niet mogelijk om een lijst met tijdelijke bestanden aan te maken. "
 "Foutmelding: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 "Wijs een documentsoort toe voor documenten die worden geüpload van deze bron."
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Documentsoort"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "Al of niet uitpakken van gecomprimeerde archieven."
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "attachment-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "POP e-mail"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr "Loginvoer"
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "Loginvoer"
 
@@ -414,6 +516,32 @@ msgstr "Bekijk bestaande documentbronnen"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Bron instellen"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interactive source"
+msgid "Check interval source"
+msgstr "Interactieve bro"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -423,73 +551,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Aanmaken van nieuw documentbron van type: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Type"
 
@@ -617,9 +749,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/pl/LC_MESSAGES/django.mo
index 0fbda1cd0f..9ef65292e6 100644
Binary files a/mayan/apps/sources/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/pl/LC_MESSAGES/django.po b/mayan/apps/sources/locale/pl/LC_MESSAGES/django.po
index c6926905e2..40026635c4 100644
--- a/mayan/apps/sources/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/pl/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -24,34 +24,34 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Utworzony"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Miniaturka"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Data godzina"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr ""
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr ""
 
@@ -103,289 +103,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Usuń"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Edytuj"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr ""
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Prześlij nową wersję"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Typ dokumentów"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Zawsze"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Nigdy"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Pytaj użytkownika"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Etykieta"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "Włączone"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:178
+msgid "Device name"
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr ""
-
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr ""
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr ""
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr ""
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr ""
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr ""
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Typ dokumentów"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Hasło"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "Wpisy rejestru logów"
 
@@ -413,6 +515,28 @@ msgstr ""
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+msgid "Sources periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -422,73 +546,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr "Właściwości dokumentu"
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Utwórz nowe typ źródło:%s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Typ"
 
@@ -616,9 +744,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/pt/LC_MESSAGES/django.mo
index 1dd79f857d..6de0619922 100644
Binary files a/mayan/apps/sources/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/pt/LC_MESSAGES/django.po b/mayan/apps/sources/locale/pt/LC_MESSAGES/django.po
index d61c24007e..367e7bdb56 100644
--- a/mayan/apps/sources/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,34 +22,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 "Enviar os ficheiros contidos num ficheiro comprimido como documentos "
 "individuais"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Ficheiro de preparação"
 
@@ -103,289 +103,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Eliminar"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Editar"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Fontes de documentoo"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Tipo de documento"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Sempre"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Nunca"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Perguntar ao utilizador"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Nome"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "Caminho do sistema de ficheiros do lado do servidor"
-
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr "Valor da largura para ser passado para o backend conversor."
+#: models.py:178
+msgid "Device name"
+msgstr ""
 
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "Caminho do sistema de ficheiros do lado do servidor"
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr "Valor da largura para ser passado para o backend conversor."
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Valor da altura a ser passado ao conversor."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Se os ficheiros comprimidos devem ser descomprimidos ou não."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Excluir o ficheiro depois de ter sido enviado com sucesso."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Incapaz de obter a lista dos ficheiros em preparação: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Tipo de documento"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Senha"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -413,6 +515,30 @@ msgstr "Ver fontes de documentos existentes"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Configuração de fontes"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -422,73 +548,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Criar nova fonte do tipo: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -616,9 +746,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.mo
index a2092340e9..2ad4a7f542 100644
Binary files a/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.po
index 069542cea3..40eedfc28b 100644
--- a/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/pt_BR/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -22,15 +22,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "Fontes"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr "Criar uma nova fonte de documentos"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
@@ -40,19 +40,19 @@ msgstr ""
 "Mayan EDMS, crie pelo menos uma fonte de formulário da web para poder "
 "carregar documentos a partir de um navegador."
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Criando"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "miniatura"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "hora, data"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr "Mensagem"
 
@@ -69,7 +69,7 @@ msgid "Upload a compressed file's contained files as individual documents"
 msgstr ""
 "Upload de um arquivo compactado contendo arquivos como documentos individuais"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Preparação de arquivo"
 
@@ -105,182 +105,287 @@ msgstr "Adicionar uma nova pasta temporária"
 msgid "Add new webform source"
 msgstr "Adicionar nova fonte webform"
 
-#: links.py:64 links.py:78
+#: links.py:64
+#, fuzzy
+#| msgid "Add new staging folder"
+msgid "Add new SANE scanner"
+msgstr "Adicionar nova pasta de teste"
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Excluir"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Editar"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Fontes de documentos"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Upload de uma nova versão"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr "Logs"
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Tipos de Documentos"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Sempre"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Nunca"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Pergunte ao usuário"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr "formulário web"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr "Pasta teste"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr "Pasta Temporária"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "E-mail POP3"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "E-mail IMAP"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Label"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "habilitado"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "fonte"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "Fonte interativa"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "Fontes interativa"
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Interval source"
+msgid "Paper source"
+msgstr "Fonte de intervalo"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+#| msgid "Error deleting staging file; %s"
+msgid "Error while scanning; %s"
+msgstr "Error removendo arquivo de teste; %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "Caminho do sistema do servidor"
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 msgid "Folder path"
 msgstr "Caminho da Pasta"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr "Valor da largura a ser passado para o backend conversor."
 
-#: models.py:181
+#: models.py:296
 msgid "Preview width"
 msgstr "Largura de visualização"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Valor de altura para ser passado para o backend conversor."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr "Altura de pré-visualização"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Se expandir ou não arquivos compactados."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "descompactar"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Excluir o arquivo depois de ter sido carregado com sucesso."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr "excluir depois do Upload"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Unable get list of staging files: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr "Error removendo arquivo de teste; %s"
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr "Pastas de teste"
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr "Formulários web"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr "Saída do processo"
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr "Intervalo em segundos entre verificações para novos documentos."
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr "intervalo"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 "Atribuir um tipo de documento para documentos enviados a partir desta fonte."
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Tipos de Documentos"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "A possibilidade de expandir ou não, arquivos comprimido."
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr "Fonte de intervalo"
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr "Fontes de intervalo"
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr "Host"
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
@@ -288,19 +393,19 @@ msgstr ""
 "Escolhas típicas : 110 para POP3, 995 para  POP3 sobre SSL, 143 para IMAP, "
 "993 para IMAP sobre SSL."
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr "Porta"
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr "Usuário"
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Senha"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
@@ -310,11 +415,11 @@ msgstr ""
 "a serem atribuídos ao restante dos anexos transferidos. Nota: Este anexo tem "
 "de ser o primeiro anexo."
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr "Nome do metadado anexado"
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
@@ -322,11 +427,11 @@ msgstr ""
 "Selecione um tipo de metadados válido para o tipo de documento selecionado "
 "para armazenar o assunto do e-mail."
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr "Tipo de metadado do assunto"
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
@@ -334,19 +439,19 @@ msgstr ""
 "Selecione um tipo de metadados válido para o tipo de documento selecionado "
 "para armazenar o valor \"de\" do e-mail."
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr "Tipo de documento do remetente"
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr "Armazenar o corpo do e-mail como um documento de texto."
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr "Armazenar o corpo do e-mail"
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -355,7 +460,7 @@ msgstr ""
 "Tipo de metadado do assunto \"%(metadata_type)s\" não é válido para o "
 "documento do tipo: %(document_type)s"
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
@@ -364,44 +469,44 @@ msgstr ""
 "Tipo de metadados do campo \"de\" \"%(metadata_type)s\" não é válido para o "
 "tipo de documento: %(document_type)s"
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "anexo-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr "E-mail Fonte"
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr "E-mail Fontes"
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr "Timeout"
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "E-mail POP3"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr "Pasta de email IMAP de onde checar por mensagens."
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr "Caixa de correio"
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr "Pastas Temporárias"
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr "Entrada de registro"
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "As entradas de log"
 
@@ -429,6 +534,32 @@ msgstr "Ver fontes de documentos existentes"
 msgid "Delete staging files"
 msgstr "Apagar arquivos temporários"
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Configuração de fontes"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interval source"
+msgid "Check interval source"
+msgstr "Fonte de intervalo"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -438,12 +569,12 @@ msgstr "Erro processando fonte: %s"
 msgid "Clear"
 msgstr "Limpar"
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr "Registrar entradas para fonte: %s"
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
@@ -451,64 +582,68 @@ msgstr ""
 "Nenhuma fonte interativa de documentos fora definida ou nenhum foi ativada. "
 "Criar uma antes de prosseguir."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr "Propriedades do documento"
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr "Os arquivos no caminho de preparo"
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr "Novo documento na fila para carregados e estará disponível em breve."
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr "Carregar um documento no local de origem:%s "
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr "Documento \"%s\" está bloqueado para carregar novas versões."
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 "Nova versão do documento na fila para carregados e estará disponível em "
 "breve."
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr "Carregar uma nova versão da Origem: %s"
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Criar nova fonte do tipo: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr "Apagar a fonte: %s?"
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr "Editar fonte: %s"
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Tipo"
 
@@ -636,9 +771,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.mo
index 03782ea624..0519f68e90 100644
Binary files a/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.po
index f669b651df..1e222f1e24 100644
--- a/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/ro_RO/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -22,34 +22,34 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Iconiță"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Data și ora"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 "Încărcați fișiere de fișier comprimat care sunt incluse ca documente "
 "individuale"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Structura fisier"
 
@@ -103,289 +103,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Șterge"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Editează"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Sursa documentului"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Tip document"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Mereu"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "niciodată"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Întreabă utilizatorul"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Etichetă"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "Cale de fișiere server."
-
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr "Valoarea lățime trecuta convertorului."
+#: models.py:178
+msgid "Device name"
+msgstr ""
 
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "Cale de fișiere server."
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr "Valoarea lățime trecuta convertorului."
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Valoare de înălțime trecuta convertorului."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Dacă se extinde sau nu se arhivează."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Ștergeți fișierul după ce este a fost încărcat cu succes."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Imposibil obține lista de fișiere de așteptare:% s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Tip document"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -413,6 +515,30 @@ msgstr "Vezi sursele existente de documente"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Configurare surse"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -422,73 +548,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Creați o nouă sursă de tipul:% s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Tip"
 
@@ -616,9 +746,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/ru/LC_MESSAGES/django.mo
index fa24a0a485..4dcac9180a 100644
Binary files a/mayan/apps/sources/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/ru/LC_MESSAGES/django.po b/mayan/apps/sources/locale/ru/LC_MESSAGES/django.po
index f16e4459ef..c4f400e217 100644
--- a/mayan/apps/sources/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,15 +22,15 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr "Источники"
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr "Создать источник документов"
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
@@ -40,19 +40,19 @@ msgstr ""
 "Как минимум, чтобы можно было загружать документы из браузера, создайте веб-"
 "форму."
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr "Создано"
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr "Миниатюра"
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr "Дата и время"
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr "Сообщение"
 
@@ -68,7 +68,7 @@ msgstr "Извлекать из архивов?"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Загрузить файлы, содержащиеся в архиве в качестве отдельных документов"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "Промежуточный файл"
 
@@ -104,290 +104,393 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr "Удалить"
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Редактировать"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Источники документов"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr "Загрузить новую версию"
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr "Журналы"
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Тип документа"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Всегда"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Никогда"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Спросить пользователя"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr "Веб-форма"
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr "Промежуточная папка"
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr "Наблюдаемая папка"
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr "почтовый ящик POP3"
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr "почтовый ящик IMAP"
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Надпись"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr "Доступно"
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr "Источник"
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr "Интерактивный источник"
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr "Интерактивные источники"
 
-#: models.py:176 models.py:620
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
+msgstr ""
+
+#: models.py:178
+msgid "Device name"
+msgstr ""
+
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, fuzzy, python-format
+#| msgid "Error deleting staging file; %s"
+msgid "Error while scanning; %s"
+msgstr "Ошибка удаления промежуточного файла; %s"
+
+#: models.py:291 models.py:736
 msgid "Server side filesystem path."
 msgstr "Путь на сервере"
 
-#: models.py:177 models.py:621
+#: models.py:292 models.py:737
 msgid "Folder path"
 msgstr "Путь к папке"
 
-#: models.py:180
+#: models.py:295
 msgid "Width value to be passed to the converter backend."
 msgstr "Ширина после обработки."
 
-#: models.py:181
+#: models.py:296
 msgid "Preview width"
 msgstr "Ширина предпросмотра"
 
-#: models.py:185
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "Высота после обработки."
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr "Высота предпросмотра"
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "Независимо от того распакованы или нет архивы."
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr "Распаковать"
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "Удалить файл после загрузки."
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr "Удалить после загрузки"
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Не удалось получить список промежуточных файлов: %s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr "Ошибка удаления промежуточного файла; %s"
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr "Промежуточные папки"
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr "Веб-формы"
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr "Временной интервал проверки на наличие новых документов."
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr "Интервал"
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 "Назначить тип документов для документов, загружаемых из этого источника."
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Тип документа"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr "Следует ли извлекать данные из архива."
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr "Хост"
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr "SSL"
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr "Порт"
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "Пароль"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr "вложение-%i"
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr "POP email"
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr "IMAP ящик в котором проверять сообщения."
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr "Запись журнала"
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr "Записи журнала"
 
@@ -415,6 +518,32 @@ msgstr "Просмотр существующих источников доку
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Настройки источников"
+
+#: queues.py:16
+#, fuzzy
+#| msgid "Interactive source"
+msgid "Check interval source"
+msgstr "Интерактивный источник"
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -424,12 +553,12 @@ msgstr "Ошибка обработки источника: %s"
 msgid "Clear"
 msgstr "Очистить"
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr "Записи журнала для источника: %s"
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
@@ -437,62 +566,66 @@ msgstr ""
 "Интерактивные источники документов не были определены или включены, создайте "
 "один для продолжения."
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr "Свойства документа"
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr "Загрузка новой версии из источника %s"
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "Создать новый источник типа: %s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr "Тип"
 
@@ -620,9 +753,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.mo
index 6264d9e838..cda7130a2b 100644
Binary files a/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.po
index c299dde4f7..8185958f6e 100644
--- a/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -20,34 +20,34 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr ""
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr ""
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr ""
 
@@ -99,289 +99,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr ""
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr ""
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Tip dokumenta"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr ""
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr ""
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr ""
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr "Oznaka"
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:178
+msgid "Device name"
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr ""
-
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr ""
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr ""
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr ""
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr ""
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr ""
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Tip dokumenta"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -409,6 +511,28 @@ msgstr ""
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+msgid "Sources periodic"
+msgstr ""
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -418,73 +542,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr ""
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -612,9 +740,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.mo
index 27d98ed50b..e7a6b52244 100644
Binary files a/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.po
index b8fd49f9db..4423035160 100644
--- a/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -20,34 +20,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -63,7 +63,7 @@ msgstr "Giải nén"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "Upload một file nén chứa các file tài liệu riêng biệt"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr ""
 
@@ -99,289 +99,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr "Sửa"
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "Các nguồn tài liệu"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "Kiểu tài liệu"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "Luôn luôn"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "Hỏi người dùng"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "đường dẫn hệ thống phía Server"
-
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
+#: models.py:178
+msgid "Device name"
 msgstr ""
 
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "đường dẫn hệ thống phía Server"
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr ""
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr ""
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr ""
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr ""
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "Kiểu tài liệu"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr ""
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -409,6 +511,30 @@ msgstr "Xem các nguồn tài liệu đang tồn tại"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "Thiết lập nguồn tài liệu"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -418,73 +544,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr ""
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -612,9 +742,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.mo
index 63b6876551..245f4529bd 100644
Binary files a/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.po
index e68e272d3c..06aaeb8e04 100644
--- a/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/sources/locale/zh_CN/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:26+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,34 +21,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:38 links.py:35 models.py:145 views.py:543
+#: apps.py:40 links.py:35 models.py:159 queues.py:8 settings.py:7 views.py:545
 msgid "Sources"
 msgstr ""
 
-#: apps.py:54
+#: apps.py:57
 msgid "Create a document source"
 msgstr ""
 
-#: apps.py:56
+#: apps.py:59
 msgid ""
 "Document sources are the way in which new documents are feed to Mayan EDMS, "
 "create at least a web form source to be able to upload documents from a "
 "browser."
 msgstr ""
 
-#: apps.py:66
+#: apps.py:69
 msgid "Created"
 msgstr ""
 
-#: apps.py:73
+#: apps.py:76
 msgid "Thumbnail"
 msgstr ""
 
-#: apps.py:81 models.py:648
+#: apps.py:84 models.py:764
 msgid "Date time"
 msgstr ""
 
-#: apps.py:86 models.py:651
+#: apps.py:89 models.py:767
 msgid "Message"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgstr "展开压缩文件"
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr "上传一个压缩文件的包含文件作为单个文档"
 
-#: forms.py:67 views.py:431
+#: forms.py:67 views.py:433
 msgid "Staging file"
 msgstr "临时文件"
 
@@ -100,289 +100,391 @@ msgstr ""
 msgid "Add new webform source"
 msgstr ""
 
-#: links.py:64 links.py:78
+#: links.py:64
+msgid "Add new SANE scanner"
+msgstr ""
+
+#: links.py:69 links.py:83
 msgid "Delete"
 msgstr ""
 
-#: links.py:68
+#: links.py:73
 msgid "Edit"
 msgstr ""
 
-#: links.py:72
+#: links.py:77
 msgid "Document sources"
 msgstr "文档数据源"
 
-#: links.py:84
+#: links.py:89
 msgid "Upload new version"
 msgstr ""
 
-#: links.py:87
+#: links.py:92
 msgid "Logs"
 msgstr ""
 
-#: links.py:91
+#: links.py:96
 msgid "Check now"
 msgstr ""
 
-#: literals.py:10 literals.py:15
+#: literals.py:9
+msgid "Flatbed"
+msgstr ""
+
+#: literals.py:10
+#, fuzzy
+#| msgid "Document type"
+msgid "Document feeder"
+msgstr "文档类型"
+
+#: literals.py:17
+msgid "Simplex"
+msgstr ""
+
+#: literals.py:18
+msgid "Duplex"
+msgstr ""
+
+#: literals.py:26
+msgid "Lineart"
+msgstr ""
+
+#: literals.py:27
+msgid "Monochrome"
+msgstr ""
+
+#: literals.py:28
+msgid "Color"
+msgstr ""
+
+#: literals.py:36 literals.py:41
 msgid "Always"
 msgstr "总是"
 
-#: literals.py:11 literals.py:16
+#: literals.py:37 literals.py:42
 msgid "Never"
 msgstr "从不"
 
-#: literals.py:17
+#: literals.py:43
 msgid "Ask user"
 msgstr "询问用户"
 
-#: literals.py:27 models.py:275
+#: literals.py:54
+msgid "Scanner"
+msgstr ""
+
+#: literals.py:55 models.py:391
 msgid "Web form"
 msgstr ""
 
-#: literals.py:28 models.py:247
+#: literals.py:56 models.py:362
 msgid "Staging folder"
 msgstr ""
 
-#: literals.py:29 models.py:639
+#: literals.py:57 models.py:755
 msgid "Watch folder"
 msgstr ""
 
-#: literals.py:30
+#: literals.py:58
 msgid "POP3 email"
 msgstr ""
 
-#: literals.py:31 models.py:602 models.py:603
+#: literals.py:59 models.py:718 models.py:719
 msgid "IMAP email"
 msgstr ""
 
-#: models.py:48
+#: models.py:62
 msgid "Label"
 msgstr ""
 
-#: models.py:49 views.py:536
+#: models.py:63 views.py:538
 msgid "Enabled"
 msgstr ""
 
-#: models.py:144 models.py:645
+#: models.py:158 models.py:761
 msgid "Source"
 msgstr ""
 
-#: models.py:152
+#: models.py:166
 msgid "Interactive source"
 msgstr ""
 
-#: models.py:153
+#: models.py:167
 msgid "Interactive sources"
 msgstr ""
 
-#: models.py:176 models.py:620
-msgid "Server side filesystem path."
-msgstr "服务器端文件路径"
-
-#: models.py:177 models.py:621
-msgid "Folder path"
+#: models.py:177
+msgid "Device name as returned by the SANE backend."
 msgstr ""
 
-#: models.py:180
-msgid "Width value to be passed to the converter backend."
-msgstr "宽度的值用于后台转换。"
+#: models.py:178
+msgid "Device name"
+msgstr ""
 
-#: models.py:181
-msgid "Preview width"
+#: models.py:183
+msgid ""
+"Selects the scan mode (e.g., lineart, monochrome, or color). If this option "
+"is not supported by your scanner, leave it blank."
 msgstr ""
 
 #: models.py:185
+msgid "Mode"
+msgstr ""
+
+#: models.py:189
+msgid ""
+"Sets the resolution of the scanned image in DPI (dots per inch). Typical "
+"value is 200. If this option is not supported by your scanner, leave it "
+"blank."
+msgstr ""
+
+#: models.py:192
+msgid "Resolution"
+msgstr ""
+
+#: models.py:197
+msgid ""
+"Selects the scan source (such as a document-feeder). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:200
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Paper source"
+msgstr "Upload sources"
+
+#: models.py:205
+msgid ""
+"Selects the document feeder mode (simplex/duplex). If this option is not "
+"supported by your scanner, leave it blank."
+msgstr ""
+
+#: models.py:207
+msgid "ADF mode"
+msgstr ""
+
+#: models.py:211
+msgid "SANE Scanner"
+msgstr ""
+
+#: models.py:212
+msgid "SANE Scanners"
+msgstr ""
+
+#: models.py:259
+#, python-format
+msgid "Error while scanning; %s"
+msgstr ""
+
+#: models.py:291 models.py:736
+msgid "Server side filesystem path."
+msgstr "服务器端文件路径"
+
+#: models.py:292 models.py:737
+msgid "Folder path"
+msgstr ""
+
+#: models.py:295
+msgid "Width value to be passed to the converter backend."
+msgstr "宽度的值用于后台转换。"
+
+#: models.py:296
+msgid "Preview width"
+msgstr ""
+
+#: models.py:300
 msgid "Height value to be passed to the converter backend."
 msgstr "高度的值用于后台转换"
 
-#: models.py:186
+#: models.py:301
 msgid "Preview height"
 msgstr ""
 
-#: models.py:190 models.py:266
+#: models.py:305 models.py:382
 msgid "Whether to expand or not compressed archives."
 msgstr "是否要展开或者解压缩归档文件"
 
-#: models.py:191 models.py:267 models.py:303
+#: models.py:306 models.py:383 models.py:419
 msgid "Uncompress"
 msgstr ""
 
-#: models.py:196
+#: models.py:311
 msgid "Delete the file after is has been successfully uploaded."
 msgstr "在上传成功后，删除此文件。"
 
-#: models.py:198
+#: models.py:313
 msgid "Delete after upload"
 msgstr ""
 
-#: models.py:222
+#: models.py:337
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "未能获取暂存文件列表：%s"
 
-#: models.py:243
+#: models.py:358
 #, python-format
 msgid "Error deleting staging file; %s"
 msgstr ""
 
-#: models.py:248
+#: models.py:363
 msgid "Staging folders"
 msgstr ""
 
-#: models.py:276
+#: models.py:392
 msgid "Web forms"
 msgstr ""
 
-#: models.py:283 models.py:284
+#: models.py:399 models.py:400
 msgid "Out of process"
 msgstr ""
 
-#: models.py:290
+#: models.py:406
 msgid "Interval in seconds between checks for new documents."
 msgstr ""
 
-#: models.py:291
+#: models.py:407
 msgid "Interval"
 msgstr ""
 
-#: models.py:296
+#: models.py:412
 msgid "Assign a document type to documents uploaded from this source."
 msgstr ""
 
-#: models.py:298
+#: models.py:414
 msgid "Document type"
 msgstr "文档类型"
 
-#: models.py:302
+#: models.py:418
 msgid "Whether to expand or not, compressed archives."
 msgstr ""
 
-#: models.py:352
+#: models.py:468
 msgid "Interval source"
 msgstr ""
 
-#: models.py:353
+#: models.py:469
 msgid "Interval sources"
 msgstr ""
 
-#: models.py:366
+#: models.py:482
 msgid "Host"
 msgstr ""
 
-#: models.py:367
+#: models.py:483
 msgid "SSL"
 msgstr ""
 
-#: models.py:369
+#: models.py:485
 msgid ""
 "Typical choices are 110 for POP3, 995 for POP3 over SSL, 143 for IMAP, 993 "
 "for IMAP over SSL."
 msgstr ""
 
-#: models.py:370
+#: models.py:486
 msgid "Port"
 msgstr ""
 
-#: models.py:372
+#: models.py:488
 msgid "Username"
 msgstr ""
 
-#: models.py:373
+#: models.py:489
 msgid "Password"
 msgstr "密码"
 
-#: models.py:377
+#: models.py:493
 msgid ""
 "Name of the attachment that will contains the metadata type names and value "
 "pairs to be assigned to the rest of the downloaded attachments. Note: This "
 "attachment has to be the first attachment."
 msgstr ""
 
-#: models.py:381
+#: models.py:497
 msgid "Metadata attachment name"
 msgstr ""
 
-#: models.py:385
+#: models.py:501
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's subject."
 msgstr ""
 
-#: models.py:388
+#: models.py:504
 msgid "Subject metadata type"
 msgstr ""
 
-#: models.py:392
+#: models.py:508
 msgid ""
 "Select a metadata type valid for the document type selected in which to "
 "store the email's \"from\" value."
 msgstr ""
 
-#: models.py:395
+#: models.py:511
 msgid "From metadata type"
 msgstr ""
 
-#: models.py:399
+#: models.py:515
 msgid "Store the body of the email as a text document."
 msgstr ""
 
-#: models.py:400
+#: models.py:516
 msgid "Store email body"
 msgstr ""
 
-#: models.py:409
+#: models.py:525
 #, python-format
 msgid ""
 "Subject metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:423
+#: models.py:539
 #, python-format
 msgid ""
 "\"From\" metadata type \"%(metadata_type)s\" is not valid for the document "
 "type: %(document_type)s"
 msgstr ""
 
-#: models.py:473
+#: models.py:589
 #, python-format
 msgid "attachment-%i"
 msgstr ""
 
-#: models.py:512
+#: models.py:628
 msgid "Email source"
 msgstr ""
 
-#: models.py:513
+#: models.py:629
 msgid "Email sources"
 msgstr ""
 
-#: models.py:520
+#: models.py:636
 msgid "Timeout"
 msgstr ""
 
-#: models.py:557 models.py:558
+#: models.py:673 models.py:674
 msgid "POP email"
 msgstr ""
 
-#: models.py:566
+#: models.py:682
 msgid "IMAP Mailbox from which to check for messages."
 msgstr ""
 
-#: models.py:567
+#: models.py:683
 msgid "Mailbox"
 msgstr ""
 
-#: models.py:640
+#: models.py:756
 msgid "Watch folders"
 msgstr ""
 
-#: models.py:657
+#: models.py:773
 msgid "Log entry"
 msgstr ""
 
-#: models.py:658
+#: models.py:774
 msgid "Log entries"
 msgstr ""
 
@@ -410,6 +512,30 @@ msgstr "查看存在数据源"
 msgid "Delete staging files"
 msgstr ""
 
+#: queues.py:11
+#, fuzzy
+#| msgid "Sources setup"
+msgid "Sources periodic"
+msgstr "数据源设置"
+
+#: queues.py:16
+msgid "Check interval source"
+msgstr ""
+
+#: queues.py:21
+msgid "Handle upload"
+msgstr ""
+
+#: queues.py:25
+#, fuzzy
+#| msgid "Upload sources"
+msgid "Upload document"
+msgstr "Upload sources"
+
+#: settings.py:12
+msgid "File path to the scanimage program used to control image scanners."
+msgstr ""
+
 #: tasks.py:31
 #, python-format
 msgid "Error processing source: %s"
@@ -419,73 +545,77 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: views.py:63
+#: views.py:59
 #, python-format
 msgid "Log entries for source: %s"
 msgstr ""
 
-#: views.py:128 wizards.py:52
+#: views.py:107 wizards.py:52
 msgid ""
 "No interactive document sources have been defined or none have been enabled, "
 "create one before proceeding."
 msgstr ""
 
-#: views.py:154 views.py:172
+#: views.py:133 views.py:151 views.py:161
 msgid "Document properties"
 msgstr ""
 
-#: views.py:162
+#: views.py:141
 msgid "Files in staging path"
 msgstr ""
 
-#: views.py:256
+#: views.py:152
+msgid "Scan"
+msgstr ""
+
+#: views.py:251
 msgid "New document queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:302
+#: views.py:300
 #, python-format
 msgid "Upload a local document from source: %s"
 msgstr ""
 
-#: views.py:331
+#: views.py:329
 #, python-format
 msgid "Document \"%s\" is blocked from uploading new versions."
 msgstr ""
 
-#: views.py:380
+#: views.py:381
 msgid "New document version queued for uploaded and will be available shortly."
 msgstr ""
 
-#: views.py:418
+#: views.py:420
 #, python-format
 msgid "Upload a new version from source: %s"
 msgstr ""
 
-#: views.py:458
+#: views.py:460
 #, python-format
 msgid "Trigger check for source \"%s\"?"
 msgstr ""
 
-#: views.py:471
+#: views.py:473
 msgid "Source check queued."
 msgstr ""
 
-#: views.py:485
+#: views.py:487
 #, python-format
 msgid "Create new source of type: %s"
 msgstr "新建数据源类型:%s"
 
-#: views.py:505
+#: views.py:507
 #, python-format
 msgid "Delete the source: %s?"
 msgstr ""
 
-#: views.py:524
+#: views.py:526
 #, python-format
 msgid "Edit source: %s"
 msgstr ""
 
-#: views.py:532
+#: views.py:534
 msgid "Type"
 msgstr ""
 
@@ -613,9 +743,6 @@ msgstr ""
 #~ msgid "Create new transformation for source: %s"
 #~ msgstr "Create new transformation for source: %s"
 
-#~ msgid "Upload sources"
-#~ msgstr "Upload sources"
-
 #~ msgid "Server staging folder"
 #~ msgstr "server staging folder"
 
diff --git a/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.mo
index 002384af0b..9b011acef8 100644
Binary files a/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.po
index 0b59ee5ba8..3b5ecd70e7 100644
--- a/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "إحصائيات"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -72,6 +72,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.mo
index 261fa5606c..a0d3cf8e3e 100644
Binary files a/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.po
index 976c54eb0b..5aff59568e 100644
--- a/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Статистика"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -71,6 +71,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.mo
index 816b0972bc..8cbbc72be8 100644
Binary files a/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.po
index e500feca6b..b7f44eab2f 100644
--- a/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistika"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -72,6 +72,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/da/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/da/LC_MESSAGES/django.mo
index 50943f7208..633085636f 100644
Binary files a/mayan/apps/statistics/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/da/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/da/LC_MESSAGES/django.po
index af7640b312..7238e39b4d 100644
--- a/mayan/apps/statistics/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistik"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -71,6 +71,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.mo
index 83e6929390..c4b0b177fa 100644
Binary files a/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.po
index b8e94d83f0..92adf9a63f 100644
--- a/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -21,13 +21,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistiken"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Plan"
 
@@ -73,6 +73,12 @@ msgstr "Statistik Ergebnisse"
 msgid "View statistics"
 msgstr "Statsitiken anzeigen."
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Statsitiken anzeigen."
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Noch keine Daten vorhanden"
diff --git a/mayan/apps/statistics/locale/en/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/en/LC_MESSAGES/django.mo
index a7fd5097ee..a29869aedc 100644
Binary files a/mayan/apps/statistics/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/en/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/en/LC_MESSAGES/django.po
index 6b271224e9..66ef00739b 100644
--- a/mayan/apps/statistics/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr ""
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -69,6 +69,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/es/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/es/LC_MESSAGES/django.mo
index a0f356aa4c..4054f0cb96 100644
Binary files a/mayan/apps/statistics/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/es/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/es/LC_MESSAGES/django.po
index 651b91dca3..2fa56595d0 100644
--- a/mayan/apps/statistics/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/es/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:23+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,13 +21,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Estadísticas"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Programa"
 
@@ -73,6 +73,12 @@ msgstr "Resultados de estadísticas"
 msgid "View statistics"
 msgstr "Ver estadísticas"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Ver estadísticas"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "No hay datos disponibles aún."
diff --git a/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.mo
index 6f3f4b7226..bf7f587497 100644
Binary files a/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.po
index 209101fe81..087007b28e 100644
--- a/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "آمار"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -72,6 +72,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.mo
index e0b7009eb3..351378a69d 100644
Binary files a/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.po
index 878f66e726..dc7cdf5c4c 100644
--- a/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Thierry Schott <DarkDare@users.noreply.github.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistiques"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Planification"
 
@@ -72,6 +72,12 @@ msgstr "Résultats des statistiques"
 msgid "View statistics"
 msgstr "Afficher les statistiques"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Afficher les statistiques"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Pas de données disponibles"
diff --git a/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.mo
index e4d45026ac..1fa7d3c366 100644
Binary files a/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.po
index 6cbc819102..68e5fec87e 100644
--- a/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statisztika"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -71,6 +71,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/id/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/id/LC_MESSAGES/django.mo
index b92d57313d..75bf522a60 100644
Binary files a/mayan/apps/statistics/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/id/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/id/LC_MESSAGES/django.po
index 24983de4f2..57ad40783c 100644
--- a/mayan/apps/statistics/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistik-statistik"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -71,6 +71,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/it/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/it/LC_MESSAGES/django.mo
index f5a3f8617c..465daa292f 100644
Binary files a/mayan/apps/statistics/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/it/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/it/LC_MESSAGES/django.po
index f8fba15512..e6cb815cdd 100644
--- a/mayan/apps/statistics/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-09-24 10:01+0000\n"
 "Last-Translator: Marco Camplese <marco.camplese.mc@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistiche "
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Programma "
 
@@ -72,6 +72,12 @@ msgstr "Risultati statistiche "
 msgid "View statistics"
 msgstr "Vedi statistiche "
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Vedi statistiche "
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Nessun dato ancora disponibile "
diff --git a/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.mo
index 43b8a9e5db..4b5c4263fb 100644
Binary files a/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.po
index f66207cf4b..8ac2787df8 100644
--- a/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-11-09 16:41+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistiek"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Schema"
 
@@ -72,6 +72,12 @@ msgstr ""
 msgid "View statistics"
 msgstr "Bekijk statistieken"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Bekijk statistieken"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Nog geen gegevens beschikbaar"
diff --git a/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.mo
index 8e3dd6b395..51541b2388 100644
Binary files a/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.po
index 98fd6ba05a..99575e5450 100644
--- a/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Wojtek Warczakowski <w.warczakowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statystyki"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Harmonogram"
 
@@ -72,6 +72,12 @@ msgstr "Wyniki statystyk"
 msgid "View statistics"
 msgstr "Przegląd statystyk"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Przegląd statystyk"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Brak danych"
diff --git a/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.mo
index 8eea4c3775..051c280b32 100644
Binary files a/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.po
index e2ace3b902..fda552058b 100644
--- a/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Manuela Silva <inactive+h_manuela_rodsilva@transifex.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Estatísticas"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Agenda"
 
@@ -71,6 +71,12 @@ msgstr "Resultados da estatística"
 msgid "View statistics"
 msgstr "Ver estatísticas"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Ver estatísticas"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Ainda sem dados disponíveis"
diff --git a/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.mo
index efe824526f..23ec45416f 100644
Binary files a/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.po
index b0421e0154..936673da06 100644
--- a/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-11-17 23:07+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Estatísticas"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Programação"
 
@@ -72,6 +72,12 @@ msgstr "Resultados das estatísticas"
 msgid "View statistics"
 msgstr "Visualizar estatísticas"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Visualizar estatísticas"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Não há dados disponíveis ainda"
diff --git a/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.mo
index 4638fef926..9e57875c87 100644
Binary files a/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.po
index 2499b96ff4..c02d9e179e 100644
--- a/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-04-17 12:06+0000\n"
 "Last-Translator: Stefaniu Criste <gupi@hangar.ro>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -21,13 +21,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Statistică"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -73,6 +73,12 @@ msgstr ""
 msgid "View statistics"
 msgstr "Afișare statistici"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Afișare statistici"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Nu sunt disponibile încă"
diff --git a/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.mo
index ef6e10387b..3f38e6e596 100644
Binary files a/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.po
index 3b80cb1519..40dd3aad32 100644
--- a/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-07-19 20:06+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,13 +22,13 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Статистика"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr "Запланировать"
 
@@ -74,6 +74,12 @@ msgstr ""
 msgid "View statistics"
 msgstr "Просмотр статистики"
 
+#: queues.py:13
+#, fuzzy
+#| msgid "View statistics"
+msgid "Execute statistic"
+msgstr "Просмотр статистики"
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr "Данные пока недоступны"
diff --git a/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.mo
index 46a621b0c0..980913b752 100644
Binary files a/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.po
index 1c107bdfdc..14e49e68b2 100644
--- a/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-09-24 05:16+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr ""
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -71,6 +71,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.mo
index 14e79835e9..a777d7bae6 100644
Binary files a/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.po
index e422777387..3d2fefb87f 100644
--- a/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "Thống kê"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -71,6 +71,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.mo
index d12bbce2ef..76480dcbe5 100644
Binary files a/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.po
index 61e68577ad..69f0d08a7b 100644
--- a/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:24 links.py:28 permissions.py:7
+#: apps.py:25 links.py:28 permissions.py:7 queues.py:8
 msgid "Statistics"
 msgstr "统计"
 
 #. Translators: Schedule here is a verb, the 'schedule' at which the
 #. statistic will be updated
-#: apps.py:33
+#: apps.py:34
 msgid "Schedule"
 msgstr ""
 
@@ -71,6 +71,10 @@ msgstr ""
 msgid "View statistics"
 msgstr ""
 
+#: queues.py:13
+msgid "Execute statistic"
+msgstr ""
+
 #: templates/statistics/backends/chartjs/line.html:19
 msgid "No data available yet"
 msgstr ""
diff --git a/mayan/apps/storage/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/ar/LC_MESSAGES/django.mo
index 4786513f80..290d929d9d 100644
Binary files a/mayan/apps/storage/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/ar/LC_MESSAGES/django.po b/mayan/apps/storage/locale/ar/LC_MESSAGES/django.po
index f905811945..709e8d9252 100644
--- a/mayan/apps/storage/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/ar/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/storage/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/bg/LC_MESSAGES/django.mo
index e9da8c3eeb..3f669fdc1c 100644
Binary files a/mayan/apps/storage/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/bg/LC_MESSAGES/django.po b/mayan/apps/storage/locale/bg/LC_MESSAGES/django.po
index e12388e5d6..eb14a1886d 100644
--- a/mayan/apps/storage/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.mo
index 9eaaec813e..efc5f78146 100644
Binary files a/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.po
index c3c2043e26..65777fa5e9 100644
--- a/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/bs_BA/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/storage/locale/da/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/da/LC_MESSAGES/django.mo
index 33be68b8f1..516c0c6c1e 100644
Binary files a/mayan/apps/storage/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/da/LC_MESSAGES/django.po b/mayan/apps/storage/locale/da/LC_MESSAGES/django.po
index 388f8b1d53..7c827d053e 100644
--- a/mayan/apps/storage/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.mo
index 55a8358627..c972fd55e5 100644
Binary files a/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.po
index 13cf6d2a41..5abe56d539 100644
--- a/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/storage/locale/en/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/en/LC_MESSAGES/django.mo
index a7fd5097ee..a29869aedc 100644
Binary files a/mayan/apps/storage/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/en/LC_MESSAGES/django.po b/mayan/apps/storage/locale/en/LC_MESSAGES/django.po
index 02046ea64f..e2e1435297 100644
--- a/mayan/apps/storage/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/mayan/apps/storage/locale/es/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/es/LC_MESSAGES/django.mo
index 2f48b879e2..08f43fa6b1 100644
Binary files a/mayan/apps/storage/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/es/LC_MESSAGES/django.po b/mayan/apps/storage/locale/es/LC_MESSAGES/django.po
index 8e2c1aa860..5bc5d0d33c 100644
--- a/mayan/apps/storage/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/fa/LC_MESSAGES/django.mo
index 95532da33f..2c49119a8f 100644
Binary files a/mayan/apps/storage/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/fa/LC_MESSAGES/django.po b/mayan/apps/storage/locale/fa/LC_MESSAGES/django.po
index 34320d931e..fe63f28e18 100644
--- a/mayan/apps/storage/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/fr/LC_MESSAGES/django.mo
index 952f058897..f2e65f6f3e 100644
Binary files a/mayan/apps/storage/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/fr/LC_MESSAGES/django.po b/mayan/apps/storage/locale/fr/LC_MESSAGES/django.po
index 9cc881bdf2..c94989ec16 100644
--- a/mayan/apps/storage/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Christophe CHAUVET <christophe.chauvet@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/storage/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/hu/LC_MESSAGES/django.mo
index 8121ee93ea..c5f90549da 100644
Binary files a/mayan/apps/storage/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/hu/LC_MESSAGES/django.po b/mayan/apps/storage/locale/hu/LC_MESSAGES/django.po
index 1d85a660d7..5ef1178e2d 100644
--- a/mayan/apps/storage/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/id/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/id/LC_MESSAGES/django.mo
index 80cc3ae06d..c2e2cf68b9 100644
Binary files a/mayan/apps/storage/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/id/LC_MESSAGES/django.po b/mayan/apps/storage/locale/id/LC_MESSAGES/django.po
index 019c3d2133..4ae9348cd0 100644
--- a/mayan/apps/storage/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/it/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/it/LC_MESSAGES/django.mo
index 2707c70272..4e4cfefcc4 100644
Binary files a/mayan/apps/storage/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/it/LC_MESSAGES/django.po b/mayan/apps/storage/locale/it/LC_MESSAGES/django.po
index 5dd337ac26..8279d00014 100644
--- a/mayan/apps/storage/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Giovanni Tricarico <gtricarico92@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.mo
index 9e19fb61f3..ba4fe6a821 100644
Binary files a/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.po
index 1ed2707fdc..97b7a5b2e1 100644
--- a/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-10-28 09:41+0000\n"
 "Last-Translator: Evelijn Saaltink <evelijnsaaltink@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/storage/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/pl/LC_MESSAGES/django.mo
index 206eea8bd0..b1f918366a 100644
Binary files a/mayan/apps/storage/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/pl/LC_MESSAGES/django.po b/mayan/apps/storage/locale/pl/LC_MESSAGES/django.po
index 7a76fb3796..f54f01ab93 100644
--- a/mayan/apps/storage/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/pl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-08-04 09:32+0000\n"
 "Last-Translator: Daniel Winiarski <daniel.winiarski.dw@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/storage/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/pt/LC_MESSAGES/django.mo
index 50fb74d2ae..11e7fd3c1e 100644
Binary files a/mayan/apps/storage/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/pt/LC_MESSAGES/django.po b/mayan/apps/storage/locale/pt/LC_MESSAGES/django.po
index f3cce06404..668f8d7fe2 100644
--- a/mayan/apps/storage/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-03-21 21:10+0000\n"
 "Last-Translator: Manuela Silva <inactive+h_manuela_rodsilva@transifex.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.mo
index c0263783dd..c2c270ba0f 100644
Binary files a/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.po
index b7ee218736..a3d44977f7 100644
--- a/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-11-04 19:03+0000\n"
 "Last-Translator: Aline Freitas <aline@alinefreitas.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.mo
index f536748367..8ad5b00d4b 100644
Binary files a/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.po
index e6536e0d88..d2635e40a0 100644
--- a/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-04-17 09:42+0000\n"
 "Last-Translator: Stefaniu Criste <gupi@hangar.ro>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/storage/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/ru/LC_MESSAGES/django.mo
index 21f3e4dac7..1d88743fe6 100644
Binary files a/mayan/apps/storage/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/ru/LC_MESSAGES/django.po b/mayan/apps/storage/locale/ru/LC_MESSAGES/django.po
index fefa08ed69..e04297d5ef 100644
--- a/mayan/apps/storage/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2016-07-14 01:15+0000\n"
 "Last-Translator: lilo.panic\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.mo
index e5a3441993..db6c465752 100644
Binary files a/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.po
index 9244484173..1d2450264a 100644
--- a/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/sl_SI/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.mo
index 229223cb17..599e0cfd97 100644
Binary files a/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.po
index 292d94ed7e..f114e81f8c 100644
--- a/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/vi_VN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.mo
index fb39674e97..caf8f296a8 100644
Binary files a/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.po
index 101968558c..8f2e0d6a75 100644
--- a/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/storage/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2015-08-20 19:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/tags/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/ar/LC_MESSAGES/django.mo
index 9bcd99fa43..20bf30699f 100644
Binary files a/mayan/apps/tags/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/ar/LC_MESSAGES/django.po b/mayan/apps/tags/locale/ar/LC_MESSAGES/django.po
index 3cc67a866a..f74bfbe64c 100644
--- a/mayan/apps/tags/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -21,16 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "الكلمات الاستدلالية"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "الوثائق"
 
@@ -62,11 +62,11 @@ msgstr "تحرير"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "اللون"
 
diff --git a/mayan/apps/tags/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/bg/LC_MESSAGES/django.mo
index 041d8f8ca2..5547053aba 100644
Binary files a/mayan/apps/tags/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/bg/LC_MESSAGES/django.po b/mayan/apps/tags/locale/bg/LC_MESSAGES/django.po
index 8717d4248c..e130f661e4 100644
--- a/mayan/apps/tags/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,16 +20,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Етикети"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Документи"
 
@@ -61,11 +61,11 @@ msgstr "Редактиране"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Цвят"
 
diff --git a/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.mo
index a50c0be027..0911b3033a 100644
Binary files a/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.po
index 2d27887abb..c10b67ea66 100644
--- a/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
@@ -21,16 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Tagovi"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Dokumenti"
 
@@ -62,11 +62,11 @@ msgstr "Urediti"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Boja"
 
diff --git a/mayan/apps/tags/locale/da/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/da/LC_MESSAGES/django.mo
index 3cdea872f5..506e755734 100644
Binary files a/mayan/apps/tags/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/da/LC_MESSAGES/django.po b/mayan/apps/tags/locale/da/LC_MESSAGES/django.po
index 8338aa2ce5..1647bafbdc 100644
--- a/mayan/apps/tags/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -20,16 +20,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Tags"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Dokumenter"
 
@@ -61,11 +61,11 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Farve"
 
diff --git a/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.mo
index f5f43e7f71..f8526b9299 100644
Binary files a/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po
index d6b3bd252d..aef31d6fc7 100644
--- a/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
@@ -21,16 +21,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Tags"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Vorschau"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Dokumente"
 
@@ -62,11 +62,11 @@ msgstr "Bearbeiten"
 msgid "All"
 msgstr "Alle"
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Text"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Farbe"
 
diff --git a/mayan/apps/tags/locale/en/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/en/LC_MESSAGES/django.mo
index 6ec6134d2a..d5da0c1bcf 100644
Binary files a/mayan/apps/tags/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/en/LC_MESSAGES/django.po b/mayan/apps/tags/locale/en/LC_MESSAGES/django.po
index 77e54c99a1..6d35568deb 100644
--- a/mayan/apps/tags/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2012-12-12 06:07+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Tags"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 #, fuzzy
 msgid "Preview"
 msgstr "preview"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 #, fuzzy
 msgid "Documents"
 msgstr "document"
@@ -67,11 +67,11 @@ msgstr "Edit tags"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Color"
 
diff --git a/mayan/apps/tags/locale/es/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/es/LC_MESSAGES/django.mo
index d8ba7adcc2..6fd11c0f9f 100644
Binary files a/mayan/apps/tags/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/es/LC_MESSAGES/django.po b/mayan/apps/tags/locale/es/LC_MESSAGES/django.po
index 2e0ef3be57..865366ed50 100644
--- a/mayan/apps/tags/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:38+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,16 +22,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Presentación preliminar"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Documentos"
 
@@ -63,11 +63,11 @@ msgstr "Editar"
 msgid "All"
 msgstr "Todos"
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Etiqueta"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Color"
 
diff --git a/mayan/apps/tags/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/fa/LC_MESSAGES/django.mo
index a8bb5d87b9..94cfb9992b 100644
Binary files a/mayan/apps/tags/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/fa/LC_MESSAGES/django.po b/mayan/apps/tags/locale/fa/LC_MESSAGES/django.po
index a3ea517f45..d2a05bc0f0 100644
--- a/mayan/apps/tags/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -20,16 +20,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "برچسبها"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "پیش دید ویا دیدن"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "اسناد"
 
@@ -61,11 +61,11 @@ msgstr "ویرایش"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "برچسب"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "رنگ"
 
diff --git a/mayan/apps/tags/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/fr/LC_MESSAGES/django.mo
index d0bad6224b..0820d851be 100644
Binary files a/mayan/apps/tags/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/fr/LC_MESSAGES/django.po b/mayan/apps/tags/locale/fr/LC_MESSAGES/django.po
index 7408881231..4e07726a5c 100644
--- a/mayan/apps/tags/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/fr/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -23,16 +23,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Etiquettes"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Prévisualiser"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Documents"
 
@@ -64,11 +64,11 @@ msgstr "Modifier"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Étiquette"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Couleur"
 
diff --git a/mayan/apps/tags/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/hu/LC_MESSAGES/django.mo
index cc5002bbb6..5acb098b63 100644
Binary files a/mayan/apps/tags/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/hu/LC_MESSAGES/django.po b/mayan/apps/tags/locale/hu/LC_MESSAGES/django.po
index fec25d2cd1..ef39241971 100644
--- a/mayan/apps/tags/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,16 +19,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Címkék"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "dokumentumok"
 
@@ -60,11 +60,11 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr ""
 
diff --git a/mayan/apps/tags/locale/id/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/id/LC_MESSAGES/django.mo
index e33e45dd5a..7d2285688b 100644
Binary files a/mayan/apps/tags/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/id/LC_MESSAGES/django.po b/mayan/apps/tags/locale/id/LC_MESSAGES/django.po
index 57b7d3fd1d..1f2928b1a0 100644
--- a/mayan/apps/tags/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -19,16 +19,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr ""
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Dokumen"
 
@@ -60,11 +60,11 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr ""
 
diff --git a/mayan/apps/tags/locale/it/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/it/LC_MESSAGES/django.mo
index 831c479329..d1b12ed300 100644
Binary files a/mayan/apps/tags/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/it/LC_MESSAGES/django.po b/mayan/apps/tags/locale/it/LC_MESSAGES/django.po
index b5d418550e..2332d39302 100644
--- a/mayan/apps/tags/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/it/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -23,16 +23,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Etichette"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Anteprima "
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Documenti"
 
@@ -64,11 +64,11 @@ msgstr "Modifica"
 msgid "All"
 msgstr "Tutti"
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Etichetta"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Colori"
 
diff --git a/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.mo
index 86b0c62ba6..662b1c418f 100644
Binary files a/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.po
index 3fe713650f..2b730466f0 100644
--- a/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/nl_NL/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
@@ -20,16 +20,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Labels"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Preview"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Documenten"
 
@@ -61,11 +61,11 @@ msgstr "bewerken"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Label"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Kleur"
 
diff --git a/mayan/apps/tags/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/pl/LC_MESSAGES/django.mo
index 77804a2562..68d2ec12f7 100644
Binary files a/mayan/apps/tags/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/pl/LC_MESSAGES/django.po b/mayan/apps/tags/locale/pl/LC_MESSAGES/django.po
index fcf050d610..f7817fc827 100644
--- a/mayan/apps/tags/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/pl/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
@@ -24,16 +24,16 @@ msgstr ""
 "%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Tagi"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Podgląd"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Dokumenty"
 
@@ -65,11 +65,11 @@ msgstr "Edytuj"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Etykieta"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Kolor"
 
diff --git a/mayan/apps/tags/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/pt/LC_MESSAGES/django.mo
index 3d7f564fbd..2c6e192ad5 100644
Binary files a/mayan/apps/tags/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/pt/LC_MESSAGES/django.po b/mayan/apps/tags/locale/pt/LC_MESSAGES/django.po
index cfa632d663..ea2432f341 100644
--- a/mayan/apps/tags/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,16 +22,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Documentos"
 
@@ -63,11 +63,11 @@ msgstr "Editar"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Nome"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Cor"
 
diff --git a/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.mo
index ecf8158e3e..2dbfc23a13 100644
Binary files a/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.po
index e84fcdc01f..03a2293cf3 100644
--- a/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/pt_BR/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
@@ -23,16 +23,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Visualizar"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Documentos"
 
@@ -64,11 +64,11 @@ msgstr "Editar"
 msgid "All"
 msgstr "Todos"
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Label"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Cor"
 
diff --git a/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.mo
index e48537f37a..1535f7e953 100644
Binary files a/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.po
index 03bc4b2b1b..775a2cef18 100644
--- a/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/ro_RO/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
@@ -23,16 +23,16 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Etichete"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Documente"
 
@@ -64,11 +64,11 @@ msgstr "Modifică"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Etichetă"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Culoare"
 
diff --git a/mayan/apps/tags/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/ru/LC_MESSAGES/django.mo
index c7bbd2f8a4..3ff52e9d12 100644
Binary files a/mayan/apps/tags/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/ru/LC_MESSAGES/django.po b/mayan/apps/tags/locale/ru/LC_MESSAGES/django.po
index 69689a79da..4688259437 100644
--- a/mayan/apps/tags/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
@@ -22,16 +22,16 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Метки"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr "Предварительный просмотр"
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Документы"
 
@@ -63,11 +63,11 @@ msgstr "Редактировать"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Надпись"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Цвет"
 
diff --git a/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.mo
index 0b816c99c1..ae6bd37de0 100644
Binary files a/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.po
index 88d34b222d..278c44b536 100644
--- a/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/sl_SI/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
@@ -21,16 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Oznake"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Dokumenti"
 
@@ -62,11 +62,11 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr "Oznaka"
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Barva"
 
diff --git a/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.mo
index ad745f7c98..0400838cbe 100644
Binary files a/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.po
index 53a9d7940a..1793e11a24 100644
--- a/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
@@ -20,16 +20,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "Tags"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "Tài liệu"
 
@@ -61,11 +61,11 @@ msgstr "Sửa"
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "Màu"
 
diff --git a/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.mo
index 6b56c34a11..d47080514c 100644
Binary files a/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.po
index 86d99688fa..f6efe98721 100644
--- a/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/tags/locale/zh_CN/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:33+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"
@@ -21,16 +21,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: apps.py:34 apps.py:78 apps.py:85 apps.py:104 apps.py:106 forms.py:31
+#: apps.py:35 apps.py:79 apps.py:86 apps.py:105 apps.py:107 forms.py:31
 #: links.py:40 menus.py:8 models.py:34 permissions.py:7 views.py:181
 msgid "Tags"
 msgstr "标签"
 
-#: apps.py:73 apps.py:93
+#: apps.py:74 apps.py:94
 msgid "Preview"
 msgstr ""
 
-#: apps.py:97 models.py:22
+#: apps.py:98 models.py:22
 msgid "Documents"
 msgstr "文档"
 
@@ -62,11 +62,11 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: models.py:18
+#: models.py:18 search.py:16
 msgid "Label"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 search.py:20
 msgid "Color"
 msgstr "颜色"
 
diff --git a/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.mo
index c6625b8013..bef598f72a 100644
Binary files a/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.po
index f5ab660e4f..9cb28c8d1c 100644
--- a/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.mo
index 971c6004c8..daadbbcf91 100644
Binary files a/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.po
index c1fd0c4b89..2f5dff1cd3 100644
--- a/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.mo
index f8dc490c2e..b0666f98ee 100644
Binary files a/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.po
index 5074e20485..ef009a44e9 100644
--- a/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/"
diff --git a/mayan/apps/user_management/locale/da/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/da/LC_MESSAGES/django.mo
index 39672dd9ef..729652d39c 100644
Binary files a/mayan/apps/user_management/locale/da/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/da/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/da/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/da/LC_MESSAGES/django.po
index c1b7dc3f18..a20e7ce254 100644
--- a/mayan/apps/user_management/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.mo
index 2f4440da3a..f2d9340f34 100644
Binary files a/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.po
index 798507971d..8604183003 100644
--- a/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/de_DE/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-24 23:01+0000\n"
 "Last-Translator: Jesaja Everling <jeverling@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/user_management/locale/en/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/en/LC_MESSAGES/django.mo
index 2d23361bc8..0ec83a1cbb 100644
Binary files a/mayan/apps/user_management/locale/en/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/en/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/en/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/en/LC_MESSAGES/django.po
index 1e664c1955..55c38158ad 100644
--- a/mayan/apps/user_management/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2012-12-12 06:07+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/es/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/es/LC_MESSAGES/django.mo
index 854c8d4bd5..cb7a527f04 100644
Binary files a/mayan/apps/user_management/locale/es/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/es/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/es/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/es/LC_MESSAGES/django.po
index 9b060048cb..698d73a5d3 100644
--- a/mayan/apps/user_management/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/es/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-05-28 19:39+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.mo
index 5b5b996ceb..d85a2437b8 100644
Binary files a/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.po
index 92316670c8..a0e38e76a1 100644
--- a/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.mo
index 3f51979102..3b1b2c9cfe 100644
Binary files a/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.po
index db29146015..dce147d00f 100644
--- a/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/fr/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.mo
index 831fd2b26e..ffcd286af4 100644
Binary files a/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.po
index fd246a9808..af93aaf950 100644
--- a/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/id/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/id/LC_MESSAGES/django.mo
index fd1e217410..4de343f411 100644
Binary files a/mayan/apps/user_management/locale/id/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/id/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/id/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/id/LC_MESSAGES/django.po
index 9f9e6b2ac6..61f4cfca73 100644
--- a/mayan/apps/user_management/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/it/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/it/LC_MESSAGES/django.mo
index 2af26d9d78..082a127102 100644
Binary files a/mayan/apps/user_management/locale/it/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/it/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/it/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/it/LC_MESSAGES/django.po
index 29d4734aa2..66826d3415 100644
--- a/mayan/apps/user_management/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/it/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.mo
index 47673fa76d..0073b0a604 100644
Binary files a/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.po
index ca5d5efa22..9374f082e5 100644
--- a/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.mo
index 0bc19ec6f2..dbe44b6930 100644
Binary files a/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.po
index 045bbb9a3f..a21c2a3710 100644
--- a/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/pl/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/"
diff --git a/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.mo
index 4456382979..06fa08ad40 100644
Binary files a/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.po
index c0bb03dde4..c0f16c3666 100644
--- a/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/pt/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.mo
index 736a798909..fa4769559d 100644
Binary files a/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.po
index a67937985f..02cf2ebe09 100644
--- a/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/pt_BR/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.mo
index 02bcf127d6..e675a7c737 100644
Binary files a/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.po
index 7ded3dde00..1a2b599e0d 100644
--- a/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/ro_RO/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Stefaniu Criste <gupi@hangar.ro>\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.mo
index fb76306b9f..e67640a04b 100644
Binary files a/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.po
index fa8c639721..a2a76dfca3 100644
--- a/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/"
diff --git a/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.mo
index 70f42d42be..0126b54433 100644
Binary files a/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.po
index e5ac988b44..363ca3d256 100644
--- a/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-"
diff --git a/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.mo
index fbf6dc4fe2..b1b0bb0c1e 100644
Binary files a/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.po
index 57193dbedb..1bce389d61 100644
--- a/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/vi_VN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/"
diff --git a/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.mo
index 30d0c122d9..49b6c92f84 100644
Binary files a/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.mo and b/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.po
index abe8d14c45..095d8c1561 100644
--- a/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/user_management/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 15:51-0400\n"
+"POT-Creation-Date: 2017-06-23 01:40-0400\n"
 "PO-Revision-Date: 2017-04-21 16:27+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rosarior/mayan-edms/"