diff --git a/.tx/config b/.tx/config
index aadf05cd77..cbd85fb879 100644
--- a/.tx/config
+++ b/.tx/config
@@ -120,12 +120,12 @@ trans.es = apps/project_tools/locale/es/LC_MESSAGES/django.po
 trans.pt = apps/project_tools/locale/pt/LC_MESSAGES/django.po
 trans.ru = apps/project_tools/locale/ru/LC_MESSAGES/django.po
 
-[mayan-edms.apps-grouping]
-source_file = apps/grouping/locale/en/LC_MESSAGES/django.po
+[mayan-edms.apps-linking]
+source_file = apps/linking/locale/en/LC_MESSAGES/django.po
 source_lang = en
-trans.es = apps/grouping/locale/es/LC_MESSAGES/django.po
-trans.pt = apps/grouping/locale/pt/LC_MESSAGES/django.po
-trans.ru = apps/grouping/locale/ru/LC_MESSAGES/django.po
+trans.es = apps/linking/locale/es/LC_MESSAGES/django.po
+trans.pt = apps/linking/locale/pt/LC_MESSAGES/django.po
+trans.ru = apps/linking/locale/ru/LC_MESSAGES/django.po
 
 [mayan-edms.apps-document_comments]
 source_file = apps/document_comments/locale/en/LC_MESSAGES/django.po
diff --git a/apps/common/locale/en/LC_MESSAGES/django.po b/apps/common/locale/en/LC_MESSAGES/django.po
index 573d3f94f8..27835f371b 100644
--- a/apps/common/locale/en/LC_MESSAGES/django.po
+++ b/apps/common/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: 2011-09-30 00:54-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -99,67 +99,67 @@ msgstr ""
 msgid "Landscape"
 msgstr ""
 
-#: utils.py:289
+#: utils.py:291
 msgid "function found"
 msgstr ""
 
-#: utils.py:291 utils.py:293
+#: utils.py:293 utils.py:295
 #, python-format
 msgid "class found: %s"
 msgstr ""
 
-#: views.py:23 templates/password_change_done.html:5
+#: views.py:24 templates/password_change_done.html:5
 msgid "Your password has been successfully changed."
 msgstr ""
 
-#: views.py:39
+#: views.py:41
 msgid "No action selected."
 msgstr ""
 
-#: views.py:43
+#: views.py:45
 msgid "Must select at least one item."
 msgstr ""
 
-#: views.py:76
+#: views.py:86
 #, python-format
 msgid "%(selection)s added successfully added to %(right_list_title)s."
 msgstr ""
 
-#: views.py:79 views.py:96
+#: views.py:89 views.py:106
 #, python-format
 msgid "Unable to add %(selection)s to %(right_list_title)s."
 msgstr ""
 
-#: views.py:93
+#: views.py:103
 #, python-format
 msgid "%(selection)s added successfully removed from %(right_list_title)s."
 msgstr ""
 
-#: views.py:111
+#: views.py:121
 msgid "Add"
 msgstr ""
 
-#: views.py:122
+#: views.py:132
 msgid "Remove"
 msgstr ""
 
-#: views.py:145
+#: views.py:155
 msgid "current user details"
 msgstr ""
 
-#: views.py:162
+#: views.py:172
 msgid "Current user's details updated."
 msgstr ""
 
-#: views.py:171
+#: views.py:181
 msgid "edit current user details"
 msgstr ""
 
-#: views.py:197
+#: views.py:207
 msgid "Changelog"
 msgstr ""
 
-#: views.py:210
+#: views.py:220
 msgid "License"
 msgstr ""
 
@@ -237,25 +237,25 @@ msgstr ""
 msgid "Confirm delete"
 msgstr ""
 
-#: templates/generic_confirm.html:28
+#: templates/generic_confirm.html:32
 msgid "form icon"
 msgstr ""
 
-#: templates/generic_confirm.html:36
+#: templates/generic_confirm.html:40
 #, python-format
 msgid "Are you sure you wish to delete %(object_name)s: %(object)s?"
 msgstr ""
 
-#: templates/generic_confirm.html:38
+#: templates/generic_confirm.html:42
 #, python-format
 msgid "Are you sure you wish to delete: %(object)s?"
 msgstr ""
 
-#: templates/generic_confirm.html:46
+#: templates/generic_confirm.html:50
 msgid "Yes"
 msgstr ""
 
-#: templates/generic_confirm.html:50
+#: templates/generic_confirm.html:54
 msgid "No"
 msgstr ""
 
@@ -268,8 +268,8 @@ msgstr ""
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Save"
 msgstr ""
 
@@ -277,22 +277,18 @@ msgstr ""
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Submit"
 msgstr ""
 
-#: templates/generic_form_subtemplate.html:82
-msgid "Cancel"
-msgstr ""
-
 #: templates/generic_list.html:6 templates/generic_list_horizontal.html:6
 #, python-format
 msgid "List of %(stripped_title)s"
 msgstr ""
 
 #: templates/generic_list_horizontal_subtemplate.html:23
-#: templates/generic_list_subtemplate.html:23
+#: templates/generic_list_subtemplate.html:24
 #, python-format
 msgid ""
 "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page "
@@ -300,18 +296,16 @@ msgid ""
 msgstr ""
 
 #: templates/generic_list_horizontal_subtemplate.html:25
-#: templates/generic_list_subtemplate.html:25
+#: templates/generic_list_subtemplate.html:26
 #, python-format
 msgid "List of %(title)s (%(total)s)"
 msgstr ""
 
-#: templates/generic_list_horizontal_subtemplate.html:72
-#: templates/generic_list_subtemplate.html:71
+#: templates/generic_list_subtemplate.html:72
 msgid "Identifier"
 msgstr ""
 
-#: templates/generic_list_horizontal_subtemplate.html:146
-#: templates/generic_list_subtemplate.html:145
+#: templates/generic_list_subtemplate.html:152
 #, python-format
 msgid "There are no %(stripped_title)s"
 msgstr ""
diff --git a/apps/common/locale/es/LC_MESSAGES/django.po b/apps/common/locale/es/LC_MESSAGES/django.po
index 8a29fb29a4..d4ccd9dd69 100644
--- a/apps/common/locale/es/LC_MESSAGES/django.po
+++ b/apps/common/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-30 00:54-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 00:58+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:17
@@ -103,67 +104,67 @@ msgstr "Retrato"
 msgid "Landscape"
 msgstr "Paisaje"
 
-#: utils.py:289
+#: utils.py:291
 msgid "function found"
 msgstr "función encontrada"
 
-#: utils.py:291 utils.py:293
+#: utils.py:293 utils.py:295
 #, python-format
 msgid "class found: %s"
 msgstr "clase encontrada: %s"
 
-#: views.py:23 templates/password_change_done.html:5
+#: views.py:24 templates/password_change_done.html:5
 msgid "Your password has been successfully changed."
 msgstr "Su contraseña se ha modificado correctamente."
 
-#: views.py:39
+#: views.py:41
 msgid "No action selected."
 msgstr "Ninguna acción seleccionada."
 
-#: views.py:43
+#: views.py:45
 msgid "Must select at least one item."
 msgstr "Debe seleccionar al menos un artículo."
 
-#: views.py:76
+#: views.py:86
 #, python-format
 msgid "%(selection)s added successfully added to %(right_list_title)s."
 msgstr "Se agrego exitosamente %(selection)s a %(right_list_title)s."
 
-#: views.py:79 views.py:96
+#: views.py:89 views.py:106
 #, python-format
 msgid "Unable to add %(selection)s to %(right_list_title)s."
 msgstr "No se puede agregar %(selection)s a %(right_list_title)s."
 
-#: views.py:93
+#: views.py:103
 #, python-format
 msgid "%(selection)s added successfully removed from %(right_list_title)s."
 msgstr "Se removió exitosamente %(selection)s de %(right_list_title)s."
 
-#: views.py:111
+#: views.py:121
 msgid "Add"
 msgstr "Agregar"
 
-#: views.py:122
+#: views.py:132
 msgid "Remove"
 msgstr "Remover"
 
-#: views.py:145
+#: views.py:155
 msgid "current user details"
 msgstr "detalles del usuario corriente"
 
-#: views.py:162
+#: views.py:172
 msgid "Current user's details updated."
 msgstr "Datos del usuario corriente actualizados."
 
-#: views.py:171
+#: views.py:181
 msgid "edit current user details"
 msgstr "editar detalles del usuario corriente"
 
-#: views.py:197
+#: views.py:207
 msgid "Changelog"
 msgstr "Cambios"
 
-#: views.py:210
+#: views.py:220
 msgid "License"
 msgstr "Licencia"
 
@@ -174,8 +175,8 @@ msgstr "Ninguno"
 #: conf/settings.py:15
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
-"temporary files.  If none is specified, one will be created using "
-"tempfile.mkdtemp()"
+"temporary files.  If none is specified, one will be created using tempfile."
+"mkdtemp()"
 msgstr ""
 "Directorio temporal utilizado por todo el sitio para almacenar imágenes en "
 "miniatura, vistas previas y los archivos temporales. Si no se especifica "
@@ -246,25 +247,25 @@ msgstr "Confirmar"
 msgid "Confirm delete"
 msgstr "Confirmar eliminación"
 
-#: templates/generic_confirm.html:28
+#: templates/generic_confirm.html:32
 msgid "form icon"
 msgstr "emblema de la forma"
 
-#: templates/generic_confirm.html:36
+#: templates/generic_confirm.html:40
 #, python-format
 msgid "Are you sure you wish to delete %(object_name)s: %(object)s?"
 msgstr "¿Está seguro que desea eliminar %(object_name)s: %(object)s?"
 
-#: templates/generic_confirm.html:38
+#: templates/generic_confirm.html:42
 #, python-format
 msgid "Are you sure you wish to delete: %(object)s?"
 msgstr "¿Está seguro que desea eliminar: %(object)s?"
 
-#: templates/generic_confirm.html:46
+#: templates/generic_confirm.html:50
 msgid "Yes"
 msgstr "Sí"
 
-#: templates/generic_confirm.html:50
+#: templates/generic_confirm.html:54
 msgid "No"
 msgstr "No"
 
@@ -277,8 +278,8 @@ msgstr "requerido"
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Save"
 msgstr "Guardar"
 
@@ -286,22 +287,18 @@ msgstr "Guardar"
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/generic_form_subtemplate.html:82
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: templates/generic_list.html:6 templates/generic_list_horizontal.html:6
 #, python-format
 msgid "List of %(stripped_title)s"
 msgstr "Lista de %(stripped_title)s "
 
 #: templates/generic_list_horizontal_subtemplate.html:23
-#: templates/generic_list_subtemplate.html:23
+#: templates/generic_list_subtemplate.html:24
 #, python-format
 msgid ""
 "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page "
@@ -311,18 +308,16 @@ msgstr ""
 "%(page_number)s de %(total_pages)s)"
 
 #: templates/generic_list_horizontal_subtemplate.html:25
-#: templates/generic_list_subtemplate.html:25
+#: templates/generic_list_subtemplate.html:26
 #, python-format
 msgid "List of %(title)s (%(total)s)"
 msgstr "Lista de %(title)s (%(total)s)"
 
-#: templates/generic_list_horizontal_subtemplate.html:72
-#: templates/generic_list_subtemplate.html:71
+#: templates/generic_list_subtemplate.html:72
 msgid "Identifier"
 msgstr "Identificador"
 
-#: templates/generic_list_horizontal_subtemplate.html:146
-#: templates/generic_list_subtemplate.html:145
+#: templates/generic_list_subtemplate.html:152
 #, python-format
 msgid "There are no %(stripped_title)s"
 msgstr "No hay %(stripped_title)s "
@@ -336,4 +331,5 @@ msgstr "Iniciar sesión"
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
-
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
diff --git a/apps/common/locale/pt/LC_MESSAGES/django.po b/apps/common/locale/pt/LC_MESSAGES/django.po
index 0c99161e27..d609fa4bc9 100644
--- a/apps/common/locale/pt/LC_MESSAGES/django.po
+++ b/apps/common/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-30 00:54-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 02:18+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:17
@@ -102,68 +103,67 @@ msgstr "Retrato"
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: utils.py:289
+#: utils.py:291
 msgid "function found"
 msgstr "função encontrada"
 
-#: utils.py:291 utils.py:293
+#: utils.py:293 utils.py:295
 #, python-format
 msgid "class found: %s"
 msgstr "classe encontrada: %s"
 
-#: views.py:23 templates/password_change_done.html:5
+#: views.py:24 templates/password_change_done.html:5
 msgid "Your password has been successfully changed."
 msgstr "Sua senha foi alterada com êxito."
 
-#: views.py:39
+#: views.py:41
 msgid "No action selected."
 msgstr "Nenhuma ação selecionada."
 
-#: views.py:43
+#: views.py:45
 msgid "Must select at least one item."
 msgstr "Deve selecionar pelo menos um item."
 
-#: views.py:76
+#: views.py:86
 #, python-format
 msgid "%(selection)s added successfully added to %(right_list_title)s."
 msgstr "%(selection)s adicionadas com sucesso a %(right_list_title)s ."
 
-#: views.py:79 views.py:96
+#: views.py:89 views.py:106
 #, python-format
 msgid "Unable to add %(selection)s to %(right_list_title)s."
 msgstr "Não foi possível adicionar %(selection)s  para %(right_list_title)s ."
 
-#: views.py:93
+#: views.py:103
 #, python-format
 msgid "%(selection)s added successfully removed from %(right_list_title)s."
-msgstr ""
-" %(selection)s  adicionado com sucesso removidos %(right_list_title)s."
+msgstr " %(selection)s  adicionado com sucesso removidos %(right_list_title)s."
 
-#: views.py:111
+#: views.py:121
 msgid "Add"
 msgstr "Adicionar"
 
-#: views.py:122
+#: views.py:132
 msgid "Remove"
 msgstr "Remover"
 
-#: views.py:145
+#: views.py:155
 msgid "current user details"
 msgstr "detalhes atuais do usuário"
 
-#: views.py:162
+#: views.py:172
 msgid "Current user's details updated."
 msgstr "Detalhes do usuário atual atualizados."
 
-#: views.py:171
+#: views.py:181
 msgid "edit current user details"
 msgstr "editar os detalhes do usuário atual"
 
-#: views.py:197
+#: views.py:207
 msgid "Changelog"
 msgstr "Log de alterações"
 
-#: views.py:210
+#: views.py:220
 msgid "License"
 msgstr "Licença"
 
@@ -174,12 +174,12 @@ msgstr "Nenhum"
 #: conf/settings.py:15
 msgid ""
 "Temporary directory used site wide to store thumbnails, previews and "
-"temporary files.  If none is specified, one will be created using "
-"tempfile.mkdtemp()"
+"temporary files.  If none is specified, one will be created using tempfile."
+"mkdtemp()"
 msgstr ""
 "Diretório temporário usado para armazenar miniaturas, previews e arquivos "
-"temporários. Se nenhum for especificado, um será criado usando "
-"tempfile.mkdtemp()"
+"temporários. Se nenhum for especificado, um será criado usando tempfile."
+"mkdtemp()"
 
 #: conf/settings.py:65
 msgid ""
@@ -246,25 +246,25 @@ msgstr "Confirmar"
 msgid "Confirm delete"
 msgstr "Confirmar exclusão"
 
-#: templates/generic_confirm.html:28
+#: templates/generic_confirm.html:32
 msgid "form icon"
 msgstr "ícone de formulário"
 
-#: templates/generic_confirm.html:36
+#: templates/generic_confirm.html:40
 #, python-format
 msgid "Are you sure you wish to delete %(object_name)s: %(object)s?"
 msgstr "Tem certeza de que deseja excluir %(object_name)s: %(object)s ?"
 
-#: templates/generic_confirm.html:38
+#: templates/generic_confirm.html:42
 #, python-format
 msgid "Are you sure you wish to delete: %(object)s?"
 msgstr "Tem certeza de que deseja excluir: %(object)s ?"
 
-#: templates/generic_confirm.html:46
+#: templates/generic_confirm.html:50
 msgid "Yes"
 msgstr "Sim"
 
-#: templates/generic_confirm.html:50
+#: templates/generic_confirm.html:54
 msgid "No"
 msgstr "Não"
 
@@ -277,8 +277,8 @@ msgstr "exigido"
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Save"
 msgstr "Salvar"
 
@@ -286,22 +286,18 @@ msgstr "Salvar"
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/generic_form_subtemplate.html:82
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: templates/generic_list.html:6 templates/generic_list_horizontal.html:6
 #, python-format
 msgid "List of %(stripped_title)s"
 msgstr "Lista de %(stripped_title)s "
 
 #: templates/generic_list_horizontal_subtemplate.html:23
-#: templates/generic_list_subtemplate.html:23
+#: templates/generic_list_subtemplate.html:24
 #, python-format
 msgid ""
 "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page "
@@ -311,18 +307,16 @@ msgstr ""
 "of %(total_pages)s)"
 
 #: templates/generic_list_horizontal_subtemplate.html:25
-#: templates/generic_list_subtemplate.html:25
+#: templates/generic_list_subtemplate.html:26
 #, python-format
 msgid "List of %(title)s (%(total)s)"
 msgstr "Lista de %(title)s  (%(total)s)"
 
-#: templates/generic_list_horizontal_subtemplate.html:72
-#: templates/generic_list_subtemplate.html:71
+#: templates/generic_list_subtemplate.html:72
 msgid "Identifier"
 msgstr "Identificador"
 
-#: templates/generic_list_horizontal_subtemplate.html:146
-#: templates/generic_list_subtemplate.html:145
+#: templates/generic_list_subtemplate.html:152
 #, python-format
 msgid "There are no %(stripped_title)s"
 msgstr "Não há %(stripped_title)s "
@@ -336,4 +330,5 @@ msgstr "Login"
 msgid "Password change"
 msgstr "Alterar a senha"
 
-
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
diff --git a/apps/common/locale/ru/LC_MESSAGES/django.mo b/apps/common/locale/ru/LC_MESSAGES/django.mo
index 629768c6e2..a8f3d3b9e8 100644
Binary files a/apps/common/locale/ru/LC_MESSAGES/django.mo and b/apps/common/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/common/locale/ru/LC_MESSAGES/django.po b/apps/common/locale/ru/LC_MESSAGES/django.po
index bd88c39b9c..44c11d8f5c 100644
--- a/apps/common/locale/ru/LC_MESSAGES/django.po
+++ b/apps/common/locale/ru/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-30 00:54-0400\n"
-"PO-Revision-Date: 2011-11-04 10:27+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 19:21+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "изменение сведений"
 
 #: __init__.py:23 __init__.py:29
 msgid "about"
-msgstr "о"
+msgstr "инфо"
 
 #: __init__.py:24
 msgid "changelog"
@@ -102,67 +102,67 @@ msgstr "Портрет"
 msgid "Landscape"
 msgstr "Пейзаж"
 
-#: utils.py:289
+#: utils.py:291
 msgid "function found"
-msgstr "Функция найдены"
+msgstr "функция найдена"
 
-#: utils.py:291 utils.py:293
+#: utils.py:293 utils.py:295
 #, python-format
 msgid "class found: %s"
-msgstr "Класс найден: %s."
+msgstr "класс найден: %s."
 
-#: views.py:23 templates/password_change_done.html:5
+#: views.py:24 templates/password_change_done.html:5
 msgid "Your password has been successfully changed."
-msgstr "Ваш пароль был успешно изменен."
+msgstr "Ваш пароль был изменен."
 
-#: views.py:39
+#: views.py:41
 msgid "No action selected."
 msgstr "Никаких действий не выбрано."
 
-#: views.py:43
+#: views.py:45
 msgid "Must select at least one item."
 msgstr "Необходимо выбрать хотя бы один элемент."
 
-#: views.py:76
+#: views.py:86
 #, python-format
 msgid "%(selection)s added successfully added to %(right_list_title)s."
 msgstr "%(selection)s успешно добавлен в %(right_list_title)s ."
 
-#: views.py:79 views.py:96
+#: views.py:89 views.py:106
 #, python-format
 msgid "Unable to add %(selection)s to %(right_list_title)s."
 msgstr "Не удалось добавить %(selection)s до %(right_list_title)s ."
 
-#: views.py:93
+#: views.py:103
 #, python-format
 msgid "%(selection)s added successfully removed from %(right_list_title)s."
 msgstr "%(selection)s  успешно удален из %(right_list_title)s ."
 
-#: views.py:111
+#: views.py:121
 msgid "Add"
 msgstr "Добавить"
 
-#: views.py:122
+#: views.py:132
 msgid "Remove"
 msgstr "Удалить"
 
-#: views.py:145
+#: views.py:155
 msgid "current user details"
 msgstr "данные пользователя"
 
-#: views.py:162
+#: views.py:172
 msgid "Current user's details updated."
 msgstr "Данные пользователя обновлены."
 
-#: views.py:171
+#: views.py:181
 msgid "edit current user details"
 msgstr "редактировать данные пользователя"
 
-#: views.py:197
+#: views.py:207
 msgid "Changelog"
 msgstr "Изменения"
 
-#: views.py:210
+#: views.py:220
 msgid "License"
 msgstr "Лицензия"
 
@@ -194,7 +194,7 @@ msgstr "Недостаточно прав"
 
 #: templates/403.html:9
 msgid "You don't have enough permissions for this operation."
-msgstr "У вас нет достаточно прав для этой операции."
+msgstr "У вас недостаточно прав для этой операции."
 
 #: templates/404.html:3 templates/404.html.py:7
 msgid "Page not found"
@@ -230,7 +230,7 @@ msgstr "Создать %(object_name)s"
 
 #: templates/calculate_form_title.html:26
 msgid "Create"
-msgstr "Создавать"
+msgstr "Создать"
 
 #: templates/generic_assign_remove.html:3
 #, python-format
@@ -245,25 +245,25 @@ msgstr "Подтверждать"
 msgid "Confirm delete"
 msgstr "Подтвердить удаление"
 
-#: templates/generic_confirm.html:28
+#: templates/generic_confirm.html:32
 msgid "form icon"
 msgstr "значок формы"
 
-#: templates/generic_confirm.html:36
+#: templates/generic_confirm.html:40
 #, python-format
 msgid "Are you sure you wish to delete %(object_name)s: %(object)s?"
 msgstr "Вы действительно хотите удалить %(object_name)s: %(object)s?"
 
-#: templates/generic_confirm.html:38
+#: templates/generic_confirm.html:42
 #, python-format
 msgid "Are you sure you wish to delete: %(object)s?"
 msgstr "Вы действительно хотите удалить: %(object)s?"
 
-#: templates/generic_confirm.html:46
+#: templates/generic_confirm.html:50
 msgid "Yes"
 msgstr "Да"
 
-#: templates/generic_confirm.html:50
+#: templates/generic_confirm.html:54
 msgid "No"
 msgstr "Нет"
 
@@ -276,8 +276,8 @@ msgstr "требуется"
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Save"
 msgstr "Сохранить"
 
@@ -285,22 +285,18 @@ msgstr "Сохранить"
 #: templates/generic_form_subtemplate.html:78
 #: templates/generic_list_horizontal_subtemplate.html:51
 #: templates/generic_list_horizontal_subtemplate.html:178
-#: templates/generic_list_subtemplate.html:51
-#: templates/generic_list_subtemplate.html:171
+#: templates/generic_list_subtemplate.html:52
+#: templates/generic_list_subtemplate.html:178
 msgid "Submit"
 msgstr "Выполнить"
 
-#: templates/generic_form_subtemplate.html:82
-msgid "Cancel"
-msgstr "Отменить"
-
 #: templates/generic_list.html:6 templates/generic_list_horizontal.html:6
 #, python-format
 msgid "List of %(stripped_title)s"
-msgstr "Список %(stripped_title)s"
+msgstr "Список \"%(stripped_title)s\""
 
 #: templates/generic_list_horizontal_subtemplate.html:23
-#: templates/generic_list_subtemplate.html:23
+#: templates/generic_list_subtemplate.html:24
 #, python-format
 msgid ""
 "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page "
@@ -310,18 +306,16 @@ msgstr ""
 " %(total_pages)s)"
 
 #: templates/generic_list_horizontal_subtemplate.html:25
-#: templates/generic_list_subtemplate.html:25
+#: templates/generic_list_subtemplate.html:26
 #, python-format
 msgid "List of %(title)s (%(total)s)"
 msgstr "Список %(title)s (%(total)s)"
 
-#: templates/generic_list_horizontal_subtemplate.html:72
-#: templates/generic_list_subtemplate.html:71
+#: templates/generic_list_subtemplate.html:72
 msgid "Identifier"
 msgstr "Идентификатор"
 
-#: templates/generic_list_horizontal_subtemplate.html:146
-#: templates/generic_list_subtemplate.html:145
+#: templates/generic_list_subtemplate.html:152
 #, python-format
 msgid "There are no %(stripped_title)s"
 msgstr "Нет %(stripped_title)s"
diff --git a/apps/common/templates/generic_confirm.html b/apps/common/templates/generic_confirm.html
index 10a6e927d6..b020583e2e 100644
--- a/apps/common/templates/generic_confirm.html
+++ b/apps/common/templates/generic_confirm.html
@@ -22,7 +22,11 @@
             <form action="" method="post" class="form login">{% csrf_token %}
                 {% if next %}
                     <input name="next" type="hidden" value="{{ next }}" />
-                {% endif %}          
+                {% endif %}   
+                       
+                {% if previous %}
+                    <input name="previous" type="hidden" value="{{ previous }}" />
+                {% endif %}   
                 
                 <div style="float: left; margin-right: 10px;">
                     <img style="margin-top: 12px;" src="{{ STATIC_URL }}images/icons/{{ form_icon|default:'question.png' }}" alt="{% trans 'form icon' %}" />
diff --git a/apps/common/utils.py b/apps/common/utils.py
index 61973996ac..1de970154a 100644
--- a/apps/common/utils.py
+++ b/apps/common/utils.py
@@ -3,6 +3,8 @@ import os
 import re
 import types
 import tempfile
+import string
+import random
 
 from django.utils.http import urlquote  as django_urlquote
 from django.utils.http import urlencode as django_urlencode
@@ -358,8 +360,13 @@ def validate_path(path):
 
     return True
 
+
 def encapsulate(function):
     # Workaround Django ticket 15791
     # Changeset 16045
     # http://stackoverflow.com/questions/6861601/cannot-resolve-callable-context-variable/6955045#6955045
     return lambda: function
+
+
+def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
+    return ''.join(random.choice(chars) for x in range(size))
diff --git a/apps/converter/api.py b/apps/converter/api.py
index bdcfe40f77..f48bf88986 100644
--- a/apps/converter/api.py
+++ b/apps/converter/api.py
@@ -4,8 +4,6 @@ import hashlib
 
 from common.conf.settings import TEMPORARY_DIRECTORY
 
-from converter.conf.settings import UNOCONV_PATH
-from converter.exceptions import OfficeConversionError
 from converter.literals import DEFAULT_PAGE_NUMBER, \
     DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, DEFAULT_FILE_FORMAT
 
@@ -16,28 +14,12 @@ from converter.literals import TRANSFORMATION_RESIZE, \
 from converter.literals import DIMENSION_SEPARATOR
 from converter.literals import FILE_FORMATS
 from converter.utils import cleanup
+from converter.runtime import office_converter
+from converter.exceptions import OfficeConversionError
 
 HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest()
-    
-CONVERTER_OFFICE_FILE_EXTENSIONS = [
-    u'ods', u'docx', u'doc'
-]
-
-
-def execute_unoconv(input_filepath, arguments=''):
-    """
-    Executes the program unoconv using subprocess's Popen
-    """
-    command = []
-    command.append(UNOCONV_PATH)
-    command.extend(unicode(arguments).split())
-    command.append(input_filepath)
-    proc = subprocess.Popen(command, close_fds=True, stderr=subprocess.PIPE)
-    return_code = proc.wait()
-    if return_code != 0:
-        raise OfficeConversionError(proc.stderr.readline())
-
 
+            
 def cache_cleanup(input_filepath, *args, **kwargs):
     try:
         os.remove(create_image_cache_filename(input_filepath, *args, **kwargs))
@@ -53,37 +35,35 @@ def create_image_cache_filename(input_filepath, *args, **kwargs):
         return None
 
 
-def convert_office_document(input_filepath):
-    if os.path.exists(UNOCONV_PATH):
-        execute_unoconv(input_filepath, arguments='-f pdf')
-        return input_filepath + u'.pdf'
-    return None
-
-
-def convert(input_filepath, output_filepath=None, cleanup_files=False, *args, **kwargs):
+def convert(input_filepath, output_filepath=None, cleanup_files=False, mimetype=None, *args, **kwargs):
     size = kwargs.get('size')
     file_format = kwargs.get('file_format', DEFAULT_FILE_FORMAT)
     zoom = kwargs.get('zoom', DEFAULT_ZOOM_LEVEL)
     rotation = kwargs.get('rotation', DEFAULT_ROTATION)
     page = kwargs.get('page', DEFAULT_PAGE_NUMBER)
     transformations = kwargs.get('transformations', [])
+    
     if transformations is None:
         transformations = []
 
-    unoconv_output = None
-
     if output_filepath is None:
         output_filepath = create_image_cache_filename(input_filepath, *args, **kwargs)
         
     if os.path.exists(output_filepath):
         return output_filepath
 
-    path, extension = os.path.splitext(input_filepath)
-    if extension[1:].lower() in CONVERTER_OFFICE_FILE_EXTENSIONS:
-        result = convert_office_document(input_filepath)
-        if result:
-            unoconv_output = result
-            input_filepath = result
+    if office_converter:
+        try:
+            office_converter.convert(input_filepath, mimetype=mimetype)
+            if office_converter.exists:
+                input_filepath = office_converter.output_filepath
+                mimetype = 'application/pdf'
+            else:
+                # Recycle the already detected mimetype
+                mimetype = office_converter.mimetype
+
+        except OfficeConversionError:
+                raise UnknownFileFormat('office converter exception')
 
     if size:
         transformations.append(
@@ -110,17 +90,24 @@ def convert(input_filepath, output_filepath=None, cleanup_files=False, *args, **
         )           
 
     try:
-        backend.convert_file(input_filepath=input_filepath, output_filepath=output_filepath, transformations=transformations, page=page, file_format=file_format)
+        backend.convert_file(input_filepath=input_filepath, output_filepath=output_filepath, transformations=transformations, page=page, file_format=file_format, mimetype=mimetype)
     finally:
         if cleanup_files:
             cleanup(input_filepath)
-        if unoconv_output:
-            cleanup(unoconv_output)
 
     return output_filepath
 
 
 def get_page_count(input_filepath):
+    if office_converter:
+        try:
+            office_converter.convert(input_filepath)
+            if office_converter.exists:
+                input_filepath = office_converter.output_filepath
+
+        except OfficeConversionError:
+                raise UnknownFileFormat('office converter exception')
+                                
     return backend.get_page_count(input_filepath)
 
 
diff --git a/apps/converter/backends/graphicsmagick/base.py b/apps/converter/backends/graphicsmagick/base.py
index 4ec1629f0a..379830d032 100644
--- a/apps/converter/backends/graphicsmagick/base.py
+++ b/apps/converter/backends/graphicsmagick/base.py
@@ -29,7 +29,7 @@ class ConverterClass(ConverterBase):
             raise IdentifyError(proc.stderr.readline())
         return proc.stdout.read()
 
-    def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT):
+    def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT, **kwargs):
         arguments = []
 
         try:
diff --git a/apps/converter/backends/imagemagick/base.py b/apps/converter/backends/imagemagick/base.py
index 0771dc66f7..d2a76e3c6c 100644
--- a/apps/converter/backends/imagemagick/base.py
+++ b/apps/converter/backends/imagemagick/base.py
@@ -29,7 +29,7 @@ class ConverterClass(ConverterBase):
             raise IdentifyError(proc.stderr.readline())
         return proc.stdout.read()
 
-    def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT):
+    def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT, **kwargs):
         arguments = []
         try:
             if transformations:
diff --git a/apps/converter/backends/python/base.py b/apps/converter/backends/python/base.py
index a57e1f0d2a..dddfa71e7e 100644
--- a/apps/converter/backends/python/base.py
+++ b/apps/converter/backends/python/base.py
@@ -25,7 +25,7 @@ class ConverterClass(ConverterBase):
     def get_page_count(self, input_filepath):
         page_count = 1
 
-        mimetype, encoding = get_mimetype(open(input_filepath, 'rb'), input_filepath)
+        mimetype, encoding = get_mimetype(open(input_filepath, 'rb'), input_filepath, mimetype_only=True)
         if mimetype == 'application/pdf':
             # If file is a PDF open it with slate to determine the page
             # count
@@ -48,9 +48,12 @@ class ConverterClass(ConverterBase):
             
         return page_count
 
-    def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT):
+    def convert_file(self, input_filepath, output_filepath, transformations=None, page=DEFAULT_PAGE_NUMBER, file_format=DEFAULT_FILE_FORMAT, **kwargs):
         tmpfile = None
-        mimetype, encoding = get_mimetype(open(input_filepath, 'rb'), input_filepath)
+        mimetype = kwargs.get('mimetype', None)
+        if not mimetype:
+            mimetype, encoding = get_mimetype(open(input_filepath, 'rb'), input_filepath, mimetype_only=True)
+
         if mimetype == 'application/pdf' and USE_GHOSTSCRIPT:
             # If file is a PDF open it with ghostscript and convert it to
             # TIFF
@@ -64,7 +67,7 @@ class ConverterClass(ConverterBase):
                 'gs', '-q', '-dQUIET', '-dSAFER', '-dBATCH',
                 '-dNOPAUSE', '-dNOPROMPT', 
                 first_page_tmpl, last_page_tmpl,
-                '-sDEVICE=jpeg', '-dJPEGQ=75',
+                '-sDEVICE=jpeg', '-dJPEGQ=95',
                 '-r150', output_file_tmpl,
                 input_file_tmpl,
                 '-c "60000000 setvmthreshold"',  # use 30MB
diff --git a/apps/converter/conf/settings.py b/apps/converter/conf/settings.py
index 08377880b4..1dbfe4d6bc 100644
--- a/apps/converter/conf/settings.py
+++ b/apps/converter/conf/settings.py
@@ -1,4 +1,5 @@
-"""Configuration options for the converter app"""
+'''Configuration options for the converter app'''
+
 from django.utils.translation import ugettext_lazy as _
 
 from smart_settings.api import register_settings
@@ -12,7 +13,9 @@ register_settings(
         {'name': u'GM_PATH', 'global_name': u'CONVERTER_GM_PATH', 'default': u'/usr/bin/gm', 'description': _(u'File path to graphicsmagick\'s program.'), 'exists': True},
         {'name': u'GM_SETTINGS', 'global_name': u'CONVERTER_GM_SETTINGS', 'default': u''},
         {'name': u'GRAPHICS_BACKEND', 'global_name': u'CONVERTER_GRAPHICS_BACKEND', 'default': u'converter.backends.python', 'description': _(u'Graphics conversion backend to use.  Options are: converter.backends.imagemagick, converter.backends.graphicsmagick and converter.backends.python.')},
-        {'name': u'UNOCONV_PATH', 'global_name': u'CONVERTER_UNOCONV_PATH', 'default': u'/usr/bin/unoconv', 'exists': True},
+        {'name': u'UNOCONV_PATH', 'global_name': u'CONVERTER_UNOCONV_PATH', 'default': u'/usr/bin/unoconv', 'exists': True, 'description': _(u'Path to the unoconv program.')},
+        {'name': u'UNOCONV_USE_PIPE', 'global_name': u'CONVERTER_UNOCONV_USE_PIPE', 'default': True, 'description': _(u'Use alternate method of connection to LibreOffice using a pipe, it is slower but less prone to segmentation faults.')},
+        
         #{'name': u'OCR_OPTIONS', 'global_name': u'CONVERTER_OCR_OPTIONS', 'default': u'-colorspace Gray -depth 8 -resample 200x200'},
         #{'name': u'HIGH_QUALITY_OPTIONS', 'global_name': u'CONVERTER_HIGH_QUALITY_OPTIONS', 'default': u'-density 400'},
         #{'name': u'PRINT_QUALITY_OPTIONS', 'global_name': u'CONVERTER_PRINT_QUALITY_OPTIONS', 'default': u'-density 500'},
diff --git a/apps/converter/exceptions.py b/apps/converter/exceptions.py
index e90fd4bb34..1423d38002 100644
--- a/apps/converter/exceptions.py
+++ b/apps/converter/exceptions.py
@@ -29,3 +29,7 @@ class UnkownConvertError(ConvertError):
 
 class OfficeConversionError(ConvertError):
     pass
+
+
+class OfficeBackendError(OfficeConversionError):
+    pass
diff --git a/apps/converter/literals.py b/apps/converter/literals.py
index b567b30d14..14df18106d 100644
--- a/apps/converter/literals.py
+++ b/apps/converter/literals.py
@@ -5,6 +5,7 @@ DEFAULT_ZOOM_LEVEL = 100
 DEFAULT_ROTATION = 0
 DEFAULT_PAGE_NUMBER = 1
 DEFAULT_FILE_FORMAT = u'jpeg'
+DEFAULT_FILE_FORMAT_MIMETYPE = u'image/jpeg'
 
 DIMENSION_SEPARATOR = u'x'
 
diff --git a/apps/converter/locale/en/LC_MESSAGES/django.po b/apps/converter/locale/en/LC_MESSAGES/django.po
index 4235891a3b..ec3951acca 100644
--- a/apps/converter/locale/en/LC_MESSAGES/django.po
+++ b/apps/converter/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: 2011-09-29 18:44-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -21,861 +21,861 @@ msgstr ""
 msgid "file formats"
 msgstr ""
 
-#: literals.py:18
+#: literals.py:19
 msgid "Resize"
 msgstr ""
 
-#: literals.py:19
+#: literals.py:20
 msgid "Resize."
 msgstr ""
 
-#: literals.py:21 literals.py:36
+#: literals.py:22 literals.py:37
 msgid "width"
 msgstr ""
 
-#: literals.py:22 literals.py:37
+#: literals.py:23 literals.py:38
 msgid "height"
 msgstr ""
 
-#: literals.py:26
+#: literals.py:27
 msgid "Rotate"
 msgstr ""
 
-#: literals.py:27
+#: literals.py:28
 msgid "Rotate by n degress."
 msgstr ""
 
-#: literals.py:29
+#: literals.py:30
 msgid "degrees"
 msgstr ""
 
-#: literals.py:33
+#: literals.py:34
 msgid "Density"
 msgstr ""
 
-#: literals.py:34
+#: literals.py:35
 msgid "Change the resolution (ie: DPI) without resizing."
 msgstr ""
 
-#: literals.py:41
+#: literals.py:42
 msgid "Zoom"
 msgstr ""
 
-#: literals.py:42
+#: literals.py:43
 msgid "Zoom by n percent."
 msgstr ""
 
-#: literals.py:44
+#: literals.py:45
 msgid "percent"
 msgstr ""
 
-#: literals.py:50
+#: literals.py:51
 msgid "Hasselblad Photo RAW, CFV/H3D39II"
 msgstr ""
 
-#: literals.py:51 literals.py:52
+#: literals.py:52 literals.py:53
 msgid "Photoshop resource format"
 msgstr ""
 
-#: literals.py:53
+#: literals.py:54
 msgid "Photoshop resource text format"
 msgstr ""
 
-#: literals.py:54
+#: literals.py:55
 msgid "Photoshop resource wide text format"
 msgstr ""
 
-#: literals.py:56
+#: literals.py:57
 msgid "Raw alpha samples"
 msgstr ""
 
-#: literals.py:57
+#: literals.py:58
 msgid "Adobe Illustrator CS2"
 msgstr ""
 
-#: literals.py:58
+#: literals.py:59
 msgid "Raw application information"
 msgstr ""
 
-#: literals.py:59
+#: literals.py:60
 msgid "Raw JPEG binary data"
 msgstr ""
 
-#: literals.py:60
+#: literals.py:61
 msgid "PFS: 1st Publisher Clip Art"
 msgstr ""
 
-#: literals.py:61
+#: literals.py:62
 msgid "Sony Alpha DSLR Raw Image Format"
 msgstr ""
 
-#: literals.py:62
+#: literals.py:63
 msgid "Microsoft Audio/Visual Interleaved"
 msgstr ""
 
-#: literals.py:63
+#: literals.py:64
 msgid "AVS X image"
 msgstr ""
 
-#: literals.py:65
+#: literals.py:66
 msgid "Raw blue samples"
 msgstr ""
 
-#: literals.py:66
+#: literals.py:67
 msgid "Raw blue, green, and red samples"
 msgstr ""
 
-#: literals.py:67
+#: literals.py:68
 msgid "Raw blue, green, red and alpha samples"
 msgstr ""
 
-#: literals.py:68
+#: literals.py:69
 msgid "Microsoft Windows bitmap image"
 msgstr ""
 
-#: literals.py:69
+#: literals.py:70
 msgid "Microsoft Windows bitmap image version 2"
 msgstr ""
 
-#: literals.py:70
+#: literals.py:71
 msgid "Microsoft Windows bitmap image version 3"
 msgstr ""
 
-#: literals.py:71
+#: literals.py:72
 msgid "BRF ASCII Braille format"
 msgstr ""
 
-#: literals.py:72
+#: literals.py:73
 msgid "Raw blue, red, and green samples"
 msgstr ""
 
-#: literals.py:74
+#: literals.py:75
 msgid "Raw cyan samples"
 msgstr ""
 
-#: literals.py:75 literals.py:180
+#: literals.py:76 literals.py:181
 msgid "Magick Persistent Cache image format"
 msgstr ""
 
-#: literals.py:76 literals.py:77
+#: literals.py:77 literals.py:78
 msgid "Continuous Acquisition and Life-cycle Support Type 1 image"
 msgstr ""
 
-#: literals.py:78
+#: literals.py:79
 msgid "Image caption"
 msgstr ""
 
-#: literals.py:79
+#: literals.py:80
 msgid "Cineon Image File"
 msgstr ""
 
-#: literals.py:80
+#: literals.py:81
 msgid "Cisco IP phone image format"
 msgstr ""
 
-#: literals.py:81
+#: literals.py:82
 msgid "Image Clip Mask"
 msgstr ""
 
-#: literals.py:82
+#: literals.py:83
 msgid "Raw cyan, magenta, yellow, and black samples"
 msgstr ""
 
-#: literals.py:83
+#: literals.py:84
 msgid "Raw cyan, magenta, yellow, black, and opacity samples"
 msgstr ""
 
-#: literals.py:84 literals.py:85
+#: literals.py:85 literals.py:86
 msgid "Canon Digital Camera Raw Image Format"
 msgstr ""
 
-#: literals.py:86
+#: literals.py:87
 msgid "Microsoft Cursor Icon"
 msgstr ""
 
-#: literals.py:87
+#: literals.py:88
 msgid "DR Halo"
 msgstr ""
 
-#: literals.py:89
+#: literals.py:90
 msgid "Digital Imaging and Communications in Medicine image"
 msgstr ""
 
-#: literals.py:90
+#: literals.py:91
 msgid "Kodak Digital Camera Raw Image File"
 msgstr ""
 
-#: literals.py:91
+#: literals.py:92
 msgid "ZSoft IBM PC multi-page Paintbrush"
 msgstr ""
 
-#: literals.py:92
+#: literals.py:93
 msgid "Microsoft DirectDraw Surface"
 msgstr ""
 
-#: literals.py:93
+#: literals.py:94
 msgid "Multi-face font package (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:94
+#: literals.py:95
 msgid "Déjà vu"
 msgstr ""
 
-#: literals.py:95
+#: literals.py:96
 msgid "Adobe Digital Negative"
 msgstr ""
 
-#: literals.py:96
+#: literals.py:97
 msgid "Graphviz"
 msgstr ""
 
-#: literals.py:97
+#: literals.py:98
 msgid "SMPTE 268M-2003 (DPX 2.0)"
 msgstr ""
 
-#: literals.py:99
+#: literals.py:100
 msgid "Encapsulated Portable Document Format"
 msgstr ""
 
-#: literals.py:100 literals.py:105
+#: literals.py:101 literals.py:106
 msgid "Adobe Encapsulated PostScript Interchange format"
 msgstr ""
 
-#: literals.py:101 literals.py:104
+#: literals.py:102 literals.py:105
 msgid "Adobe Encapsulated PostScript"
 msgstr ""
 
-#: literals.py:102
+#: literals.py:103
 msgid "Adobe Level II Encapsulated PostScript"
 msgstr ""
 
-#: literals.py:103
+#: literals.py:104
 msgid "Adobe Level III Encapsulated PostScript"
 msgstr ""
 
-#: literals.py:106
+#: literals.py:107
 msgid "Adobe Encapsulated PostScript with TIFF preview"
 msgstr ""
 
-#: literals.py:107
+#: literals.py:108
 msgid "Adobe Level II Encapsulated PostScript with TIFF preview"
 msgstr ""
 
-#: literals.py:108
+#: literals.py:109
 msgid "Adobe Level III Encapsulated PostScript with TIFF preview"
 msgstr ""
 
-#: literals.py:109
+#: literals.py:110
 msgid "Epson RAW Format"
 msgstr ""
 
-#: literals.py:110
+#: literals.py:111
 msgid "Exif digital camera binary data"
 msgstr ""
 
-#: literals.py:111
+#: literals.py:112
 msgid "High Dynamic-range (HDR)"
 msgstr ""
 
-#: literals.py:113
+#: literals.py:114
 msgid "Group 3 FAX (Not TIFF Group3 FAX)"
 msgstr ""
 
-#: literals.py:114
+#: literals.py:115
 msgid "Autodesk FLI animations file"
 msgstr ""
 
-#: literals.py:115
+#: literals.py:116
 msgid "Autodesk FLC animations file"
 msgstr ""
 
-#: literals.py:116 literals.py:119
+#: literals.py:117 literals.py:120
 msgid "Flexible Image Transport System"
 msgstr ""
 
-#: literals.py:117
+#: literals.py:118
 msgid "Kodak FlashPix file"
 msgstr ""
 
-#: literals.py:118 literals.py:224
+#: literals.py:119 literals.py:225
 msgid "Plasma fractal image"
 msgstr ""
 
-#: literals.py:121
+#: literals.py:122
 msgid "Raw green samples"
 msgstr ""
 
-#: literals.py:122
+#: literals.py:123
 msgid "Group 3 FAX"
 msgstr ""
 
-#: literals.py:123
+#: literals.py:124
 msgid "Raw green, blue, and red samples"
 msgstr ""
 
-#: literals.py:124
+#: literals.py:125
 msgid "GIMP brush file"
 msgstr ""
 
-#: literals.py:125
+#: literals.py:126
 msgid "CompuServe graphics interchange format (version 89a)"
 msgstr ""
 
-#: literals.py:126
+#: literals.py:127
 msgid "CompuServe graphics interchange format (version 87a)"
 msgstr ""
 
-#: literals.py:127
+#: literals.py:128
 msgid "Gradual passing from one shade to another"
 msgstr ""
 
-#: literals.py:128
+#: literals.py:129
 msgid "Raw gray samples"
 msgstr ""
 
-#: literals.py:129
+#: literals.py:130
 msgid "Raw green, red, and blue samples"
 msgstr ""
 
-#: literals.py:130
+#: literals.py:131
 msgid "Raw CCITT Group4"
 msgstr ""
 
-#: literals.py:132
+#: literals.py:133
 msgid "Histogram of the image"
 msgstr ""
 
-#: literals.py:133
+#: literals.py:134
 msgid "HRZ: Slow scan TV"
 msgstr ""
 
-#: literals.py:134 literals.py:135 literals.py:254
+#: literals.py:135 literals.py:136 literals.py:255
 msgid "Hypertext Markup Language and a client-side image map"
 msgstr ""
 
-#: literals.py:137 literals.py:263 literals.py:278 literals.py:282
+#: literals.py:138 literals.py:264 literals.py:279 literals.py:283
 msgid "Truevision Targa image"
 msgstr ""
 
-#: literals.py:138 literals.py:139
+#: literals.py:139 literals.py:140
 msgid "ICC Color Profile"
 msgstr ""
 
-#: literals.py:140 literals.py:141
+#: literals.py:141 literals.py:142
 msgid "Microsoft Icon"
 msgstr ""
 
-#: literals.py:142
+#: literals.py:143
 msgid "Hald CLUT identity image"
 msgstr ""
 
-#: literals.py:143
+#: literals.py:144
 msgid "LabEye image format"
 msgstr ""
 
-#: literals.py:144
+#: literals.py:145
 msgid "GraphicsMagick Embedded Image"
 msgstr ""
 
-#: literals.py:145
+#: literals.py:146
 msgid "The image format and characteristics"
 msgstr ""
 
-#: literals.py:146
+#: literals.py:147
 msgid "Base64-encoded inline images"
 msgstr ""
 
-#: literals.py:147
+#: literals.py:148
 msgid "IPL Image Sequence"
 msgstr ""
 
-#: literals.py:148
+#: literals.py:149
 msgid "IPTC Newsphoto"
 msgstr ""
 
-#: literals.py:149 literals.py:150
+#: literals.py:150 literals.py:151
 msgid "IPTC Newsphoto text format"
 msgstr ""
 
-#: literals.py:151
+#: literals.py:152
 msgid "ISO/TR 11548-1 format"
 msgstr ""
 
-#: literals.py:153 literals.py:156
+#: literals.py:154 literals.py:157
 msgid "JPEG-2000 Code Stream Syntax"
 msgstr ""
 
-#: literals.py:154
+#: literals.py:155
 msgid "JPEG Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:155
+#: literals.py:156
 msgid "JPEG-2000 JP2 File Format Syntax"
 msgstr ""
 
-#: literals.py:157 literals.py:158
+#: literals.py:158 literals.py:159
 msgid "Joint Photographic Experts Group JFIF format (IJG JPEG 62)"
 msgstr ""
 
-#: literals.py:159
+#: literals.py:160
 msgid "JPEG-2000 File Format Syntax"
 msgstr ""
 
-#: literals.py:161
+#: literals.py:162
 msgid "Raw black samples"
 msgstr ""
 
-#: literals.py:162 literals.py:163
+#: literals.py:163 literals.py:164
 msgid "Kodak Digital Camera Raw Image Format"
 msgstr ""
 
-#: literals.py:165
+#: literals.py:166
 msgid "Image label"
 msgstr ""
 
-#: literals.py:167
+#: literals.py:168
 msgid "Raw magenta samples"
 msgstr ""
 
-#: literals.py:168 literals.py:178 literals.py:181 literals.py:182
+#: literals.py:169 literals.py:179 literals.py:182 literals.py:183
 msgid "MPEG Video Stream"
 msgstr ""
 
-#: literals.py:169
+#: literals.py:170
 msgid "Raw MPEG-4 Video"
 msgstr ""
 
-#: literals.py:170
+#: literals.py:171
 msgid "Colormap intensities and indices"
 msgstr ""
 
-#: literals.py:171
+#: literals.py:172
 msgid "MATLAB image format"
 msgstr ""
 
-#: literals.py:172
+#: literals.py:173
 msgid "MATTE raw opacity format"
 msgstr ""
 
-#: literals.py:173
+#: literals.py:174
 msgid "8-bit McIdas area file"
 msgstr ""
 
-#: literals.py:174
+#: literals.py:175
 msgid "Microsoft Image Composer (MIC) file"
 msgstr ""
 
-#: literals.py:175
+#: literals.py:176
 msgid "Magick Image File Format"
 msgstr ""
 
-#: literals.py:176
+#: literals.py:177
 msgid ""
 "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:177
+#: literals.py:178
 msgid "Raw Bi-level bitmap in least-significant-byte first order"
 msgstr ""
 
-#: literals.py:179
+#: literals.py:180
 msgid "MPEG-4 Video Stream"
 msgstr ""
 
-#: literals.py:183
+#: literals.py:184
 msgid "Sony (Minolta) Raw Image File"
 msgstr ""
 
-#: literals.py:184
+#: literals.py:185
 msgid "Magick Scripting Language"
 msgstr ""
 
-#: literals.py:185
+#: literals.py:186
 msgid "Windows 1 and 2 MSP file format"
 msgstr ""
 
-#: literals.py:186
+#: literals.py:187
 msgid "ImageMagick's own SVG internal renderer"
 msgstr ""
 
-#: literals.py:187
+#: literals.py:188
 msgid "MTV Raytracing image format"
 msgstr ""
 
-#: literals.py:188
+#: literals.py:189
 msgid "Magick Vector Graphics"
 msgstr ""
 
-#: literals.py:190
+#: literals.py:191
 msgid "Nikon Digital SLR Camera Raw Image File"
 msgstr ""
 
-#: literals.py:191
+#: literals.py:192
 msgid "Constant image of uniform color"
 msgstr ""
 
-#: literals.py:193
+#: literals.py:194
 msgid "Raw opacity samples"
 msgstr ""
 
-#: literals.py:194
+#: literals.py:195
 msgid "Olympus Digital Camera Raw Image File"
 msgstr ""
 
-#: literals.py:195
+#: literals.py:196
 msgid "On-the-air bitmap"
 msgstr ""
 
-#: literals.py:196
+#: literals.py:197
 msgid "Open Type font (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:198
+#: literals.py:199
 msgid "Xv thumbnail format"
 msgstr ""
 
-#: literals.py:199 literals.py:276
+#: literals.py:200 literals.py:277
 msgid "16bit/pixel interleaved YUV"
 msgstr ""
 
-#: literals.py:200
+#: literals.py:201
 msgid "Palm pixmap"
 msgstr ""
 
-#: literals.py:201
+#: literals.py:202
 msgid "Common 2-dimensional bitmap format"
 msgstr ""
 
-#: literals.py:202
+#: literals.py:203
 msgid "Predefined pattern"
 msgstr ""
 
-#: literals.py:203
+#: literals.py:204
 msgid "Portable bitmap format (black and white)"
 msgstr ""
 
-#: literals.py:204 literals.py:205
+#: literals.py:205 literals.py:206
 msgid "Photo CD"
 msgstr ""
 
-#: literals.py:206
+#: literals.py:207
 msgid "Page Control Language"
 msgstr ""
 
-#: literals.py:207 literals.py:220
+#: literals.py:208 literals.py:221
 msgid "Apple Macintosh QuickDraw/PICT"
 msgstr ""
 
-#: literals.py:208
+#: literals.py:209
 msgid "ZSoft IBM PC Paintbrush"
 msgstr ""
 
-#: literals.py:209
+#: literals.py:210
 msgid "Palm Database ImageViewer Format"
 msgstr ""
 
-#: literals.py:210
+#: literals.py:211
 msgid "Portable Document Format"
 msgstr ""
 
-#: literals.py:211
+#: literals.py:212
 msgid "Portable Document Archive Format"
 msgstr ""
 
-#: literals.py:212
+#: literals.py:213
 msgid "Pentax Electronic File"
 msgstr ""
 
-#: literals.py:213
+#: literals.py:214
 msgid "Embrid Embroidery Format"
 msgstr ""
 
-#: literals.py:214
+#: literals.py:215
 msgid "Postscript Type 1 font (ASCII) (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:215
+#: literals.py:216
 msgid "Postscript Type 1 font (binary) (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:216
+#: literals.py:217
 msgid "Portable float format"
 msgstr ""
 
-#: literals.py:217
+#: literals.py:218
 msgid "Portable graymap format (gray scale)"
 msgstr ""
 
-#: literals.py:218
+#: literals.py:219
 msgid "JPEG-2000 VM Format"
 msgstr ""
 
-#: literals.py:219
+#: literals.py:220
 msgid "Personal Icon"
 msgstr ""
 
-#: literals.py:221
+#: literals.py:222
 msgid "Alias/Wavefront RLE image format"
 msgstr ""
 
-#: literals.py:222
+#: literals.py:223
 msgid "PIXAR raster file"
 msgstr ""
 
-#: literals.py:223
+#: literals.py:224
 msgid "Joint Photographic Experts Group JFIF format (62)"
 msgstr ""
 
-#: literals.py:225
+#: literals.py:226
 msgid "Portable Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:226
+#: literals.py:227
 msgid ""
 "24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:227
+#: literals.py:228
 msgid ""
 "32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:228
+#: literals.py:229
 msgid ""
 "8-bit indexed PNG, binary transparency only (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:229
+#: literals.py:230
 msgid "Portable anymap"
 msgstr ""
 
-#: literals.py:230
+#: literals.py:231
 msgid "Portable pixmap format (color)"
 msgstr ""
 
-#: literals.py:231
+#: literals.py:232
 msgid "Show a preview an image enhancement, effect, or f/x"
 msgstr ""
 
-#: literals.py:232
+#: literals.py:233
 msgid "Adobe PostScript"
 msgstr ""
 
-#: literals.py:233
+#: literals.py:234
 msgid "Adobe Level II PostScript"
 msgstr ""
 
-#: literals.py:234
+#: literals.py:235
 msgid "Adobe Level III PostScript"
 msgstr ""
 
-#: literals.py:235
+#: literals.py:236
 msgid "Adobe Large Document Format"
 msgstr ""
 
-#: literals.py:236
+#: literals.py:237
 msgid "Adobe Photoshop bitmap"
 msgstr ""
 
-#: literals.py:237
+#: literals.py:238
 msgid "Pyramid encoded TIFF"
 msgstr ""
 
-#: literals.py:238 literals.py:252
+#: literals.py:239 literals.py:253
 msgid "Seattle Film Works"
 msgstr ""
 
-#: literals.py:240
+#: literals.py:241
 msgid "Raw red samples"
 msgstr ""
 
-#: literals.py:241
+#: literals.py:242
 msgid "Fuji CCD-RAW Graphic File"
 msgstr ""
 
-#: literals.py:242 literals.py:258
+#: literals.py:243 literals.py:259
 msgid "SUN Rasterfile"
 msgstr ""
 
-#: literals.py:243
+#: literals.py:244
 msgid "Raw red, blue, and green samples"
 msgstr ""
 
-#: literals.py:244
+#: literals.py:245
 msgid "Raw red, green, and blue samples"
 msgstr ""
 
-#: literals.py:245
+#: literals.py:246
 msgid "Raw red, green, blue, and matte samples"
 msgstr ""
 
-#: literals.py:246
+#: literals.py:247
 msgid "Raw red, green, blue, and opacity samples"
 msgstr ""
 
-#: literals.py:247
+#: literals.py:248
 msgid "Alias/Wavefront image"
 msgstr ""
 
-#: literals.py:248
+#: literals.py:249
 msgid "Utah Run length encoded image"
 msgstr ""
 
-#: literals.py:250
+#: literals.py:251
 msgid "ZX-Spectrum SCREEN$"
 msgstr ""
 
-#: literals.py:251
+#: literals.py:252
 msgid "Scitex HandShake"
 msgstr ""
 
-#: literals.py:253
+#: literals.py:254
 msgid "Irix RGB image"
 msgstr ""
 
-#: literals.py:255
+#: literals.py:256
 msgid "Sony Raw Format 2"
 msgstr ""
 
-#: literals.py:256
+#: literals.py:257
 msgid "Sony Raw Format"
 msgstr ""
 
-#: literals.py:257
+#: literals.py:258
 msgid "Steganographic image"
 msgstr ""
 
-#: literals.py:259
+#: literals.py:260
 msgid "Scalable Vector Graphics (XML 2.7.6, RSVG 2.32.0)"
 msgstr ""
 
-#: literals.py:260
+#: literals.py:261
 msgid "Scalable Vector Graphics (ZIP compressed) (XML 2.7.6, RSVG 2.32.0)"
 msgstr ""
 
-#: literals.py:262 literals.py:272
+#: literals.py:263 literals.py:273
 msgid "Text"
 msgstr ""
 
-#: literals.py:264
+#: literals.py:265
 msgid "EXIF Profile Thumbnail"
 msgstr ""
 
-#: literals.py:265
+#: literals.py:266
 msgid "Tagged Image File Format (LIBTIFF, Version 3.9.4)"
 msgstr ""
 
-#: literals.py:266
+#: literals.py:267
 msgid "Tagged Image File Format (64-bit) (LIBTIFF, Version 3.9.4)"
 msgstr ""
 
-#: literals.py:267
+#: literals.py:268
 msgid "Tile image with a texture"
 msgstr ""
 
-#: literals.py:268
+#: literals.py:269
 msgid "PSX TIM"
 msgstr ""
 
-#: literals.py:269
+#: literals.py:270
 msgid "TOPOL X Image"
 msgstr ""
 
-#: literals.py:270
+#: literals.py:271
 msgid "TrueType font collection (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:271
+#: literals.py:272
 msgid "TrueType font (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:274
+#: literals.py:275
 msgid "Unicode Text format"
 msgstr ""
 
-#: literals.py:275
+#: literals.py:276
 msgid "X-Motif UIL table"
 msgstr ""
 
-#: literals.py:279
+#: literals.py:280
 msgid "VICAR rasterfile format"
 msgstr ""
 
-#: literals.py:280
+#: literals.py:281
 msgid "Visual Image Directory"
 msgstr ""
 
-#: literals.py:281 literals.py:298
+#: literals.py:282 literals.py:299
 msgid "Khoros Visualization image"
 msgstr ""
 
-#: literals.py:284
+#: literals.py:285
 msgid "Wireless Bitmap (level 0) image"
 msgstr ""
 
-#: literals.py:285
+#: literals.py:286
 msgid "Windows Meta File"
 msgstr ""
 
-#: literals.py:286
+#: literals.py:287
 msgid "Word Perfect Graphics"
 msgstr ""
 
-#: literals.py:287
+#: literals.py:288
 msgid "Windows Media Video"
 msgstr ""
 
-#: literals.py:288
+#: literals.py:289
 msgid "Compressed Windows Meta File"
 msgstr ""
 
-#: literals.py:290
+#: literals.py:291
 msgid "X Window System"
 msgstr ""
 
-#: literals.py:291
+#: literals.py:292
 msgid "Foveon X3 (Sigma/Polaroid) Raw picture file"
 msgstr ""
 
-#: literals.py:292
+#: literals.py:293
 msgid "X Windows system bitmap (black and white)"
 msgstr ""
 
-#: literals.py:293
+#: literals.py:294
 msgid "Constant image uniform color"
 msgstr ""
 
-#: literals.py:294
+#: literals.py:295
 msgid "GIMP image"
 msgstr ""
 
-#: literals.py:295
+#: literals.py:296
 msgid "Adobe XML metadata"
 msgstr ""
 
-#: literals.py:296
+#: literals.py:297
 msgid "X Windows system pixmap (color)"
 msgstr ""
 
-#: literals.py:297
+#: literals.py:298
 msgid "Microsoft XML Paper Specification"
 msgstr ""
 
-#: literals.py:299
+#: literals.py:300
 msgid "XV thumbnail file"
 msgstr ""
 
-#: literals.py:300
+#: literals.py:301
 msgid "X Windows system window dump (color)"
 msgstr ""
 
-#: literals.py:302
+#: literals.py:303
 msgid "Raw yellow samples"
 msgstr ""
 
-#: literals.py:303
+#: literals.py:304
 msgid "CCIR 601 4:1:1 or 4:2:2 (8-bit only)"
 msgstr ""
 
@@ -891,24 +891,34 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: conf/settings.py:10
+#: conf/settings.py:11
 msgid "File path to imagemagick's convert program."
 msgstr ""
 
-#: conf/settings.py:11
+#: conf/settings.py:12
 msgid "File path to imagemagick's identify program."
 msgstr ""
 
-#: conf/settings.py:12
+#: conf/settings.py:13
 msgid "File path to graphicsmagick's program."
 msgstr ""
 
-#: conf/settings.py:14
+#: conf/settings.py:15
 msgid ""
 "Graphics conversion backend to use.  Options are: converter.backends."
 "imagemagick, converter.backends.graphicsmagick and converter.backends.python."
 msgstr ""
 
+#: conf/settings.py:16
+msgid "Path to the unoconv program."
+msgstr ""
+
+#: conf/settings.py:17
+msgid ""
+"Use alternate method of connection to LibreOffice using a pipe, it is slower "
+"but less prone to segmentation faults."
+msgstr ""
+
 #: templates/converter_file_formats_help.html:3
 msgid "Help"
 msgstr ""
diff --git a/apps/converter/locale/es/LC_MESSAGES/django.mo b/apps/converter/locale/es/LC_MESSAGES/django.mo
index a7df0888f2..30ce640c0d 100644
Binary files a/apps/converter/locale/es/LC_MESSAGES/django.mo and b/apps/converter/locale/es/LC_MESSAGES/django.mo differ
diff --git a/apps/converter/locale/es/LC_MESSAGES/django.po b/apps/converter/locale/es/LC_MESSAGES/django.po
index 4569fd09e4..68d184d9c0 100644
--- a/apps/converter/locale/es/LC_MESSAGES/django.po
+++ b/apps/converter/locale/es/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:44-0400\n"
-"PO-Revision-Date: 2011-11-07 04:30+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 21:01+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -22,861 +22,861 @@ msgstr ""
 msgid "file formats"
 msgstr "formatos de archivo"
 
-#: literals.py:18
+#: literals.py:19
 msgid "Resize"
 msgstr "Cambiar el tamaño"
 
-#: literals.py:19
+#: literals.py:20
 msgid "Resize."
 msgstr "Cambiar el tamaño."
 
-#: literals.py:21 literals.py:36
+#: literals.py:22 literals.py:37
 msgid "width"
 msgstr "ancho"
 
-#: literals.py:22 literals.py:37
+#: literals.py:23 literals.py:38
 msgid "height"
 msgstr "altura"
 
-#: literals.py:26
+#: literals.py:27
 msgid "Rotate"
 msgstr "Girar"
 
-#: literals.py:27
+#: literals.py:28
 msgid "Rotate by n degress."
 msgstr "Girar n grados."
 
-#: literals.py:29
+#: literals.py:30
 msgid "degrees"
 msgstr "grados"
 
-#: literals.py:33
+#: literals.py:34
 msgid "Density"
 msgstr "Densidad"
 
-#: literals.py:34
+#: literals.py:35
 msgid "Change the resolution (ie: DPI) without resizing."
 msgstr "Cambia la resolución (es decir: DPI) sin cambiar el tamaño."
 
-#: literals.py:41
+#: literals.py:42
 msgid "Zoom"
 msgstr "Ampliar"
 
-#: literals.py:42
+#: literals.py:43
 msgid "Zoom by n percent."
 msgstr "Zoom por ciento n."
 
-#: literals.py:44
+#: literals.py:45
 msgid "percent"
 msgstr "por ciento"
 
-#: literals.py:50
+#: literals.py:51
 msgid "Hasselblad Photo RAW, CFV/H3D39II"
 msgstr "Foto Hasselblad RAW, CFV/H3D39II"
 
-#: literals.py:51 literals.py:52
+#: literals.py:52 literals.py:53
 msgid "Photoshop resource format"
 msgstr "Formato de recursos Photoshop"
 
-#: literals.py:53
+#: literals.py:54
 msgid "Photoshop resource text format"
 msgstr "Formato de recursos de texto Photoshop"
 
-#: literals.py:54
+#: literals.py:55
 msgid "Photoshop resource wide text format"
 msgstr "Formato a lo largo de recursos de texto Photoshop"
 
-#: literals.py:56
+#: literals.py:57
 msgid "Raw alpha samples"
 msgstr "Muestras crudas de transparencias"
 
-#: literals.py:57
+#: literals.py:58
 msgid "Adobe Illustrator CS2"
 msgstr "Adobe Illustrator CS2"
 
-#: literals.py:58
+#: literals.py:59
 msgid "Raw application information"
 msgstr "Información cruda de aplicación"
 
-#: literals.py:59
+#: literals.py:60
 msgid "Raw JPEG binary data"
 msgstr "Datos binarios crudos JPEG"
 
-#: literals.py:60
+#: literals.py:61
 msgid "PFS: 1st Publisher Clip Art"
 msgstr "Galería de imágenes de PFS: 1st Publisher"
 
-#: literals.py:61
+#: literals.py:62
 msgid "Sony Alpha DSLR Raw Image Format"
 msgstr "Formato de imagen crudas Sony Alpha DSLR"
 
-#: literals.py:62
+#: literals.py:63
 msgid "Microsoft Audio/Visual Interleaved"
 msgstr "Microsoft Audio / Visual Entrelazado"
 
-#: literals.py:63
+#: literals.py:64
 msgid "AVS X image"
 msgstr "Imagen AVS X"
 
-#: literals.py:65
+#: literals.py:66
 msgid "Raw blue samples"
 msgstr "Muestras crudas de color azul"
 
-#: literals.py:66
+#: literals.py:67
 msgid "Raw blue, green, and red samples"
 msgstr "Muestras crudas de colores azul, verde y rojo"
 
-#: literals.py:67
+#: literals.py:68
 msgid "Raw blue, green, red and alpha samples"
 msgstr "Muestras crudas de colores azul, verde, rojo y transparencias"
 
-#: literals.py:68
+#: literals.py:69
 msgid "Microsoft Windows bitmap image"
 msgstr "Microsoft Windows bitmap image"
 
-#: literals.py:69
-msgid "Microsoft Windows bitmap image version 2"
-msgstr ""
-
 #: literals.py:70
-msgid "Microsoft Windows bitmap image version 3"
-msgstr ""
+msgid "Microsoft Windows bitmap image version 2"
+msgstr "Imagen de mapa de bits de Microsoft Windows versión 2"
 
 #: literals.py:71
+msgid "Microsoft Windows bitmap image version 3"
+msgstr "Imagen de mapa de bits de Microsoft Windows versión 3"
+
+#: literals.py:72
 msgid "BRF ASCII Braille format"
 msgstr "Formato BRF ASCII Braille"
 
-#: literals.py:72
+#: literals.py:73
 msgid "Raw blue, red, and green samples"
 msgstr "Muestras crudas de colores azul, verde y rojo"
 
-#: literals.py:74
+#: literals.py:75
 msgid "Raw cyan samples"
 msgstr "Muestras crudas de color cian"
 
-#: literals.py:75 literals.py:180
+#: literals.py:76 literals.py:181
 msgid "Magick Persistent Cache image format"
-msgstr ""
+msgstr "Formato de imagen Magick Persistent Cache"
 
-#: literals.py:76 literals.py:77
+#: literals.py:77 literals.py:78
 msgid "Continuous Acquisition and Life-cycle Support Type 1 image"
-msgstr ""
+msgstr "Imagen de Continuous Acquisition and Life-cycle Support tipo 1 "
 
-#: literals.py:78
+#: literals.py:79
 msgid "Image caption"
 msgstr "Descripción de imagen"
 
-#: literals.py:79
+#: literals.py:80
 msgid "Cineon Image File"
 msgstr "Archivo de imagen Cineon"
 
-#: literals.py:80
-msgid "Cisco IP phone image format"
-msgstr ""
-
 #: literals.py:81
-msgid "Image Clip Mask"
-msgstr ""
+msgid "Cisco IP phone image format"
+msgstr "Formato de imagen de Teléfono IP de Cisco"
 
 #: literals.py:82
-msgid "Raw cyan, magenta, yellow, and black samples"
-msgstr ""
+msgid "Image Clip Mask"
+msgstr "Image Clip Mask"
 
 #: literals.py:83
-msgid "Raw cyan, magenta, yellow, black, and opacity samples"
-msgstr ""
+msgid "Raw cyan, magenta, yellow, and black samples"
+msgstr "Muestras crudas de cian, magenta, amarillo y negro"
 
-#: literals.py:84 literals.py:85
+#: literals.py:84
+msgid "Raw cyan, magenta, yellow, black, and opacity samples"
+msgstr "Muestras crudas de cian, magenta, amarillo, negro y opacidad"
+
+#: literals.py:85 literals.py:86
 msgid "Canon Digital Camera Raw Image Format"
 msgstr ""
 
-#: literals.py:86
+#: literals.py:87
 msgid "Microsoft Cursor Icon"
 msgstr "Emblema de cursor Microsoft"
 
-#: literals.py:87
+#: literals.py:88
 msgid "DR Halo"
 msgstr "DR Halo"
 
-#: literals.py:89
+#: literals.py:90
 msgid "Digital Imaging and Communications in Medicine image"
 msgstr ""
 
-#: literals.py:90
+#: literals.py:91
 msgid "Kodak Digital Camera Raw Image File"
 msgstr ""
 
-#: literals.py:91
+#: literals.py:92
 msgid "ZSoft IBM PC multi-page Paintbrush"
 msgstr ""
 
-#: literals.py:92
+#: literals.py:93
 msgid "Microsoft DirectDraw Surface"
 msgstr ""
 
-#: literals.py:93
+#: literals.py:94
 msgid "Multi-face font package (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:94
+#: literals.py:95
 msgid "Déjà vu"
 msgstr "Déjà vu"
 
-#: literals.py:95
+#: literals.py:96
 msgid "Adobe Digital Negative"
 msgstr "Adobe Digital Negative"
 
-#: literals.py:96
+#: literals.py:97
 msgid "Graphviz"
 msgstr "Graphviz"
 
-#: literals.py:97
+#: literals.py:98
 msgid "SMPTE 268M-2003 (DPX 2.0)"
 msgstr ""
 
-#: literals.py:99
+#: literals.py:100
 msgid "Encapsulated Portable Document Format"
 msgstr ""
 
-#: literals.py:100 literals.py:105
+#: literals.py:101 literals.py:106
 msgid "Adobe Encapsulated PostScript Interchange format"
 msgstr ""
 
-#: literals.py:101 literals.py:104
+#: literals.py:102 literals.py:105
 msgid "Adobe Encapsulated PostScript"
 msgstr ""
 
-#: literals.py:102
+#: literals.py:103
 msgid "Adobe Level II Encapsulated PostScript"
 msgstr ""
 
-#: literals.py:103
+#: literals.py:104
 msgid "Adobe Level III Encapsulated PostScript"
 msgstr ""
 
-#: literals.py:106
+#: literals.py:107
 msgid "Adobe Encapsulated PostScript with TIFF preview"
 msgstr ""
 
-#: literals.py:107
+#: literals.py:108
 msgid "Adobe Level II Encapsulated PostScript with TIFF preview"
 msgstr ""
 
-#: literals.py:108
+#: literals.py:109
 msgid "Adobe Level III Encapsulated PostScript with TIFF preview"
 msgstr ""
 
-#: literals.py:109
+#: literals.py:110
 msgid "Epson RAW Format"
 msgstr ""
 
-#: literals.py:110
+#: literals.py:111
 msgid "Exif digital camera binary data"
 msgstr ""
 
-#: literals.py:111
+#: literals.py:112
 msgid "High Dynamic-range (HDR)"
 msgstr ""
 
-#: literals.py:113
+#: literals.py:114
 msgid "Group 3 FAX (Not TIFF Group3 FAX)"
 msgstr ""
 
-#: literals.py:114
+#: literals.py:115
 msgid "Autodesk FLI animations file"
 msgstr ""
 
-#: literals.py:115
+#: literals.py:116
 msgid "Autodesk FLC animations file"
 msgstr ""
 
-#: literals.py:116 literals.py:119
+#: literals.py:117 literals.py:120
 msgid "Flexible Image Transport System"
 msgstr ""
 
-#: literals.py:117
+#: literals.py:118
 msgid "Kodak FlashPix file"
 msgstr ""
 
-#: literals.py:118 literals.py:224
+#: literals.py:119 literals.py:225
 msgid "Plasma fractal image"
 msgstr ""
 
-#: literals.py:121
+#: literals.py:122
 msgid "Raw green samples"
 msgstr ""
 
-#: literals.py:122
+#: literals.py:123
 msgid "Group 3 FAX"
 msgstr ""
 
-#: literals.py:123
+#: literals.py:124
 msgid "Raw green, blue, and red samples"
 msgstr ""
 
-#: literals.py:124
+#: literals.py:125
 msgid "GIMP brush file"
 msgstr ""
 
-#: literals.py:125
+#: literals.py:126
 msgid "CompuServe graphics interchange format (version 89a)"
 msgstr ""
 
-#: literals.py:126
+#: literals.py:127
 msgid "CompuServe graphics interchange format (version 87a)"
 msgstr ""
 
-#: literals.py:127
+#: literals.py:128
 msgid "Gradual passing from one shade to another"
 msgstr ""
 
-#: literals.py:128
+#: literals.py:129
 msgid "Raw gray samples"
 msgstr ""
 
-#: literals.py:129
+#: literals.py:130
 msgid "Raw green, red, and blue samples"
 msgstr ""
 
-#: literals.py:130
+#: literals.py:131
 msgid "Raw CCITT Group4"
 msgstr ""
 
-#: literals.py:132
+#: literals.py:133
 msgid "Histogram of the image"
 msgstr ""
 
-#: literals.py:133
+#: literals.py:134
 msgid "HRZ: Slow scan TV"
 msgstr ""
 
-#: literals.py:134 literals.py:135 literals.py:254
+#: literals.py:135 literals.py:136 literals.py:255
 msgid "Hypertext Markup Language and a client-side image map"
 msgstr ""
 
-#: literals.py:137 literals.py:263 literals.py:278 literals.py:282
+#: literals.py:138 literals.py:264 literals.py:279 literals.py:283
 msgid "Truevision Targa image"
 msgstr ""
 
-#: literals.py:138 literals.py:139
+#: literals.py:139 literals.py:140
 msgid "ICC Color Profile"
 msgstr ""
 
-#: literals.py:140 literals.py:141
+#: literals.py:141 literals.py:142
 msgid "Microsoft Icon"
 msgstr ""
 
-#: literals.py:142
+#: literals.py:143
 msgid "Hald CLUT identity image"
 msgstr ""
 
-#: literals.py:143
+#: literals.py:144
 msgid "LabEye image format"
 msgstr ""
 
-#: literals.py:144
+#: literals.py:145
 msgid "GraphicsMagick Embedded Image"
 msgstr ""
 
-#: literals.py:145
+#: literals.py:146
 msgid "The image format and characteristics"
 msgstr ""
 
-#: literals.py:146
+#: literals.py:147
 msgid "Base64-encoded inline images"
 msgstr ""
 
-#: literals.py:147
+#: literals.py:148
 msgid "IPL Image Sequence"
 msgstr ""
 
-#: literals.py:148
+#: literals.py:149
 msgid "IPTC Newsphoto"
 msgstr ""
 
-#: literals.py:149 literals.py:150
+#: literals.py:150 literals.py:151
 msgid "IPTC Newsphoto text format"
 msgstr ""
 
-#: literals.py:151
+#: literals.py:152
 msgid "ISO/TR 11548-1 format"
 msgstr ""
 
-#: literals.py:153 literals.py:156
+#: literals.py:154 literals.py:157
 msgid "JPEG-2000 Code Stream Syntax"
 msgstr ""
 
-#: literals.py:154
+#: literals.py:155
 msgid "JPEG Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:155
+#: literals.py:156
 msgid "JPEG-2000 JP2 File Format Syntax"
 msgstr ""
 
-#: literals.py:157 literals.py:158
+#: literals.py:158 literals.py:159
 msgid "Joint Photographic Experts Group JFIF format (IJG JPEG 62)"
 msgstr ""
 
-#: literals.py:159
+#: literals.py:160
 msgid "JPEG-2000 File Format Syntax"
 msgstr ""
 
-#: literals.py:161
+#: literals.py:162
 msgid "Raw black samples"
 msgstr ""
 
-#: literals.py:162 literals.py:163
+#: literals.py:163 literals.py:164
 msgid "Kodak Digital Camera Raw Image Format"
 msgstr ""
 
-#: literals.py:165
+#: literals.py:166
 msgid "Image label"
 msgstr ""
 
-#: literals.py:167
+#: literals.py:168
 msgid "Raw magenta samples"
 msgstr ""
 
-#: literals.py:168 literals.py:178 literals.py:181 literals.py:182
+#: literals.py:169 literals.py:179 literals.py:182 literals.py:183
 msgid "MPEG Video Stream"
 msgstr ""
 
-#: literals.py:169
+#: literals.py:170
 msgid "Raw MPEG-4 Video"
 msgstr ""
 
-#: literals.py:170
+#: literals.py:171
 msgid "Colormap intensities and indices"
 msgstr ""
 
-#: literals.py:171
+#: literals.py:172
 msgid "MATLAB image format"
 msgstr ""
 
-#: literals.py:172
+#: literals.py:173
 msgid "MATTE raw opacity format"
 msgstr ""
 
-#: literals.py:173
+#: literals.py:174
 msgid "8-bit McIdas area file"
 msgstr ""
 
-#: literals.py:174
+#: literals.py:175
 msgid "Microsoft Image Composer (MIC) file"
 msgstr ""
 
-#: literals.py:175
+#: literals.py:176
 msgid "Magick Image File Format"
 msgstr ""
 
-#: literals.py:176
+#: literals.py:177
 msgid ""
 "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:177
+#: literals.py:178
 msgid "Raw Bi-level bitmap in least-significant-byte first order"
 msgstr ""
 
-#: literals.py:179
+#: literals.py:180
 msgid "MPEG-4 Video Stream"
 msgstr ""
 
-#: literals.py:183
+#: literals.py:184
 msgid "Sony (Minolta) Raw Image File"
 msgstr ""
 
-#: literals.py:184
+#: literals.py:185
 msgid "Magick Scripting Language"
 msgstr ""
 
-#: literals.py:185
+#: literals.py:186
 msgid "Windows 1 and 2 MSP file format"
 msgstr ""
 
-#: literals.py:186
+#: literals.py:187
 msgid "ImageMagick's own SVG internal renderer"
 msgstr ""
 
-#: literals.py:187
+#: literals.py:188
 msgid "MTV Raytracing image format"
 msgstr ""
 
-#: literals.py:188
+#: literals.py:189
 msgid "Magick Vector Graphics"
 msgstr ""
 
-#: literals.py:190
+#: literals.py:191
 msgid "Nikon Digital SLR Camera Raw Image File"
 msgstr ""
 
-#: literals.py:191
+#: literals.py:192
 msgid "Constant image of uniform color"
 msgstr ""
 
-#: literals.py:193
+#: literals.py:194
 msgid "Raw opacity samples"
 msgstr ""
 
-#: literals.py:194
+#: literals.py:195
 msgid "Olympus Digital Camera Raw Image File"
 msgstr ""
 
-#: literals.py:195
+#: literals.py:196
 msgid "On-the-air bitmap"
 msgstr ""
 
-#: literals.py:196
+#: literals.py:197
 msgid "Open Type font (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:198
+#: literals.py:199
 msgid "Xv thumbnail format"
 msgstr ""
 
-#: literals.py:199 literals.py:276
+#: literals.py:200 literals.py:277
 msgid "16bit/pixel interleaved YUV"
 msgstr ""
 
-#: literals.py:200
+#: literals.py:201
 msgid "Palm pixmap"
 msgstr ""
 
-#: literals.py:201
+#: literals.py:202
 msgid "Common 2-dimensional bitmap format"
 msgstr ""
 
-#: literals.py:202
+#: literals.py:203
 msgid "Predefined pattern"
 msgstr ""
 
-#: literals.py:203
+#: literals.py:204
 msgid "Portable bitmap format (black and white)"
 msgstr ""
 
-#: literals.py:204 literals.py:205
+#: literals.py:205 literals.py:206
 msgid "Photo CD"
 msgstr ""
 
-#: literals.py:206
+#: literals.py:207
 msgid "Page Control Language"
 msgstr ""
 
-#: literals.py:207 literals.py:220
+#: literals.py:208 literals.py:221
 msgid "Apple Macintosh QuickDraw/PICT"
 msgstr ""
 
-#: literals.py:208
+#: literals.py:209
 msgid "ZSoft IBM PC Paintbrush"
 msgstr ""
 
-#: literals.py:209
+#: literals.py:210
 msgid "Palm Database ImageViewer Format"
 msgstr ""
 
-#: literals.py:210
+#: literals.py:211
 msgid "Portable Document Format"
 msgstr ""
 
-#: literals.py:211
+#: literals.py:212
 msgid "Portable Document Archive Format"
 msgstr ""
 
-#: literals.py:212
+#: literals.py:213
 msgid "Pentax Electronic File"
 msgstr ""
 
-#: literals.py:213
+#: literals.py:214
 msgid "Embrid Embroidery Format"
 msgstr ""
 
-#: literals.py:214
+#: literals.py:215
 msgid "Postscript Type 1 font (ASCII) (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:215
+#: literals.py:216
 msgid "Postscript Type 1 font (binary) (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:216
+#: literals.py:217
 msgid "Portable float format"
 msgstr ""
 
-#: literals.py:217
+#: literals.py:218
 msgid "Portable graymap format (gray scale)"
 msgstr ""
 
-#: literals.py:218
+#: literals.py:219
 msgid "JPEG-2000 VM Format"
 msgstr ""
 
-#: literals.py:219
+#: literals.py:220
 msgid "Personal Icon"
 msgstr ""
 
-#: literals.py:221
+#: literals.py:222
 msgid "Alias/Wavefront RLE image format"
 msgstr ""
 
-#: literals.py:222
+#: literals.py:223
 msgid "PIXAR raster file"
 msgstr ""
 
-#: literals.py:223
+#: literals.py:224
 msgid "Joint Photographic Experts Group JFIF format (62)"
 msgstr ""
 
-#: literals.py:225
+#: literals.py:226
 msgid "Portable Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:226
+#: literals.py:227
 msgid ""
 "24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:227
+#: literals.py:228
 msgid ""
 "32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:228
+#: literals.py:229
 msgid ""
 "8-bit indexed PNG, binary transparency only (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 msgstr ""
 
-#: literals.py:229
+#: literals.py:230
 msgid "Portable anymap"
 msgstr ""
 
-#: literals.py:230
+#: literals.py:231
 msgid "Portable pixmap format (color)"
 msgstr ""
 
-#: literals.py:231
+#: literals.py:232
 msgid "Show a preview an image enhancement, effect, or f/x"
 msgstr ""
 
-#: literals.py:232
+#: literals.py:233
 msgid "Adobe PostScript"
 msgstr ""
 
-#: literals.py:233
+#: literals.py:234
 msgid "Adobe Level II PostScript"
 msgstr ""
 
-#: literals.py:234
+#: literals.py:235
 msgid "Adobe Level III PostScript"
 msgstr ""
 
-#: literals.py:235
+#: literals.py:236
 msgid "Adobe Large Document Format"
 msgstr ""
 
-#: literals.py:236
+#: literals.py:237
 msgid "Adobe Photoshop bitmap"
 msgstr ""
 
-#: literals.py:237
+#: literals.py:238
 msgid "Pyramid encoded TIFF"
 msgstr ""
 
-#: literals.py:238 literals.py:252
+#: literals.py:239 literals.py:253
 msgid "Seattle Film Works"
 msgstr ""
 
-#: literals.py:240
+#: literals.py:241
 msgid "Raw red samples"
 msgstr ""
 
-#: literals.py:241
+#: literals.py:242
 msgid "Fuji CCD-RAW Graphic File"
 msgstr ""
 
-#: literals.py:242 literals.py:258
+#: literals.py:243 literals.py:259
 msgid "SUN Rasterfile"
 msgstr ""
 
-#: literals.py:243
+#: literals.py:244
 msgid "Raw red, blue, and green samples"
 msgstr ""
 
-#: literals.py:244
+#: literals.py:245
 msgid "Raw red, green, and blue samples"
 msgstr ""
 
-#: literals.py:245
+#: literals.py:246
 msgid "Raw red, green, blue, and matte samples"
 msgstr ""
 
-#: literals.py:246
+#: literals.py:247
 msgid "Raw red, green, blue, and opacity samples"
 msgstr ""
 
-#: literals.py:247
+#: literals.py:248
 msgid "Alias/Wavefront image"
 msgstr ""
 
-#: literals.py:248
+#: literals.py:249
 msgid "Utah Run length encoded image"
 msgstr ""
 
-#: literals.py:250
+#: literals.py:251
 msgid "ZX-Spectrum SCREEN$"
 msgstr ""
 
-#: literals.py:251
+#: literals.py:252
 msgid "Scitex HandShake"
 msgstr ""
 
-#: literals.py:253
+#: literals.py:254
 msgid "Irix RGB image"
 msgstr ""
 
-#: literals.py:255
+#: literals.py:256
 msgid "Sony Raw Format 2"
 msgstr ""
 
-#: literals.py:256
+#: literals.py:257
 msgid "Sony Raw Format"
 msgstr ""
 
-#: literals.py:257
+#: literals.py:258
 msgid "Steganographic image"
 msgstr ""
 
-#: literals.py:259
+#: literals.py:260
 msgid "Scalable Vector Graphics (XML 2.7.6, RSVG 2.32.0)"
 msgstr ""
 
-#: literals.py:260
+#: literals.py:261
 msgid "Scalable Vector Graphics (ZIP compressed) (XML 2.7.6, RSVG 2.32.0)"
 msgstr ""
 
-#: literals.py:262 literals.py:272
+#: literals.py:263 literals.py:273
 msgid "Text"
 msgstr ""
 
-#: literals.py:264
+#: literals.py:265
 msgid "EXIF Profile Thumbnail"
 msgstr ""
 
-#: literals.py:265
+#: literals.py:266
 msgid "Tagged Image File Format (LIBTIFF, Version 3.9.4)"
 msgstr ""
 
-#: literals.py:266
+#: literals.py:267
 msgid "Tagged Image File Format (64-bit) (LIBTIFF, Version 3.9.4)"
 msgstr ""
 
-#: literals.py:267
+#: literals.py:268
 msgid "Tile image with a texture"
 msgstr ""
 
-#: literals.py:268
+#: literals.py:269
 msgid "PSX TIM"
 msgstr ""
 
-#: literals.py:269
+#: literals.py:270
 msgid "TOPOL X Image"
 msgstr ""
 
-#: literals.py:270
+#: literals.py:271
 msgid "TrueType font collection (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:271
+#: literals.py:272
 msgid "TrueType font (Freetype 2.4.2)"
 msgstr ""
 
-#: literals.py:274
+#: literals.py:275
 msgid "Unicode Text format"
 msgstr ""
 
-#: literals.py:275
+#: literals.py:276
 msgid "X-Motif UIL table"
 msgstr ""
 
-#: literals.py:279
+#: literals.py:280
 msgid "VICAR rasterfile format"
 msgstr ""
 
-#: literals.py:280
+#: literals.py:281
 msgid "Visual Image Directory"
 msgstr ""
 
-#: literals.py:281 literals.py:298
+#: literals.py:282 literals.py:299
 msgid "Khoros Visualization image"
 msgstr ""
 
-#: literals.py:284
+#: literals.py:285
 msgid "Wireless Bitmap (level 0) image"
 msgstr ""
 
-#: literals.py:285
+#: literals.py:286
 msgid "Windows Meta File"
 msgstr ""
 
-#: literals.py:286
+#: literals.py:287
 msgid "Word Perfect Graphics"
 msgstr ""
 
-#: literals.py:287
+#: literals.py:288
 msgid "Windows Media Video"
 msgstr ""
 
-#: literals.py:288
+#: literals.py:289
 msgid "Compressed Windows Meta File"
 msgstr ""
 
-#: literals.py:290
+#: literals.py:291
 msgid "X Window System"
 msgstr ""
 
-#: literals.py:291
+#: literals.py:292
 msgid "Foveon X3 (Sigma/Polaroid) Raw picture file"
 msgstr ""
 
-#: literals.py:292
+#: literals.py:293
 msgid "X Windows system bitmap (black and white)"
 msgstr ""
 
-#: literals.py:293
+#: literals.py:294
 msgid "Constant image uniform color"
 msgstr ""
 
-#: literals.py:294
-msgid "GIMP image"
-msgstr ""
-
 #: literals.py:295
+msgid "GIMP image"
+msgstr "Imágen GIMP"
+
+#: literals.py:296
 msgid "Adobe XML metadata"
 msgstr ""
 
-#: literals.py:296
+#: literals.py:297
 msgid "X Windows system pixmap (color)"
 msgstr ""
 
-#: literals.py:297
+#: literals.py:298
 msgid "Microsoft XML Paper Specification"
 msgstr ""
 
-#: literals.py:299
+#: literals.py:300
 msgid "XV thumbnail file"
 msgstr ""
 
-#: literals.py:300
+#: literals.py:301
 msgid "X Windows system window dump (color)"
 msgstr ""
 
-#: literals.py:302
-msgid "Raw yellow samples"
-msgstr ""
-
 #: literals.py:303
+msgid "Raw yellow samples"
+msgstr "Muestras crudas de amarillo"
+
+#: literals.py:304
 msgid "CCIR 601 4:1:1 or 4:2:2 (8-bit only)"
 msgstr ""
 
@@ -892,19 +892,19 @@ msgstr "nombre"
 msgid "description"
 msgstr "descripción"
 
-#: conf/settings.py:10
+#: conf/settings.py:11
 msgid "File path to imagemagick's convert program."
 msgstr "Ruta de archivo al programa de imagemagick, convert."
 
-#: conf/settings.py:11
+#: conf/settings.py:12
 msgid "File path to imagemagick's identify program."
 msgstr "Ruta de archivo al programa de imagemagick, identify."
 
-#: conf/settings.py:12
+#: conf/settings.py:13
 msgid "File path to graphicsmagick's program."
 msgstr "Ruta de archivo al programa imagemagick."
 
-#: conf/settings.py:14
+#: conf/settings.py:15
 msgid ""
 "Graphics conversion backend to use.  Options are: "
 "converter.backends.imagemagick, converter.backends.graphicsmagick and "
@@ -914,6 +914,18 @@ msgstr ""
 "converter.backends.imagemagick, converter.backends.graphicsmagick y "
 "converter.backends.python."
 
+#: conf/settings.py:16
+msgid "Path to the unoconv program."
+msgstr "Ruta de acceso al programa de unoconv."
+
+#: conf/settings.py:17
+msgid ""
+"Use alternate method of connection to LibreOffice using a pipe, it is slower"
+" but less prone to segmentation faults."
+msgstr ""
+"Utilizar el método alternativo de conexión a LibreOffice con un tubo, es más"
+" lento pero menos propensos a fallos de segmentación."
+
 #: templates/converter_file_formats_help.html:3
 msgid "Help"
 msgstr "Ayuda"
diff --git a/apps/converter/locale/pt/LC_MESSAGES/django.po b/apps/converter/locale/pt/LC_MESSAGES/django.po
index e97db7bdf0..47d15e7686 100644
--- a/apps/converter/locale/pt/LC_MESSAGES/django.po
+++ b/apps/converter/locale/pt/LC_MESSAGES/django.po
@@ -1,654 +1,654 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 # Renata Oliveira <renatabels@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:44-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 00:24+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:10
 msgid "file formats"
 msgstr "formatos de arquivo"
 
-#: literals.py:18
+#: literals.py:19
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: literals.py:19
+#: literals.py:20
 msgid "Resize."
 msgstr "Redimensionar."
 
-#: literals.py:21 literals.py:36
+#: literals.py:22 literals.py:37
 msgid "width"
 msgstr "largura"
 
-#: literals.py:22 literals.py:37
+#: literals.py:23 literals.py:38
 msgid "height"
 msgstr "altura"
 
-#: literals.py:26
+#: literals.py:27
 msgid "Rotate"
 msgstr "Rodar"
 
-#: literals.py:27
+#: literals.py:28
 msgid "Rotate by n degress."
 msgstr "Rodar por n graus."
 
-#: literals.py:29
+#: literals.py:30
 msgid "degrees"
 msgstr "graus"
 
-#: literals.py:33
+#: literals.py:34
 msgid "Density"
 msgstr "Densidade"
 
-#: literals.py:34
+#: literals.py:35
 msgid "Change the resolution (ie: DPI) without resizing."
 msgstr "Alterar a resolução (ie: DPI), sem redimensionamento."
 
-#: literals.py:41
+#: literals.py:42
 msgid "Zoom"
 msgstr "Zoom"
 
-#: literals.py:42
+#: literals.py:43
 msgid "Zoom by n percent."
 msgstr "Zoom por n percento."
 
-#: literals.py:44
+#: literals.py:45
 msgid "percent"
 msgstr "por cento"
 
-#: literals.py:50
+#: literals.py:51
 msgid "Hasselblad Photo RAW, CFV/H3D39II"
 msgstr "Hasselblad Photo RAW, CFV/H3D39II"
 
-#: literals.py:51 literals.py:52
+#: literals.py:52 literals.py:53
 msgid "Photoshop resource format"
 msgstr "Recurso de formato do Photoshop"
 
-#: literals.py:53
+#: literals.py:54
 msgid "Photoshop resource text format"
 msgstr "Recurso de formato de texto do Photoshop"
 
-#: literals.py:54
+#: literals.py:55
 msgid "Photoshop resource wide text format"
 msgstr "Recurso de formato de texto de largura do Photoshop"
 
-#: literals.py:56
+#: literals.py:57
 msgid "Raw alpha samples"
 msgstr "Amostras Raw alpha"
 
-#: literals.py:57
+#: literals.py:58
 msgid "Adobe Illustrator CS2"
 msgstr "Adobe Illustrator CS2"
 
-#: literals.py:58
+#: literals.py:59
 msgid "Raw application information"
 msgstr "Informações do aplicativo RAW"
 
-#: literals.py:59
+#: literals.py:60
 msgid "Raw JPEG binary data"
 msgstr "Dados binários de RAW JPEG"
 
-#: literals.py:60
+#: literals.py:61
 msgid "PFS: 1st Publisher Clip Art"
 msgstr "PFS: 1st Publisher Clip Art"
 
-#: literals.py:61
+#: literals.py:62
 msgid "Sony Alpha DSLR Raw Image Format"
 msgstr "Sony Alpha DSLR formato de imagem RAW"
 
-#: literals.py:62
+#: literals.py:63
 msgid "Microsoft Audio/Visual Interleaved"
 msgstr "Microsoft Audio/Visual Interleaved"
 
-#: literals.py:63
+#: literals.py:64
 msgid "AVS X image"
 msgstr "AVS X imagem"
 
-#: literals.py:65
+#: literals.py:66
 msgid "Raw blue samples"
 msgstr "Amostras RAW azul"
 
-#: literals.py:66
+#: literals.py:67
 msgid "Raw blue, green, and red samples"
 msgstr "Amostras RAW azul, verde e vermelho."
 
-#: literals.py:67
+#: literals.py:68
 msgid "Raw blue, green, red and alpha samples"
 msgstr "Amostras Raw azul, verde, vermelho e alfa"
 
-#: literals.py:68
+#: literals.py:69
 msgid "Microsoft Windows bitmap image"
 msgstr "Imagem bitmap do Microsoft Windows"
 
-#: literals.py:69
+#: literals.py:70
 msgid "Microsoft Windows bitmap image version 2"
 msgstr "Imagem bitmap Microsoft Windows versão 2 "
 
-#: literals.py:70
+#: literals.py:71
 msgid "Microsoft Windows bitmap image version 3"
 msgstr "Imagem bitmap Microsoft Windows versão 3"
 
-#: literals.py:71
+#: literals.py:72
 msgid "BRF ASCII Braille format"
 msgstr "BRF ASCII Braille format"
 
-#: literals.py:72
+#: literals.py:73
 msgid "Raw blue, red, and green samples"
 msgstr "Amostras Raw Azul, vermelho, verde"
 
-#: literals.py:74
+#: literals.py:75
 msgid "Raw cyan samples"
 msgstr "Amostras Raw ciano"
 
-#: literals.py:75 literals.py:180
+#: literals.py:76 literals.py:181
 msgid "Magick Persistent Cache image format"
 msgstr "Magick Persistent Cache image format"
 
-#: literals.py:76 literals.py:77
+#: literals.py:77 literals.py:78
 msgid "Continuous Acquisition and Life-cycle Support Type 1 image"
 msgstr "Continuous Acquisition and Life-cycle Support Type 1 image"
 
-#: literals.py:78
+#: literals.py:79
 msgid "Image caption"
 msgstr "Legenda da foto"
 
-#: literals.py:79
+#: literals.py:80
 msgid "Cineon Image File"
 msgstr "Cineon Arquivo de Imagem"
 
-#: literals.py:80
+#: literals.py:81
 msgid "Cisco IP phone image format"
 msgstr "Cisco IP phone image format"
 
-#: literals.py:81
+#: literals.py:82
 msgid "Image Clip Mask"
 msgstr "Image Clip Mask"
 
-#: literals.py:82
+#: literals.py:83
 msgid "Raw cyan, magenta, yellow, and black samples"
 msgstr "Amostras Raw ciano, magenta, amarelo e preto"
 
-#: literals.py:83
+#: literals.py:84
 msgid "Raw cyan, magenta, yellow, black, and opacity samples"
 msgstr "Amostras Raw ciano, magenta, amarelo, preto e opacidade"
 
-#: literals.py:84 literals.py:85
+#: literals.py:85 literals.py:86
 msgid "Canon Digital Camera Raw Image Format"
 msgstr "Canon Digital Camera Raw Image Format"
 
-#: literals.py:86
+#: literals.py:87
 msgid "Microsoft Cursor Icon"
 msgstr "Microsoft Cursor Icon"
 
-#: literals.py:87
+#: literals.py:88
 msgid "DR Halo"
 msgstr "DR Halo"
 
-#: literals.py:89
+#: literals.py:90
 msgid "Digital Imaging and Communications in Medicine image"
 msgstr "Digital Imaging and Communications in Medicine imagem"
 
-#: literals.py:90
+#: literals.py:91
 msgid "Kodak Digital Camera Raw Image File"
 msgstr "Kodak Digital Camera Raw Image File"
 
-#: literals.py:91
+#: literals.py:92
 msgid "ZSoft IBM PC multi-page Paintbrush"
 msgstr "ZSoft IBM PC multi-page Paintbrush"
 
-#: literals.py:92
+#: literals.py:93
 msgid "Microsoft DirectDraw Surface"
 msgstr "Microsoft DirectDraw Surface"
 
-#: literals.py:93
+#: literals.py:94
 msgid "Multi-face font package (Freetype 2.4.2)"
 msgstr "Multi-face font package (Freetype 2.4.2)"
 
-#: literals.py:94
+#: literals.py:95
 msgid "Déjà vu"
 msgstr "Déjà vu"
 
-#: literals.py:95
+#: literals.py:96
 msgid "Adobe Digital Negative"
 msgstr "Adobe Digital Negative"
 
-#: literals.py:96
+#: literals.py:97
 msgid "Graphviz"
 msgstr "Graphviz"
 
-#: literals.py:97
+#: literals.py:98
 msgid "SMPTE 268M-2003 (DPX 2.0)"
 msgstr "SMPTE 268M-2003 (DPX 2.0)"
 
-#: literals.py:99
+#: literals.py:100
 msgid "Encapsulated Portable Document Format"
 msgstr "Formato de Documento Portátil encapsulado"
 
-#: literals.py:100 literals.py:105
+#: literals.py:101 literals.py:106
 msgid "Adobe Encapsulated PostScript Interchange format"
 msgstr "Adobe PostScript formato encapsulado Interchange"
 
-#: literals.py:101 literals.py:104
+#: literals.py:102 literals.py:105
 msgid "Adobe Encapsulated PostScript"
 msgstr "Adobe Encapsulated PostScript"
 
-#: literals.py:102
+#: literals.py:103
 msgid "Adobe Level II Encapsulated PostScript"
 msgstr "Adobe Level II Encapsulated PostScript"
 
-#: literals.py:103
+#: literals.py:104
 msgid "Adobe Level III Encapsulated PostScript"
 msgstr "Adobe Level III Encapsulated PostScript"
 
-#: literals.py:106
+#: literals.py:107
 msgid "Adobe Encapsulated PostScript with TIFF preview"
 msgstr "Adobe Encapsulated PostScript with TIFF preview"
 
-#: literals.py:107
+#: literals.py:108
 msgid "Adobe Level II Encapsulated PostScript with TIFF preview"
 msgstr "Adobe Level II Encapsulated PostScript with TIFF preview"
 
-#: literals.py:108
+#: literals.py:109
 msgid "Adobe Level III Encapsulated PostScript with TIFF preview"
 msgstr "Adobe Level III Encapsulated PostScript with TIFF preview"
 
-#: literals.py:109
+#: literals.py:110
 msgid "Epson RAW Format"
 msgstr "Formato RAW Epson"
 
-#: literals.py:110
+#: literals.py:111
 msgid "Exif digital camera binary data"
 msgstr "Exif binário de dados digitais da câmera"
 
-#: literals.py:111
+#: literals.py:112
 msgid "High Dynamic-range (HDR)"
 msgstr "High Dynamic-range (HDR)"
 
-#: literals.py:113
+#: literals.py:114
 msgid "Group 3 FAX (Not TIFF Group3 FAX)"
 msgstr "Group 3 FAX (Not TIFF Group3 FAX)"
 
-#: literals.py:114
+#: literals.py:115
 msgid "Autodesk FLI animations file"
 msgstr "Autodesk FLI animations file"
 
-#: literals.py:115
+#: literals.py:116
 msgid "Autodesk FLC animations file"
 msgstr "Autodesk FLC animations file"
 
-#: literals.py:116 literals.py:119
+#: literals.py:117 literals.py:120
 msgid "Flexible Image Transport System"
 msgstr "Flexible Image Transport System"
 
-#: literals.py:117
+#: literals.py:118
 msgid "Kodak FlashPix file"
 msgstr "Kodak FlashPix file"
 
-#: literals.py:118 literals.py:224
+#: literals.py:119 literals.py:225
 msgid "Plasma fractal image"
 msgstr "Plasma fractal image"
 
-#: literals.py:121
+#: literals.py:122
 msgid "Raw green samples"
 msgstr "Amostras RAW verdes"
 
-#: literals.py:122
+#: literals.py:123
 msgid "Group 3 FAX"
 msgstr "Group 3 FAX"
 
-#: literals.py:123
+#: literals.py:124
 msgid "Raw green, blue, and red samples"
 msgstr "Amostras RAW verde, azul e vermelho"
 
-#: literals.py:124
+#: literals.py:125
 msgid "GIMP brush file"
 msgstr "GIMP brush file"
 
-#: literals.py:125
+#: literals.py:126
 msgid "CompuServe graphics interchange format (version 89a)"
 msgstr "CompuServe graphics interchange format (version 89a)"
 
-#: literals.py:126
+#: literals.py:127
 msgid "CompuServe graphics interchange format (version 87a)"
 msgstr "CompuServe graphics interchange format (version 87a)"
 
-#: literals.py:127
+#: literals.py:128
 msgid "Gradual passing from one shade to another"
 msgstr "Passagem gradual de um tom para outro"
 
-#: literals.py:128
+#: literals.py:129
 msgid "Raw gray samples"
 msgstr "Amostras RAW cinza"
 
-#: literals.py:129
+#: literals.py:130
 msgid "Raw green, red, and blue samples"
 msgstr "Amostras RAW verde, vermelho e azul"
 
-#: literals.py:130
+#: literals.py:131
 msgid "Raw CCITT Group4"
 msgstr "Raw CCITT Group4"
 
-#: literals.py:132
+#: literals.py:133
 msgid "Histogram of the image"
 msgstr "Histograma da imagem"
 
-#: literals.py:133
+#: literals.py:134
 msgid "HRZ: Slow scan TV"
 msgstr "HRZ: Slow scan TV"
 
-#: literals.py:134 literals.py:135 literals.py:254
+#: literals.py:135 literals.py:136 literals.py:255
 msgid "Hypertext Markup Language and a client-side image map"
 msgstr "Hypertext Markup Language e um mapa de imagem do lado do cliente"
 
-#: literals.py:137 literals.py:263 literals.py:278 literals.py:282
+#: literals.py:138 literals.py:264 literals.py:279 literals.py:283
 msgid "Truevision Targa image"
 msgstr "Truevision Targa image"
 
-#: literals.py:138 literals.py:139
+#: literals.py:139 literals.py:140
 msgid "ICC Color Profile"
 msgstr "ICC Color Profile"
 
-#: literals.py:140 literals.py:141
+#: literals.py:141 literals.py:142
 msgid "Microsoft Icon"
 msgstr "Microsoft Icon"
 
-#: literals.py:142
+#: literals.py:143
 msgid "Hald CLUT identity image"
 msgstr "Hald CLUT identity image"
 
-#: literals.py:143
+#: literals.py:144
 msgid "LabEye image format"
 msgstr "LabEye image format"
 
-#: literals.py:144
+#: literals.py:145
 msgid "GraphicsMagick Embedded Image"
 msgstr "GraphicsMagick Embedded Image"
 
-#: literals.py:145
+#: literals.py:146
 msgid "The image format and characteristics"
 msgstr "Formato de imagem e características"
 
-#: literals.py:146
+#: literals.py:147
 msgid "Base64-encoded inline images"
 msgstr "Base64-encoded imagens inline"
 
-#: literals.py:147
+#: literals.py:148
 msgid "IPL Image Sequence"
 msgstr "IPL Sequência de Imagens"
 
-#: literals.py:148
+#: literals.py:149
 msgid "IPTC Newsphoto"
 msgstr "IPTC Newsphoto"
 
-#: literals.py:149 literals.py:150
+#: literals.py:150 literals.py:151
 msgid "IPTC Newsphoto text format"
 msgstr "IPTC Newsphoto text format"
 
-#: literals.py:151
+#: literals.py:152
 msgid "ISO/TR 11548-1 format"
 msgstr "ISO/TR 11548-1 format"
 
-#: literals.py:153 literals.py:156
+#: literals.py:154 literals.py:157
 msgid "JPEG-2000 Code Stream Syntax"
 msgstr "JPEG-2000 Code Stream Syntax"
 
-#: literals.py:154
+#: literals.py:155
 msgid "JPEG Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr "JPEG Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 
-#: literals.py:155
+#: literals.py:156
 msgid "JPEG-2000 JP2 File Format Syntax"
 msgstr "JPEG-2000 JP2 File Format Syntax"
 
-#: literals.py:157 literals.py:158
+#: literals.py:158 literals.py:159
 msgid "Joint Photographic Experts Group JFIF format (IJG JPEG 62)"
 msgstr "Joint Photographic Experts Group JFIF format (IJG JPEG 62)"
 
-#: literals.py:159
+#: literals.py:160
 msgid "JPEG-2000 File Format Syntax"
 msgstr "JPEG-2000 File Format Syntax"
 
-#: literals.py:161
+#: literals.py:162
 msgid "Raw black samples"
 msgstr "Amostras RAW preto"
 
-#: literals.py:162 literals.py:163
+#: literals.py:163 literals.py:164
 msgid "Kodak Digital Camera Raw Image Format"
 msgstr "Kodak Digital Camera Raw Image Format"
 
-#: literals.py:165
+#: literals.py:166
 msgid "Image label"
 msgstr "Rótulo de imagem"
 
-#: literals.py:167
+#: literals.py:168
 msgid "Raw magenta samples"
 msgstr "Amostras Raw magenta"
 
-#: literals.py:168 literals.py:178 literals.py:181 literals.py:182
+#: literals.py:169 literals.py:179 literals.py:182 literals.py:183
 msgid "MPEG Video Stream"
 msgstr "MPEG Video Stream"
 
-#: literals.py:169
+#: literals.py:170
 msgid "Raw MPEG-4 Video"
 msgstr "Raw MPEG-4 Video"
 
-#: literals.py:170
+#: literals.py:171
 msgid "Colormap intensities and indices"
 msgstr "Intensidades do mapa de cores e índices"
 
-#: literals.py:171
+#: literals.py:172
 msgid "MATLAB image format"
 msgstr "MATLAB image format"
 
-#: literals.py:172
+#: literals.py:173
 msgid "MATTE raw opacity format"
 msgstr "MATTE raw opacity format"
 
-#: literals.py:173
+#: literals.py:174
 msgid "8-bit McIdas area file"
 msgstr "8-bit McIdas area file"
 
-#: literals.py:174
+#: literals.py:175
 msgid "Microsoft Image Composer (MIC) file"
 msgstr "Microsoft Image Composer (MIC) file"
 
-#: literals.py:175
+#: literals.py:176
 msgid "Magick Image File Format"
 msgstr "Magick Image File Format"
 
-#: literals.py:176
+#: literals.py:177
 msgid ""
 "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)"
 
-#: literals.py:177
+#: literals.py:178
 msgid "Raw Bi-level bitmap in least-significant-byte first order"
 msgstr "Raw Bi-level bitmap in least-significant-byte first order"
 
-#: literals.py:179
+#: literals.py:180
 msgid "MPEG-4 Video Stream"
 msgstr "MPEG-4 Video Stream"
 
-#: literals.py:183
+#: literals.py:184
 msgid "Sony (Minolta) Raw Image File"
 msgstr "Sony (Minolta) Raw Image File"
 
-#: literals.py:184
+#: literals.py:185
 msgid "Magick Scripting Language"
 msgstr "Magick Scripting Language"
 
-#: literals.py:185
+#: literals.py:186
 msgid "Windows 1 and 2 MSP file format"
 msgstr "Windows 1 and 2 MSP file format"
 
-#: literals.py:186
+#: literals.py:187
 msgid "ImageMagick's own SVG internal renderer"
 msgstr "ImageMagick's own SVG internal renderer"
 
-#: literals.py:187
+#: literals.py:188
 msgid "MTV Raytracing image format"
 msgstr "MTV Raytracing image format"
 
-#: literals.py:188
+#: literals.py:189
 msgid "Magick Vector Graphics"
 msgstr "Magick Vector Graphics"
 
-#: literals.py:190
+#: literals.py:191
 msgid "Nikon Digital SLR Camera Raw Image File"
 msgstr "Nikon Digital SLR Camera Raw Image File"
 
-#: literals.py:191
+#: literals.py:192
 msgid "Constant image of uniform color"
 msgstr "Imagem constante de cor uniforme"
 
-#: literals.py:193
+#: literals.py:194
 msgid "Raw opacity samples"
 msgstr "Amostras Raw de opacidade"
 
-#: literals.py:194
+#: literals.py:195
 msgid "Olympus Digital Camera Raw Image File"
 msgstr "Olympus Digital Camera Raw Image File"
 
-#: literals.py:195
+#: literals.py:196
 msgid "On-the-air bitmap"
 msgstr "On-the-air bitmap"
 
-#: literals.py:196
+#: literals.py:197
 msgid "Open Type font (Freetype 2.4.2)"
 msgstr "Open Type font (Freetype 2.4.2)"
 
-#: literals.py:198
+#: literals.py:199
 msgid "Xv thumbnail format"
 msgstr "Xv thumbnail format"
 
-#: literals.py:199 literals.py:276
+#: literals.py:200 literals.py:277
 msgid "16bit/pixel interleaved YUV"
 msgstr "16bit/pixel interleaved YUV"
 
-#: literals.py:200
+#: literals.py:201
 msgid "Palm pixmap"
 msgstr "Palm pixmap"
 
-#: literals.py:201
+#: literals.py:202
 msgid "Common 2-dimensional bitmap format"
 msgstr "Common 2-dimensional bitmap format"
 
-#: literals.py:202
+#: literals.py:203
 msgid "Predefined pattern"
 msgstr "Padrão pré-definido"
 
-#: literals.py:203
+#: literals.py:204
 msgid "Portable bitmap format (black and white)"
 msgstr "Formato bitmap portátil (preto e branco)"
 
-#: literals.py:204 literals.py:205
+#: literals.py:205 literals.py:206
 msgid "Photo CD"
 msgstr "Photo CD"
 
-#: literals.py:206
+#: literals.py:207
 msgid "Page Control Language"
 msgstr "Page Control Language"
 
-#: literals.py:207 literals.py:220
+#: literals.py:208 literals.py:221
 msgid "Apple Macintosh QuickDraw/PICT"
 msgstr "Apple Macintosh QuickDraw/PICT"
 
-#: literals.py:208
+#: literals.py:209
 msgid "ZSoft IBM PC Paintbrush"
 msgstr "ZSoft IBM PC Paintbrush"
 
-#: literals.py:209
+#: literals.py:210
 msgid "Palm Database ImageViewer Format"
 msgstr "Palm Database ImageViewer Format"
 
-#: literals.py:210
+#: literals.py:211
 msgid "Portable Document Format"
 msgstr "Portable Document Format"
 
-#: literals.py:211
+#: literals.py:212
 msgid "Portable Document Archive Format"
 msgstr "Portable Document Archive Format"
 
-#: literals.py:212
+#: literals.py:213
 msgid "Pentax Electronic File"
 msgstr "Pentax Electronic File"
 
-#: literals.py:213
+#: literals.py:214
 msgid "Embrid Embroidery Format"
 msgstr "Embrid Embroidery Format"
 
-#: literals.py:214
+#: literals.py:215
 msgid "Postscript Type 1 font (ASCII) (Freetype 2.4.2)"
 msgstr "Postscript Type 1 font (ASCII) (Freetype 2.4.2)"
 
-#: literals.py:215
+#: literals.py:216
 msgid "Postscript Type 1 font (binary) (Freetype 2.4.2)"
 msgstr "Postscript Type 1 font (binary) (Freetype 2.4.2)"
 
-#: literals.py:216
+#: literals.py:217
 msgid "Portable float format"
 msgstr "Portable float format"
 
-#: literals.py:217
+#: literals.py:218
 msgid "Portable graymap format (gray scale)"
 msgstr "Portable graymap format (gray scale)"
 
-#: literals.py:218
+#: literals.py:219
 msgid "JPEG-2000 VM Format"
 msgstr "JPEG-2000 VM Format"
 
-#: literals.py:219
+#: literals.py:220
 msgid "Personal Icon"
 msgstr "Ícone pessoal"
 
-#: literals.py:221
+#: literals.py:222
 msgid "Alias/Wavefront RLE image format"
 msgstr "Alias/Wavefront RLE image format"
 
-#: literals.py:222
+#: literals.py:223
 msgid "PIXAR raster file"
 msgstr "PIXAR raster file"
 
-#: literals.py:223
+#: literals.py:224
 msgid "Joint Photographic Experts Group JFIF format (62)"
 msgstr "Joint Photographic Experts Group JFIF format (62)"
 
-#: literals.py:225
-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)"
-
 #: literals.py:226
-msgid ""
-"24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
-msgstr ""
-"24-bit RGB PNG, opaque only (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)"
 
 #: literals.py:227
 msgid ""
+"24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
+msgstr ""
+"24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
+
+#: literals.py:228
+msgid ""
 "32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 msgstr ""
 "32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 
-#: literals.py:228
+#: literals.py:229
 msgid ""
 "8-bit indexed PNG, binary transparency only (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
@@ -656,235 +656,235 @@ msgstr ""
 "8-bit indexed PNG, binary transparency only (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 
-#: literals.py:229
+#: literals.py:230
 msgid "Portable anymap"
 msgstr "Portable anymap"
 
-#: literals.py:230
+#: literals.py:231
 msgid "Portable pixmap format (color)"
 msgstr "Portable pixmap format (color)"
 
-#: literals.py:231
+#: literals.py:232
 msgid "Show a preview an image enhancement, effect, or f/x"
 msgstr "Mostrar uma visualização uma melhoria de imagem, efeito, ou f/x"
 
-#: literals.py:232
+#: literals.py:233
 msgid "Adobe PostScript"
 msgstr "Adobe PostScript"
 
-#: literals.py:233
+#: literals.py:234
 msgid "Adobe Level II PostScript"
 msgstr "Adobe Level II PostScript"
 
-#: literals.py:234
+#: literals.py:235
 msgid "Adobe Level III PostScript"
 msgstr "Adobe Level III PostScript"
 
-#: literals.py:235
+#: literals.py:236
 msgid "Adobe Large Document Format"
 msgstr "Adobe Large Document Format"
 
-#: literals.py:236
+#: literals.py:237
 msgid "Adobe Photoshop bitmap"
 msgstr "Adobe Photoshop bitmap"
 
-#: literals.py:237
+#: literals.py:238
 msgid "Pyramid encoded TIFF"
 msgstr "Pyramid encoded TIFF"
 
-#: literals.py:238 literals.py:252
+#: literals.py:239 literals.py:253
 msgid "Seattle Film Works"
 msgstr "Seattle Film Works"
 
-#: literals.py:240
+#: literals.py:241
 msgid "Raw red samples"
 msgstr "Amostras RAW vermelhas"
 
-#: literals.py:241
+#: literals.py:242
 msgid "Fuji CCD-RAW Graphic File"
 msgstr "Fuji CCD-RAW Graphic File"
 
-#: literals.py:242 literals.py:258
+#: literals.py:243 literals.py:259
 msgid "SUN Rasterfile"
 msgstr "SUN Rasterfile"
 
-#: literals.py:243
+#: literals.py:244
 msgid "Raw red, blue, and green samples"
 msgstr "Amostras RAW vermelhas, azul, verde"
 
-#: literals.py:244
+#: literals.py:245
 msgid "Raw red, green, and blue samples"
 msgstr "Amostras Raw vermelho, verde, azul"
 
-#: literals.py:245
+#: literals.py:246
 msgid "Raw red, green, blue, and matte samples"
 msgstr "Raw red, green, blue, and matte samples"
 
-#: literals.py:246
+#: literals.py:247
 msgid "Raw red, green, blue, and opacity samples"
 msgstr "Amostras Raw vermelho, verde, azul, e opacidade"
 
-#: literals.py:247
+#: literals.py:248
 msgid "Alias/Wavefront image"
 msgstr "Alias/Wavefront image"
 
-#: literals.py:248
+#: literals.py:249
 msgid "Utah Run length encoded image"
 msgstr "Utah Run length encoded image"
 
-#: literals.py:250
+#: literals.py:251
 msgid "ZX-Spectrum SCREEN$"
 msgstr "ZX-Spectrum SCREEN$"
 
-#: literals.py:251
+#: literals.py:252
 msgid "Scitex HandShake"
 msgstr "Scitex HandShake"
 
-#: literals.py:253
+#: literals.py:254
 msgid "Irix RGB image"
 msgstr "Irix RGB image"
 
-#: literals.py:255
+#: literals.py:256
 msgid "Sony Raw Format 2"
 msgstr "Sony Raw Format 2"
 
-#: literals.py:256
+#: literals.py:257
 msgid "Sony Raw Format"
 msgstr "Sony Raw Format"
 
-#: literals.py:257
+#: literals.py:258
 msgid "Steganographic image"
 msgstr "Steganographic image"
 
-#: literals.py:259
+#: literals.py:260
 msgid "Scalable Vector Graphics (XML 2.7.6, RSVG 2.32.0)"
 msgstr "Scalable Vector Graphics (XML 2.7.6, RSVG 2.32.0)"
 
-#: literals.py:260
+#: literals.py:261
 msgid "Scalable Vector Graphics (ZIP compressed) (XML 2.7.6, RSVG 2.32.0)"
 msgstr "Scalable Vector Graphics (ZIP compressed) (XML 2.7.6, RSVG 2.32.0)"
 
-#: literals.py:262 literals.py:272
+#: literals.py:263 literals.py:273
 msgid "Text"
 msgstr "Texto"
 
-#: literals.py:264
+#: literals.py:265
 msgid "EXIF Profile Thumbnail"
 msgstr "EXIF Profile Thumbnail"
 
-#: literals.py:265
+#: literals.py:266
 msgid "Tagged Image File Format (LIBTIFF, Version 3.9.4)"
 msgstr "Tagged Image File Format (LIBTIFF, Version 3.9.4)"
 
-#: literals.py:266
+#: literals.py:267
 msgid "Tagged Image File Format (64-bit) (LIBTIFF, Version 3.9.4)"
 msgstr "Tagged Image File Format (64-bit) (LIBTIFF, Version 3.9.4)"
 
-#: literals.py:267
+#: literals.py:268
 msgid "Tile image with a texture"
 msgstr "Imagem da telha com uma textura"
 
-#: literals.py:268
+#: literals.py:269
 msgid "PSX TIM"
 msgstr "PSX TIM"
 
-#: literals.py:269
+#: literals.py:270
 msgid "TOPOL X Image"
 msgstr "TOPOL X Image"
 
-#: literals.py:270
+#: literals.py:271
 msgid "TrueType font collection (Freetype 2.4.2)"
 msgstr "TrueType font collection (Freetype 2.4.2)"
 
-#: literals.py:271
+#: literals.py:272
 msgid "TrueType font (Freetype 2.4.2)"
 msgstr "TrueType font (Freetype 2.4.2)"
 
-#: literals.py:274
+#: literals.py:275
 msgid "Unicode Text format"
 msgstr "Formato de texto Unicode"
 
-#: literals.py:275
+#: literals.py:276
 msgid "X-Motif UIL table"
 msgstr "X-Motif UIL table"
 
-#: literals.py:279
+#: literals.py:280
 msgid "VICAR rasterfile format"
 msgstr "VICAR rasterfile format"
 
-#: literals.py:280
+#: literals.py:281
 msgid "Visual Image Directory"
 msgstr "Visual Image Directory"
 
-#: literals.py:281 literals.py:298
+#: literals.py:282 literals.py:299
 msgid "Khoros Visualization image"
 msgstr "Khoros Visualization image"
 
-#: literals.py:284
+#: literals.py:285
 msgid "Wireless Bitmap (level 0) image"
 msgstr "Wireless Bitmap (level 0) image"
 
-#: literals.py:285
+#: literals.py:286
 msgid "Windows Meta File"
 msgstr "Windows Meta File"
 
-#: literals.py:286
+#: literals.py:287
 msgid "Word Perfect Graphics"
 msgstr "Word Perfect Graphics"
 
-#: literals.py:287
+#: literals.py:288
 msgid "Windows Media Video"
 msgstr "Windows Media Video"
 
-#: literals.py:288
+#: literals.py:289
 msgid "Compressed Windows Meta File"
 msgstr "Compressed Windows Meta File"
 
-#: literals.py:290
+#: literals.py:291
 msgid "X Window System"
 msgstr "X Window System"
 
-#: literals.py:291
+#: literals.py:292
 msgid "Foveon X3 (Sigma/Polaroid) Raw picture file"
 msgstr "Foveon X3 (Sigma/Polaroid) Raw picture file"
 
-#: literals.py:292
+#: literals.py:293
 msgid "X Windows system bitmap (black and white)"
 msgstr "X Windows system bitmap (black and white)"
 
-#: literals.py:293
+#: literals.py:294
 msgid "Constant image uniform color"
 msgstr "Constant image uniform color"
 
-#: literals.py:294
+#: literals.py:295
 msgid "GIMP image"
 msgstr "imagem GIMP"
 
-#: literals.py:295
+#: literals.py:296
 msgid "Adobe XML metadata"
 msgstr "matadados Adobe XML"
 
-#: literals.py:296
+#: literals.py:297
 msgid "X Windows system pixmap (color)"
 msgstr "X Windows system pixmap (color)"
 
-#: literals.py:297
+#: literals.py:298
 msgid "Microsoft XML Paper Specification"
 msgstr "Microsoft XML Paper Specification"
 
-#: literals.py:299
+#: literals.py:300
 msgid "XV thumbnail file"
 msgstr "XV thumbnail file"
 
-#: literals.py:300
+#: literals.py:301
 msgid "X Windows system window dump (color)"
 msgstr "X Windows system window dump (color)"
 
-#: literals.py:302
+#: literals.py:303
 msgid "Raw yellow samples"
 msgstr "Amostras Raw amarelas"
 
-#: literals.py:303
+#: literals.py:304
 msgid "CCIR 601 4:1:1 or 4:2:2 (8-bit only)"
 msgstr "CCIR 601 4:1:1 or 4:2:2 (8-bit only)"
 
@@ -900,27 +900,36 @@ msgstr "nome"
 msgid "description"
 msgstr "descrição"
 
-#: conf/settings.py:10
+#: conf/settings.py:11
 msgid "File path to imagemagick's convert program."
 msgstr "Caminho do arquivo para o programa imagemagick converter."
 
-#: conf/settings.py:11
+#: conf/settings.py:12
 msgid "File path to imagemagick's identify program."
 msgstr "Caminho do arquivo para o programa imagemagick identificar."
 
-#: conf/settings.py:12
+#: conf/settings.py:13
 msgid "File path to graphicsmagick's program."
 msgstr "Caminho do arquivo para o programa graphicsmagick."
 
-#: conf/settings.py:14
+#: conf/settings.py:15
 msgid ""
-"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."
+msgstr ""
+"Gráficos de conversão backend para usar. As opções são:  converter.backends."
+"imagemagick, converter.backends.graphicsmagick and converter.backends.python."
+
+#: conf/settings.py:16
+#, fuzzy
+msgid "Path to the unoconv program."
+msgstr "Caminho do arquivo para o programa imagemagick converter."
+
+#: conf/settings.py:17
+msgid ""
+"Use alternate method of connection to LibreOffice using a pipe, it is slower "
+"but less prone to segmentation faults."
 msgstr ""
-"Gráficos de conversão backend para usar. As opções são:  "
-"converter.backends.imagemagick, converter.backends.graphicsmagick and "
-"converter.backends.python."
 
 #: templates/converter_file_formats_help.html:3
 msgid "Help"
@@ -934,5 +943,3 @@ msgid ""
 msgstr ""
 "Estes são os formatos de arquivos suportados pelo servidor conversor "
 "selecionado. Neste caso: ' %(backend)s '"
-
-
diff --git a/apps/converter/locale/ru/LC_MESSAGES/django.mo b/apps/converter/locale/ru/LC_MESSAGES/django.mo
index d3837c802d..86540df866 100644
Binary files a/apps/converter/locale/ru/LC_MESSAGES/django.mo and b/apps/converter/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/converter/locale/ru/LC_MESSAGES/django.po b/apps/converter/locale/ru/LC_MESSAGES/django.po
index ff7409097e..5190518e73 100644
--- a/apps/converter/locale/ru/LC_MESSAGES/django.po
+++ b/apps/converter/locale/ru/LC_MESSAGES/django.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:44-0400\n"
-"PO-Revision-Date: 2011-11-03 22:25+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 19:01+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,868 +22,868 @@ msgstr ""
 msgid "file formats"
 msgstr "форматы файлов"
 
-#: literals.py:18
+#: literals.py:19
 msgid "Resize"
 msgstr "Изменение размера"
 
-#: literals.py:19
+#: literals.py:20
 msgid "Resize."
 msgstr "Изменить размер."
 
-#: literals.py:21 literals.py:36
+#: literals.py:22 literals.py:37
 msgid "width"
 msgstr "ширина"
 
-#: literals.py:22 literals.py:37
+#: literals.py:23 literals.py:38
 msgid "height"
 msgstr "высота"
 
-#: literals.py:26
+#: literals.py:27
 msgid "Rotate"
 msgstr "Вращать"
 
-#: literals.py:27
+#: literals.py:28
 msgid "Rotate by n degress."
 msgstr "Поворот на n градусов."
 
-#: literals.py:29
+#: literals.py:30
 msgid "degrees"
 msgstr "градусы"
 
-#: literals.py:33
+#: literals.py:34
 msgid "Density"
 msgstr "Плотность"
 
-#: literals.py:34
+#: literals.py:35
 msgid "Change the resolution (ie: DPI) without resizing."
 msgstr "Изменение разрешения (т.е. точек на дюйм) без изменения размера."
 
-#: literals.py:41
+#: literals.py:42
 msgid "Zoom"
 msgstr "Увеличить"
 
-#: literals.py:42
+#: literals.py:43
 msgid "Zoom by n percent."
 msgstr "Увеличить на n %."
 
-#: literals.py:44
+#: literals.py:45
 msgid "percent"
 msgstr "процент"
 
-#: literals.py:50
+#: literals.py:51
 msgid "Hasselblad Photo RAW, CFV/H3D39II"
 msgstr "Hasselblad Photo RAW, CFV/H3D39II"
 
-#: literals.py:51 literals.py:52
+#: literals.py:52 literals.py:53
 msgid "Photoshop resource format"
 msgstr "Photoshop resource format"
 
-#: literals.py:53
+#: literals.py:54
 msgid "Photoshop resource text format"
 msgstr "Photoshop resource text format"
 
-#: literals.py:54
+#: literals.py:55
 msgid "Photoshop resource wide text format"
 msgstr "Photoshop resource wide text format"
 
-#: literals.py:56
+#: literals.py:57
 msgid "Raw alpha samples"
 msgstr "Raw alpha samples"
 
-#: literals.py:57
+#: literals.py:58
 msgid "Adobe Illustrator CS2"
 msgstr "Adobe Illustrator CS2"
 
-#: literals.py:58
+#: literals.py:59
 msgid "Raw application information"
 msgstr "Raw application information"
 
-#: literals.py:59
+#: literals.py:60
 msgid "Raw JPEG binary data"
 msgstr "Raw JPEG binary data"
 
-#: literals.py:60
+#: literals.py:61
 msgid "PFS: 1st Publisher Clip Art"
 msgstr "PFS: 1st Publisher Clip Art"
 
-#: literals.py:61
+#: literals.py:62
 msgid "Sony Alpha DSLR Raw Image Format"
 msgstr "Sony Alpha DSLR Raw Image Format"
 
-#: literals.py:62
+#: literals.py:63
 msgid "Microsoft Audio/Visual Interleaved"
 msgstr "Microsoft Audio/Visual Interleaved"
 
-#: literals.py:63
+#: literals.py:64
 msgid "AVS X image"
 msgstr "AVS X image"
 
-#: literals.py:65
+#: literals.py:66
 msgid "Raw blue samples"
 msgstr "Raw blue samples"
 
-#: literals.py:66
+#: literals.py:67
 msgid "Raw blue, green, and red samples"
 msgstr "Raw blue, green, and red samples"
 
-#: literals.py:67
+#: literals.py:68
 msgid "Raw blue, green, red and alpha samples"
 msgstr "Raw blue, green, red and alpha samples"
 
-#: literals.py:68
+#: literals.py:69
 msgid "Microsoft Windows bitmap image"
 msgstr "Microsoft Windows bitmap image"
 
-#: literals.py:69
+#: literals.py:70
 msgid "Microsoft Windows bitmap image version 2"
 msgstr "Microsoft Windows bitmap image version 2"
 
-#: literals.py:70
+#: literals.py:71
 msgid "Microsoft Windows bitmap image version 3"
 msgstr "Microsoft Windows bitmap image version 3"
 
-#: literals.py:71
+#: literals.py:72
 msgid "BRF ASCII Braille format"
 msgstr "BRF ASCII Braille format"
 
-#: literals.py:72
+#: literals.py:73
 msgid "Raw blue, red, and green samples"
 msgstr "Raw blue, red, and green samples"
 
-#: literals.py:74
+#: literals.py:75
 msgid "Raw cyan samples"
 msgstr "Raw cyan samples"
 
-#: literals.py:75 literals.py:180
+#: literals.py:76 literals.py:181
 msgid "Magick Persistent Cache image format"
 msgstr "Magick Persistent Cache image format"
 
-#: literals.py:76 literals.py:77
+#: literals.py:77 literals.py:78
 msgid "Continuous Acquisition and Life-cycle Support Type 1 image"
 msgstr "Continuous Acquisition and Life-cycle Support Type 1 image"
 
-#: literals.py:78
+#: literals.py:79
 msgid "Image caption"
 msgstr "описание изображения"
 
-#: literals.py:79
+#: literals.py:80
 msgid "Cineon Image File"
 msgstr "Cineon Image File"
 
-#: literals.py:80
+#: literals.py:81
 msgid "Cisco IP phone image format"
 msgstr "Cisco IP phone image format"
 
-#: literals.py:81
+#: literals.py:82
 msgid "Image Clip Mask"
 msgstr "Image Clip Mask"
 
-#: literals.py:82
+#: literals.py:83
 msgid "Raw cyan, magenta, yellow, and black samples"
 msgstr "Raw cyan, magenta, yellow, and black samples"
 
-#: literals.py:83
+#: literals.py:84
 msgid "Raw cyan, magenta, yellow, black, and opacity samples"
 msgstr "Raw cyan, magenta, yellow, black, and opacity samples"
 
-#: literals.py:84 literals.py:85
+#: literals.py:85 literals.py:86
 msgid "Canon Digital Camera Raw Image Format"
 msgstr "Canon Digital Camera Raw Image Format"
 
-#: literals.py:86
+#: literals.py:87
 msgid "Microsoft Cursor Icon"
 msgstr "Microsoft Cursor Icon"
 
-#: literals.py:87
+#: literals.py:88
 msgid "DR Halo"
 msgstr "DR Halo"
 
-#: literals.py:89
+#: literals.py:90
 msgid "Digital Imaging and Communications in Medicine image"
 msgstr "Digital Imaging and Communications in Medicine image (DICOM)"
 
-#: literals.py:90
+#: literals.py:91
 msgid "Kodak Digital Camera Raw Image File"
 msgstr "Kodak Digital Camera Raw Image File"
 
-#: literals.py:91
+#: literals.py:92
 msgid "ZSoft IBM PC multi-page Paintbrush"
 msgstr "ZSoft IBM PC multi-page Paintbrush"
 
-#: literals.py:92
+#: literals.py:93
 msgid "Microsoft DirectDraw Surface"
 msgstr "Microsoft DirectDraw Surface"
 
-#: literals.py:93
+#: literals.py:94
 msgid "Multi-face font package (Freetype 2.4.2)"
 msgstr "Multi-face font package (Freetype 2.4.2)"
 
-#: literals.py:94
+#: literals.py:95
 msgid "Déjà vu"
 msgstr "Déjà vu"
 
-#: literals.py:95
+#: literals.py:96
 msgid "Adobe Digital Negative"
 msgstr "Adobe Digital Negative"
 
-#: literals.py:96
+#: literals.py:97
 msgid "Graphviz"
 msgstr "Graphviz"
 
-#: literals.py:97
+#: literals.py:98
 msgid "SMPTE 268M-2003 (DPX 2.0)"
 msgstr "SMPTE 268M-2003 (DPX 2.0)"
 
-#: literals.py:99
+#: literals.py:100
 msgid "Encapsulated Portable Document Format"
 msgstr "Encapsulated Portable Document Format"
 
-#: literals.py:100 literals.py:105
+#: literals.py:101 literals.py:106
 msgid "Adobe Encapsulated PostScript Interchange format"
 msgstr "Adobe Encapsulated PostScript Interchange format"
 
-#: literals.py:101 literals.py:104
+#: literals.py:102 literals.py:105
 msgid "Adobe Encapsulated PostScript"
 msgstr "Adobe Encapsulated PostScript"
 
-#: literals.py:102
+#: literals.py:103
 msgid "Adobe Level II Encapsulated PostScript"
 msgstr "Adobe Level II Encapsulated PostScript"
 
-#: literals.py:103
+#: literals.py:104
 msgid "Adobe Level III Encapsulated PostScript"
 msgstr "Adobe Level III Encapsulated PostScript"
 
-#: literals.py:106
+#: literals.py:107
 msgid "Adobe Encapsulated PostScript with TIFF preview"
 msgstr "Adobe Encapsulated PostScript with TIFF preview"
 
-#: literals.py:107
+#: literals.py:108
 msgid "Adobe Level II Encapsulated PostScript with TIFF preview"
 msgstr "Adobe Level II Encapsulated PostScript with TIFF preview"
 
-#: literals.py:108
+#: literals.py:109
 msgid "Adobe Level III Encapsulated PostScript with TIFF preview"
 msgstr "Adobe Level III Encapsulated PostScript with TIFF preview"
 
-#: literals.py:109
+#: literals.py:110
 msgid "Epson RAW Format"
 msgstr "Epson RAW Format"
 
-#: literals.py:110
+#: literals.py:111
 msgid "Exif digital camera binary data"
 msgstr "Exif digital camera binary data"
 
-#: literals.py:111
+#: literals.py:112
 msgid "High Dynamic-range (HDR)"
 msgstr "High Dynamic-range (HDR)"
 
-#: literals.py:113
+#: literals.py:114
 msgid "Group 3 FAX (Not TIFF Group3 FAX)"
 msgstr "Group 3 FAX (Not TIFF Group3 FAX)"
 
-#: literals.py:114
+#: literals.py:115
 msgid "Autodesk FLI animations file"
 msgstr "Autodesk FLI animations file"
 
-#: literals.py:115
+#: literals.py:116
 msgid "Autodesk FLC animations file"
 msgstr "Autodesk FLC animations file"
 
-#: literals.py:116 literals.py:119
+#: literals.py:117 literals.py:120
 msgid "Flexible Image Transport System"
 msgstr "Flexible Image Transport System"
 
-#: literals.py:117
+#: literals.py:118
 msgid "Kodak FlashPix file"
 msgstr "Kodak FlashPix file"
 
-#: literals.py:118 literals.py:224
+#: literals.py:119 literals.py:225
 msgid "Plasma fractal image"
 msgstr "Plasma fractal image"
 
-#: literals.py:121
+#: literals.py:122
 msgid "Raw green samples"
 msgstr "Raw green samples"
 
-#: literals.py:122
+#: literals.py:123
 msgid "Group 3 FAX"
 msgstr "Group 3 FAX"
 
-#: literals.py:123
+#: literals.py:124
 msgid "Raw green, blue, and red samples"
 msgstr "Raw green, blue, and red samples"
 
-#: literals.py:124
+#: literals.py:125
 msgid "GIMP brush file"
 msgstr "GIMP brush file"
 
-#: literals.py:125
+#: literals.py:126
 msgid "CompuServe graphics interchange format (version 89a)"
 msgstr "CompuServe graphics interchange format (version 89a)"
 
-#: literals.py:126
+#: literals.py:127
 msgid "CompuServe graphics interchange format (version 87a)"
 msgstr "CompuServe graphics interchange format (version 87a)"
 
-#: literals.py:127
+#: literals.py:128
 msgid "Gradual passing from one shade to another"
 msgstr "Gradual passing from one shade to another"
 
-#: literals.py:128
+#: literals.py:129
 msgid "Raw gray samples"
 msgstr "Raw gray samples"
 
-#: literals.py:129
+#: literals.py:130
 msgid "Raw green, red, and blue samples"
 msgstr "Raw green, red, and blue samples"
 
-#: literals.py:130
+#: literals.py:131
 msgid "Raw CCITT Group4"
 msgstr "Raw CCITT Group4"
 
-#: literals.py:132
+#: literals.py:133
 msgid "Histogram of the image"
 msgstr "Гистограмма изображения"
 
-#: literals.py:133
+#: literals.py:134
 msgid "HRZ: Slow scan TV"
 msgstr "HRZ: Slow scan TV"
 
-#: literals.py:134 literals.py:135 literals.py:254
+#: literals.py:135 literals.py:136 literals.py:255
 msgid "Hypertext Markup Language and a client-side image map"
 msgstr "Hypertext Markup Language and a client-side image map"
 
-#: literals.py:137 literals.py:263 literals.py:278 literals.py:282
+#: literals.py:138 literals.py:264 literals.py:279 literals.py:283
 msgid "Truevision Targa image"
 msgstr "Truevision Targa image"
 
-#: literals.py:138 literals.py:139
+#: literals.py:139 literals.py:140
 msgid "ICC Color Profile"
 msgstr "ICC Color Profile"
 
-#: literals.py:140 literals.py:141
+#: literals.py:141 literals.py:142
 msgid "Microsoft Icon"
 msgstr "Microsoft Icon"
 
-#: literals.py:142
+#: literals.py:143
 msgid "Hald CLUT identity image"
 msgstr "Hald CLUT identity image"
 
-#: literals.py:143
+#: literals.py:144
 msgid "LabEye image format"
 msgstr "LabEye image format"
 
-#: literals.py:144
+#: literals.py:145
 msgid "GraphicsMagick Embedded Image"
 msgstr "GraphicsMagick Embedded Image"
 
-#: literals.py:145
+#: literals.py:146
 msgid "The image format and characteristics"
 msgstr "Формат изображения и характеристики"
 
-#: literals.py:146
+#: literals.py:147
 msgid "Base64-encoded inline images"
 msgstr "Base64-encoded inline images"
 
-#: literals.py:147
+#: literals.py:148
 msgid "IPL Image Sequence"
 msgstr "IPL Image Sequence"
 
-#: literals.py:148
+#: literals.py:149
 msgid "IPTC Newsphoto"
 msgstr "IPTC Newsphoto"
 
-#: literals.py:149 literals.py:150
+#: literals.py:150 literals.py:151
 msgid "IPTC Newsphoto text format"
 msgstr "IPTC Newsphoto text format"
 
-#: literals.py:151
+#: literals.py:152
 msgid "ISO/TR 11548-1 format"
 msgstr "ISO/TR 11548-1 format"
 
-#: literals.py:153 literals.py:156
+#: literals.py:154 literals.py:157
 msgid "JPEG-2000 Code Stream Syntax"
 msgstr "JPEG-2000 Code Stream Syntax"
 
-#: literals.py:154
+#: literals.py:155
 msgid "JPEG Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr "JPEG Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 
-#: literals.py:155
+#: literals.py:156
 msgid "JPEG-2000 JP2 File Format Syntax"
 msgstr "JPEG-2000 JP2 File Format Syntax"
 
-#: literals.py:157 literals.py:158
+#: literals.py:158 literals.py:159
 msgid "Joint Photographic Experts Group JFIF format (IJG JPEG 62)"
 msgstr "Joint Photographic Experts Group JFIF format (IJG JPEG 62)"
 
-#: literals.py:159
+#: literals.py:160
 msgid "JPEG-2000 File Format Syntax"
 msgstr "JPEG-2000 File Format Syntax"
 
-#: literals.py:161
+#: literals.py:162
 msgid "Raw black samples"
 msgstr "Raw black samples"
 
-#: literals.py:162 literals.py:163
+#: literals.py:163 literals.py:164
 msgid "Kodak Digital Camera Raw Image Format"
 msgstr "Kodak Digital Camera Raw Image Format"
 
-#: literals.py:165
+#: literals.py:166
 msgid "Image label"
 msgstr "этикетка изображения"
 
-#: literals.py:167
+#: literals.py:168
 msgid "Raw magenta samples"
 msgstr "Raw magenta samples"
 
-#: literals.py:168 literals.py:178 literals.py:181 literals.py:182
+#: literals.py:169 literals.py:179 literals.py:182 literals.py:183
 msgid "MPEG Video Stream"
 msgstr "MPEG Video Stream"
 
-#: literals.py:169
+#: literals.py:170
 msgid "Raw MPEG-4 Video"
 msgstr "Raw MPEG-4 Video"
 
-#: literals.py:170
+#: literals.py:171
 msgid "Colormap intensities and indices"
 msgstr "Colormap intensities and indices"
 
-#: literals.py:171
+#: literals.py:172
 msgid "MATLAB image format"
 msgstr "MATLAB image format"
 
-#: literals.py:172
+#: literals.py:173
 msgid "MATTE raw opacity format"
 msgstr "MATTE raw opacity format"
 
-#: literals.py:173
+#: literals.py:174
 msgid "8-bit McIdas area file"
 msgstr "8-bit McIdas area file"
 
-#: literals.py:174
+#: literals.py:175
 msgid "Microsoft Image Composer (MIC) file"
 msgstr "Microsoft Image Composer (MIC) file"
 
-#: literals.py:175
+#: literals.py:176
 msgid "Magick Image File Format"
 msgstr "Magick Image File Format"
 
-#: literals.py:176
+#: literals.py:177
 msgid ""
 "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)"
 
-#: literals.py:177
+#: literals.py:178
 msgid "Raw Bi-level bitmap in least-significant-byte first order"
 msgstr "Raw Bi-level bitmap in least-significant-byte first order"
 
-#: literals.py:179
+#: literals.py:180
 msgid "MPEG-4 Video Stream"
 msgstr "MPEG-4 Video Stream"
 
-#: literals.py:183
+#: literals.py:184
 msgid "Sony (Minolta) Raw Image File"
 msgstr "Sony (Minolta) Raw Image File"
 
-#: literals.py:184
+#: literals.py:185
 msgid "Magick Scripting Language"
 msgstr "Magick Scripting Language"
 
-#: literals.py:185
+#: literals.py:186
 msgid "Windows 1 and 2 MSP file format"
 msgstr "Windows 1 and 2 MSP file format"
 
-#: literals.py:186
+#: literals.py:187
 msgid "ImageMagick's own SVG internal renderer"
 msgstr "собственный рендер SVG ImageMagick"
 
-#: literals.py:187
+#: literals.py:188
 msgid "MTV Raytracing image format"
 msgstr "MTV Raytracing image format"
 
-#: literals.py:188
+#: literals.py:189
 msgid "Magick Vector Graphics"
 msgstr "Magick Vector Graphics"
 
-#: literals.py:190
+#: literals.py:191
 msgid "Nikon Digital SLR Camera Raw Image File"
 msgstr "Nikon Digital SLR Camera Raw Image File"
 
-#: literals.py:191
+#: literals.py:192
 msgid "Constant image of uniform color"
 msgstr "Constant image of uniform color"
 
-#: literals.py:193
+#: literals.py:194
 msgid "Raw opacity samples"
 msgstr "Raw opacity samples"
 
-#: literals.py:194
+#: literals.py:195
 msgid "Olympus Digital Camera Raw Image File"
 msgstr "Olympus Digital Camera Raw Image File"
 
-#: literals.py:195
+#: literals.py:196
 msgid "On-the-air bitmap"
 msgstr "On-the-air bitmap"
 
-#: literals.py:196
+#: literals.py:197
 msgid "Open Type font (Freetype 2.4.2)"
 msgstr "Open Type font (Freetype 2.4.2)"
 
-#: literals.py:198
+#: literals.py:199
 msgid "Xv thumbnail format"
 msgstr "Xv thumbnail format"
 
-#: literals.py:199 literals.py:276
+#: literals.py:200 literals.py:277
 msgid "16bit/pixel interleaved YUV"
 msgstr "16bit/pixel interleaved YUV"
 
-#: literals.py:200
+#: literals.py:201
 msgid "Palm pixmap"
 msgstr "Palm pixmap"
 
-#: literals.py:201
+#: literals.py:202
 msgid "Common 2-dimensional bitmap format"
 msgstr "Common 2-dimensional bitmap format"
 
-#: literals.py:202
+#: literals.py:203
 msgid "Predefined pattern"
 msgstr "Предопределенные шаблоны"
 
-#: literals.py:203
+#: literals.py:204
 msgid "Portable bitmap format (black and white)"
 msgstr "Portable bitmap format (black and white)"
 
-#: literals.py:204 literals.py:205
+#: literals.py:205 literals.py:206
 msgid "Photo CD"
 msgstr "Photo CD"
 
-#: literals.py:206
+#: literals.py:207
 msgid "Page Control Language"
 msgstr "Page Control Language"
 
-#: literals.py:207 literals.py:220
+#: literals.py:208 literals.py:221
 msgid "Apple Macintosh QuickDraw/PICT"
 msgstr "Apple Macintosh QuickDraw/PICT"
 
-#: literals.py:208
+#: literals.py:209
 msgid "ZSoft IBM PC Paintbrush"
 msgstr "ZSoft IBM PC Paintbrush"
 
-#: literals.py:209
+#: literals.py:210
 msgid "Palm Database ImageViewer Format"
 msgstr "ZSoft IBM PC Paintbrush"
 
-#: literals.py:210
+#: literals.py:211
 msgid "Portable Document Format"
 msgstr "Portable Document Format"
 
-#: literals.py:211
+#: literals.py:212
 msgid "Portable Document Archive Format"
 msgstr "Portable Document Archive Format"
 
-#: literals.py:212
+#: literals.py:213
 msgid "Pentax Electronic File"
 msgstr "Pentax Electronic File"
 
-#: literals.py:213
+#: literals.py:214
 msgid "Embrid Embroidery Format"
 msgstr "Embrid Embroidery Format"
 
-#: literals.py:214
+#: literals.py:215
 msgid "Postscript Type 1 font (ASCII) (Freetype 2.4.2)"
 msgstr "Postscript Type 1 font (ASCII) (Freetype 2.4.2)"
 
-#: literals.py:215
+#: literals.py:216
 msgid "Postscript Type 1 font (binary) (Freetype 2.4.2)"
 msgstr "Postscript Type 1 font (binary) (Freetype 2.4.2)"
 
-#: literals.py:216
+#: literals.py:217
 msgid "Portable float format"
 msgstr "Portable float format"
 
-#: literals.py:217
+#: literals.py:218
 msgid "Portable graymap format (gray scale)"
 msgstr "Portable graymap format (gray scale)"
 
-#: literals.py:218
+#: literals.py:219
 msgid "JPEG-2000 VM Format"
 msgstr "JPEG-2000 VM Format"
 
-#: literals.py:219
+#: literals.py:220
 msgid "Personal Icon"
 msgstr "Personal Icon"
 
-#: literals.py:221
+#: literals.py:222
 msgid "Alias/Wavefront RLE image format"
 msgstr "Alias/Wavefront RLE image format"
 
-#: literals.py:222
+#: literals.py:223
 msgid "PIXAR raster file"
 msgstr "PIXAR raster file"
 
-#: literals.py:223
+#: literals.py:224
 msgid "Joint Photographic Experts Group JFIF format (62)"
 msgstr "Joint Photographic Experts Group JFIF format (62)"
 
-#: literals.py:225
+#: literals.py:226
 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)"
 
-#: literals.py:226
-msgid ""
-"24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
-msgstr ""
-"24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
-
 #: literals.py:227
 msgid ""
-"32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
-"1.2.3.3,1.2.3.4)"
+"24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 msgstr ""
-"32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
-"1.2.3.3,1.2.3.4)"
+"24-bit RGB PNG, opaque only (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
 
 #: literals.py:228
 msgid ""
+"32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
+"1.2.3.3,1.2.3.4)"
+msgstr ""
+"32-bit RGBA PNG, semitransparency OK (libpng 1.2.42,1.2.44, zlib "
+"1.2.3.3,1.2.3.4)"
+
+#: literals.py:229
+msgid ""
 "8-bit indexed PNG, binary transparency only (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 msgstr ""
 "8-bit indexed PNG, binary transparency only (libpng 1.2.42,1.2.44, zlib "
 "1.2.3.3,1.2.3.4)"
 
-#: literals.py:229
+#: literals.py:230
 msgid "Portable anymap"
 msgstr "Portable anymap"
 
-#: literals.py:230
+#: literals.py:231
 msgid "Portable pixmap format (color)"
 msgstr "Portable pixmap format (color)"
 
-#: literals.py:231
+#: literals.py:232
 msgid "Show a preview an image enhancement, effect, or f/x"
 msgstr "Show a preview an image enhancement, effect, or f/x"
 
-#: literals.py:232
+#: literals.py:233
 msgid "Adobe PostScript"
 msgstr "Adobe PostScript"
 
-#: literals.py:233
+#: literals.py:234
 msgid "Adobe Level II PostScript"
 msgstr "Adobe Level II PostScript"
 
-#: literals.py:234
+#: literals.py:235
 msgid "Adobe Level III PostScript"
 msgstr "Adobe Level III PostScript"
 
-#: literals.py:235
+#: literals.py:236
 msgid "Adobe Large Document Format"
 msgstr "Adobe Large Document Format"
 
-#: literals.py:236
+#: literals.py:237
 msgid "Adobe Photoshop bitmap"
 msgstr "Adobe Photoshop bitmap"
 
-#: literals.py:237
+#: literals.py:238
 msgid "Pyramid encoded TIFF"
 msgstr "Pyramid encoded TIFF"
 
-#: literals.py:238 literals.py:252
+#: literals.py:239 literals.py:253
 msgid "Seattle Film Works"
 msgstr "Seattle Film Works"
 
-#: literals.py:240
+#: literals.py:241
 msgid "Raw red samples"
 msgstr "Raw red samples"
 
-#: literals.py:241
+#: literals.py:242
 msgid "Fuji CCD-RAW Graphic File"
 msgstr "Fuji CCD-RAW Graphic File"
 
-#: literals.py:242 literals.py:258
+#: literals.py:243 literals.py:259
 msgid "SUN Rasterfile"
 msgstr "SUN Rasterfile"
 
-#: literals.py:243
+#: literals.py:244
 msgid "Raw red, blue, and green samples"
 msgstr "Raw red, blue, and green samples"
 
-#: literals.py:244
+#: literals.py:245
 msgid "Raw red, green, and blue samples"
 msgstr "Raw red, green, and blue samples"
 
-#: literals.py:245
+#: literals.py:246
 msgid "Raw red, green, blue, and matte samples"
 msgstr "Raw red, green, blue, and matte samples"
 
-#: literals.py:246
+#: literals.py:247
 msgid "Raw red, green, blue, and opacity samples"
 msgstr "Raw red, green, blue, and opacity samples"
 
-#: literals.py:247
+#: literals.py:248
 msgid "Alias/Wavefront image"
 msgstr "Alias/Wavefront image"
 
-#: literals.py:248
+#: literals.py:249
 msgid "Utah Run length encoded image"
 msgstr "Utah Run length encoded image"
 
-#: literals.py:250
+#: literals.py:251
 msgid "ZX-Spectrum SCREEN$"
 msgstr "ZX-Spectrum SCREEN$"
 
-#: literals.py:251
+#: literals.py:252
 msgid "Scitex HandShake"
 msgstr "Scitex HandShake"
 
-#: literals.py:253
+#: literals.py:254
 msgid "Irix RGB image"
 msgstr "Irix RGB image"
 
-#: literals.py:255
+#: literals.py:256
 msgid "Sony Raw Format 2"
 msgstr "Sony Raw Format 2"
 
-#: literals.py:256
+#: literals.py:257
 msgid "Sony Raw Format"
 msgstr "Sony Raw Format"
 
-#: literals.py:257
+#: literals.py:258
 msgid "Steganographic image"
 msgstr "Steganographic image"
 
-#: literals.py:259
+#: literals.py:260
 msgid "Scalable Vector Graphics (XML 2.7.6, RSVG 2.32.0)"
 msgstr "Scalable Vector Graphics (XML 2.7.6, RSVG 2.32.0)"
 
-#: literals.py:260
+#: literals.py:261
 msgid "Scalable Vector Graphics (ZIP compressed) (XML 2.7.6, RSVG 2.32.0)"
 msgstr "Scalable Vector Graphics (ZIP compressed) (XML 2.7.6, RSVG 2.32.0)"
 
-#: literals.py:262 literals.py:272
+#: literals.py:263 literals.py:273
 msgid "Text"
 msgstr "Текст"
 
-#: literals.py:264
+#: literals.py:265
 msgid "EXIF Profile Thumbnail"
 msgstr "EXIF Profile Thumbnail"
 
-#: literals.py:265
+#: literals.py:266
 msgid "Tagged Image File Format (LIBTIFF, Version 3.9.4)"
 msgstr "Tagged Image File Format (LIBTIFF, Version 3.9.4)"
 
-#: literals.py:266
+#: literals.py:267
 msgid "Tagged Image File Format (64-bit) (LIBTIFF, Version 3.9.4)"
 msgstr "Tagged Image File Format (64-bit) (LIBTIFF, Version 3.9.4)"
 
-#: literals.py:267
+#: literals.py:268
 msgid "Tile image with a texture"
 msgstr "Tile image with a texture"
 
-#: literals.py:268
+#: literals.py:269
 msgid "PSX TIM"
 msgstr "PSX TIM"
 
-#: literals.py:269
+#: literals.py:270
 msgid "TOPOL X Image"
 msgstr "TOPOL X Image"
 
-#: literals.py:270
+#: literals.py:271
 msgid "TrueType font collection (Freetype 2.4.2)"
 msgstr "TrueType font collection (Freetype 2.4.2)"
 
-#: literals.py:271
+#: literals.py:272
 msgid "TrueType font (Freetype 2.4.2)"
 msgstr "TrueType font (Freetype 2.4.2)"
 
-#: literals.py:274
+#: literals.py:275
 msgid "Unicode Text format"
 msgstr "Текстовый формат Unicode"
 
-#: literals.py:275
+#: literals.py:276
 msgid "X-Motif UIL table"
 msgstr "X-Motif UIL table"
 
-#: literals.py:279
+#: literals.py:280
 msgid "VICAR rasterfile format"
 msgstr "VICAR rasterfile format"
 
-#: literals.py:280
+#: literals.py:281
 msgid "Visual Image Directory"
 msgstr "Visual Image Directory"
 
-#: literals.py:281 literals.py:298
+#: literals.py:282 literals.py:299
 msgid "Khoros Visualization image"
 msgstr "Khoros Visualization image"
 
-#: literals.py:284
+#: literals.py:285
 msgid "Wireless Bitmap (level 0) image"
 msgstr "Wireless Bitmap (level 0) image"
 
-#: literals.py:285
+#: literals.py:286
 msgid "Windows Meta File"
 msgstr "Windows Meta File"
 
-#: literals.py:286
+#: literals.py:287
 msgid "Word Perfect Graphics"
 msgstr "Word Perfect Graphics"
 
-#: literals.py:287
+#: literals.py:288
 msgid "Windows Media Video"
 msgstr "Windows Media Video"
 
-#: literals.py:288
+#: literals.py:289
 msgid "Compressed Windows Meta File"
 msgstr "Compressed Windows Meta File"
 
-#: literals.py:290
+#: literals.py:291
 msgid "X Window System"
 msgstr "X Window System"
 
-#: literals.py:291
+#: literals.py:292
 msgid "Foveon X3 (Sigma/Polaroid) Raw picture file"
 msgstr "Foveon X3 (Sigma/Polaroid) Raw picture file"
 
-#: literals.py:292
+#: literals.py:293
 msgid "X Windows system bitmap (black and white)"
 msgstr "X Windows system bitmap (black and white"
 
-#: literals.py:293
+#: literals.py:294
 msgid "Constant image uniform color"
 msgstr "Constant image uniform color"
 
-#: literals.py:294
+#: literals.py:295
 msgid "GIMP image"
 msgstr "GIMP image"
 
-#: literals.py:295
+#: literals.py:296
 msgid "Adobe XML metadata"
 msgstr "Adobe XML metadata"
 
-#: literals.py:296
+#: literals.py:297
 msgid "X Windows system pixmap (color)"
 msgstr "X Windows system pixmap (color)"
 
-#: literals.py:297
+#: literals.py:298
 msgid "Microsoft XML Paper Specification"
 msgstr "Microsoft XML Paper Specification"
 
-#: literals.py:299
+#: literals.py:300
 msgid "XV thumbnail file"
 msgstr "XV thumbnail file"
 
-#: literals.py:300
+#: literals.py:301
 msgid "X Windows system window dump (color)"
 msgstr "X Windows system window dump (color)"
 
-#: literals.py:302
+#: literals.py:303
 msgid "Raw yellow samples"
 msgstr "Raw yellow samples"
 
-#: literals.py:303
+#: literals.py:304
 msgid "CCIR 601 4:1:1 or 4:2:2 (8-bit only)"
 msgstr "CCIR 601 4:1:1 or 4:2:2 (8-bit only)"
 
@@ -898,19 +899,19 @@ msgstr "имя"
 msgid "description"
 msgstr "описание"
 
-#: conf/settings.py:10
+#: conf/settings.py:11
 msgid "File path to imagemagick's convert program."
 msgstr "Путь к утилите convert из пакета ImageMagick."
 
-#: conf/settings.py:11
+#: conf/settings.py:12
 msgid "File path to imagemagick's identify program."
 msgstr "Путь к утилите identify из пакета ImageMagick."
 
-#: conf/settings.py:12
+#: conf/settings.py:13
 msgid "File path to graphicsmagick's program."
 msgstr "Путь к файлу программs GraphicsMagick."
 
-#: conf/settings.py:14
+#: conf/settings.py:15
 msgid ""
 "Graphics conversion backend to use.  Options are: "
 "converter.backends.imagemagick, converter.backends.graphicsmagick and "
@@ -920,6 +921,18 @@ msgstr ""
 "converter.backends.imagemagick, converter.backends.graphicsmagick и "
 "converter.backends.python."
 
+#: conf/settings.py:16
+msgid "Path to the unoconv program."
+msgstr "Путь к программе unoconv."
+
+#: conf/settings.py:17
+msgid ""
+"Use alternate method of connection to LibreOffice using a pipe, it is slower"
+" but less prone to segmentation faults."
+msgstr ""
+"Использовать альтернативный способ подключения к LibreOffice использованием "
+"конвейера pipe, это медленнее, но менее опасно ошибкой сегментации."
+
 #: templates/converter_file_formats_help.html:3
 msgid "Help"
 msgstr "Помощь"
diff --git a/apps/converter/office_converter.py b/apps/converter/office_converter.py
new file mode 100644
index 0000000000..dac7ea3d69
--- /dev/null
+++ b/apps/converter/office_converter.py
@@ -0,0 +1,113 @@
+import os
+import subprocess
+import logging
+
+from mimetype.api import get_mimetype
+from common.conf.settings import TEMPORARY_DIRECTORY
+from common.utils import id_generator
+
+from converter.conf.settings import UNOCONV_PATH, UNOCONV_USE_PIPE
+from converter.exceptions import (OfficeConversionError,
+    OfficeBackendError, UnknownFileFormat)
+
+CACHED_FILE_SUFFIX = u'_office_converter'
+    
+CONVERTER_OFFICE_FILE_MIMETYPES = [
+    'application/msword',
+    'application/mswrite',
+    'application/mspowerpoint',
+    'application/msexcel',
+    'application/vnd.ms-excel',
+    'application/vnd.ms-powerpoint',    
+    'text/plain',
+    'application/vnd.oasis.opendocument.presentation',
+    'application/vnd.oasis.opendocument.text',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'application/vnd.oasis.opendocument.spreadsheet',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'application/vnd.oasis.opendocument.graphics',
+]
+
+logger = logging.getLogger(__name__)
+
+
+class OfficeConverter(object):
+    def __init__(self):
+        self.backend_class = OfficeConverterBackendUnoconv
+        self.backend = self.backend_class()
+        self.exists = False
+        self.mimetype = None
+        self.encoding = None
+    
+    def mimetypes(self):
+        return CONVERTER_OFFICE_FILE_MIMETYPES
+
+    def convert(self, input_filepath, mimetype=None):
+        self.exists = False
+        self.mimetype = None
+        self.encoding = None
+        
+        self.input_filepath = input_filepath
+
+        # Make sure file is of a known office format
+        if mimetype:
+            self.mimetype = mimetype
+        else:
+            self.mimetype, self.encoding = get_mimetype(open(self.input_filepath), self.input_filepath, mimetype_only=True)
+
+        if self.mimetype in CONVERTER_OFFICE_FILE_MIMETYPES:
+            # Cache results of conversion
+            self.output_filepath = os.path.join(TEMPORARY_DIRECTORY, u''.join([self.input_filepath, CACHED_FILE_SUFFIX]))
+            self.exists = os.path.exists(self.output_filepath)
+            if not self.exists:
+                try:
+                    self.backend.convert(self.input_filepath, self.output_filepath)
+                    self.exists = True
+                except OfficeBackendError, msg:
+                    # convert exception so that at least the mime type icon is displayed
+                    raise UnknownFileFormat(msg)
+        
+    def __unicode__(self):
+        return getattr(self, 'output_filepath', None)
+        
+    def __str__(self):
+        return str(self.__unicode__())
+    
+
+class OfficeConverterBackendUnoconv(object):
+    def __init__(self):
+        self.unoconv_path = UNOCONV_PATH if UNOCONV_PATH else u'/usr/bin/unoconv'
+        if not os.path.exists(self.unoconv_path):
+            raise OfficeBackendError('cannot find unoconv executable')
+
+    def convert(self, input_filepath, output_filepath):
+        '''
+        Executes the program unoconv using subprocess's Popen
+        '''
+        self.input_filepath = input_filepath
+        self.output_filepath = output_filepath
+        
+        command = []
+        command.append(self.unoconv_path)
+
+        if UNOCONV_USE_PIPE:
+            command.append(u'--pipe')
+            command.append(u'mayan-%s' % id_generator())
+
+        command.append(u'--format=pdf')
+        command.append(u'--output=%s' % self.output_filepath)
+        command.append(self.input_filepath)
+
+        try:
+            logger.debug('prev environment: %s' % os.environ)
+            proc = subprocess.Popen(command, close_fds=True, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+            return_code = proc.wait()
+            logger.debug('post environment: %s' % os.environ)
+
+            readline = proc.stderr.readline()
+            if return_code != 0:
+                raise OfficeBackendError(proc.stderr.readline())
+        except OSError, msg:
+            raise OfficeBackendError(msg)
+        except Exception, msg:
+            logger.error('Unhandled exception: %s' % msg)
diff --git a/apps/converter/runtime.py b/apps/converter/runtime.py
new file mode 100644
index 0000000000..4d2a67cacc
--- /dev/null
+++ b/apps/converter/runtime.py
@@ -0,0 +1,8 @@
+from converter.office_converter import OfficeConverter
+from converter.exceptions import OfficeBackendError
+
+
+try:
+    office_converter = OfficeConverter()
+except OfficeBackendError:
+    office_converter = None
diff --git a/apps/document_comments/locale/en/LC_MESSAGES/django.po b/apps/document_comments/locale/en/LC_MESSAGES/django.po
index dff22232c6..5c78a1a8aa 100644
--- a/apps/document_comments/locale/en/LC_MESSAGES/django.po
+++ b/apps/document_comments/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: 2011-09-29 18:44-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/document_comments/locale/es/LC_MESSAGES/django.po b/apps/document_comments/locale/es/LC_MESSAGES/django.po
index 44980dced4..233ac4ce9e 100644
--- a/apps/document_comments/locale/es/LC_MESSAGES/django.po
+++ b/apps/document_comments/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:44-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 04:34+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:15
@@ -98,5 +99,3 @@ msgstr "Añadir comentario al documento: %s"
 #, python-format
 msgid "comments: %s"
 msgstr "comentarios: %s"
-
-
diff --git a/apps/document_comments/locale/pt/LC_MESSAGES/django.po b/apps/document_comments/locale/pt/LC_MESSAGES/django.po
index 66500690bb..8a190abb59 100644
--- a/apps/document_comments/locale/pt/LC_MESSAGES/django.po
+++ b/apps/document_comments/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:44-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 21:14+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:15
@@ -99,5 +100,3 @@ msgstr "Adicionar comentário ao documento: %s"
 #, python-format
 msgid "comments: %s"
 msgstr "comentários: %s"
-
-
diff --git a/apps/document_comments/locale/ru/LC_MESSAGES/django.mo b/apps/document_comments/locale/ru/LC_MESSAGES/django.mo
index 728bb26bdd..718e22ed33 100644
Binary files a/apps/document_comments/locale/ru/LC_MESSAGES/django.mo and b/apps/document_comments/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/document_comments/locale/ru/LC_MESSAGES/django.po b/apps/document_comments/locale/ru/LC_MESSAGES/django.po
index d95b41b325..394a1bcad3 100644
--- a/apps/document_comments/locale/ru/LC_MESSAGES/django.po
+++ b/apps/document_comments/locale/ru/LC_MESSAGES/django.po
@@ -1,102 +1,103 @@
 # SOME DESCRIPTIVE TITLE.
 # 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
+# Translators:
+# Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-03 16: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"
-"Language: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-19 20:58+0000\n"
+"Last-Translator: gsv70 <gsv70@mail.ru>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 
 #: __init__.py:15
 msgid "Create new comments"
-msgstr ""
+msgstr "Создать новые комментарии"
 
 #: __init__.py:16
 msgid "Delete comments"
-msgstr ""
+msgstr "Удалить комментарии"
 
 #: __init__.py:17
 msgid "Edit comments"
-msgstr ""
+msgstr "Редактировать комментарии"
 
 #: __init__.py:18
 msgid "View comments"
-msgstr ""
+msgstr "Просмотр комментариев"
 
 #: __init__.py:20
 msgid "Comments"
-msgstr ""
+msgstr "Комментарии"
 
 #: __init__.py:26 __init__.py:27
 msgid "delete"
-msgstr ""
+msgstr "удалить"
 
 #: __init__.py:28
 msgid "add comment"
-msgstr ""
+msgstr "добавить комментарий"
 
 #: __init__.py:29 utils.py:14
 msgid "comments"
-msgstr ""
+msgstr "комментарии"
 
 #: __init__.py:33
 msgid "date"
-msgstr ""
+msgstr "дата"
 
 #: __init__.py:37
 msgid "user"
-msgstr ""
+msgstr "пользователь"
 
 #: __init__.py:41
 msgid "comment"
-msgstr ""
+msgstr "комментарий"
 
 #: views.py:27
 msgid "Must provide at least one comment."
-msgstr ""
+msgstr "Должен быть хотя бы один комментарий."
 
 #: views.py:37
 #, python-format
 msgid "Comment \"%s\" deleted successfully."
-msgstr ""
+msgstr "Комментарий \"%s\" удален."
 
 #: views.py:39
 #, python-format
 msgid "Error deleting comment \"%(comment)s\": %(error)s"
-msgstr ""
+msgstr "Ошибка при удалении комментариев \"%(comment)s\": %(error)s"
 
 #: views.py:54
 #, python-format
 msgid "Are you sure you wish to delete the comment: %s?"
-msgstr ""
+msgstr "Вы действительно хотите удалить комментарий %s?"
 
 #: views.py:56
 #, python-format
 msgid "Are you sure you wish to delete the comments: %s?"
-msgstr ""
+msgstr "Вы действительно хотите удалить комментарии %s?"
 
 #: views.py:86
 msgid "Comment added successfully."
-msgstr ""
+msgstr "Комментарий добавлен."
 
 #: views.py:93
 #, python-format
 msgid "Add comment to document: %s"
-msgstr ""
+msgstr "Добавить комментарий на документ: %s"
 
 #: views.py:109
 #, python-format
 msgid "comments: %s"
-msgstr ""
+msgstr "комментарии:  %s"
diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py
index 8cd494ed7a..5351f8a782 100644
--- a/apps/document_indexing/__init__.py
+++ b/apps/document_indexing/__init__.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 from navigation.api import register_top_menu, register_sidebar_template, \
     register_links
 from permissions.api import register_permission, set_namespace_title
-from main.api import register_maintenance
+from main.api import register_maintenance_links
 from documents.literals import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
 
@@ -24,7 +24,7 @@ register_top_menu('indexes', link={'text': _('indexes'), 'famfam': 'folder_page'
 
 rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')}
 
-register_maintenance(rebuild_index_instances, namespace='document_indexing', title=_(u'Indexes'))
+register_maintenance_links([rebuild_index_instances], namespace='document_indexing', title=_(u'Indexes'))
 
 register_sidebar_template(['index_instance_list'], 'indexing_help.html')
 
diff --git a/apps/document_indexing/locale/en/LC_MESSAGES/django.po b/apps/document_indexing/locale/en/LC_MESSAGES/django.po
index e7244ec289..58bc82a104 100644
--- a/apps/document_indexing/locale/en/LC_MESSAGES/django.po
+++ b/apps/document_indexing/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: 2011-09-29 18:45-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/document_indexing/locale/es/LC_MESSAGES/django.po b/apps/document_indexing/locale/es/LC_MESSAGES/django.po
index 25f537e0cc..b5e2ae10dd 100644
--- a/apps/document_indexing/locale/es/LC_MESSAGES/django.po
+++ b/apps/document_indexing/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 17:05+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:12
@@ -186,8 +187,8 @@ msgstr "¿Está seguro que desea reconstruir todos los índices?"
 #: views.py:83
 msgid "On large databases this operation may take some time to execute."
 msgstr ""
-"En bases de datos de gran tamaño esta operación puede tardar algún tiempo en"
-" ejecutarse."
+"En bases de datos de gran tamaño esta operación puede tardar algún tiempo en "
+"ejecutarse."
 
 #: views.py:89
 msgid "Index rebuild completed successfully."
@@ -211,5 +212,3 @@ msgstr "¿Que son los índices?"
 msgid "Indexes group documents into a tree like hierarchical structure."
 msgstr ""
 "Los índices agrupan documentos en una estructura jerárquica tipo árbol. "
-
-
diff --git a/apps/document_indexing/locale/pt/LC_MESSAGES/django.po b/apps/document_indexing/locale/pt/LC_MESSAGES/django.po
index 6503982432..f8dd4bf8c3 100644
--- a/apps/document_indexing/locale/pt/LC_MESSAGES/django.po
+++ b/apps/document_indexing/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Renata Oliveira <renatabels@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 02:59+0000\n"
 "Last-Translator: renataoliveira <renatabels@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:12
@@ -186,8 +187,7 @@ msgstr "Tem certeza de que deseja reconstruir todos os índices?"
 #: views.py:83
 msgid "On large databases this operation may take some time to execute."
 msgstr ""
-"Em grandes bases de dados esta operação pode levar algum tempo para "
-"executar."
+"Em grandes bases de dados esta operação pode levar algum tempo para executar."
 
 #: views.py:89
 msgid "Index rebuild completed successfully."
@@ -211,5 +211,3 @@ msgstr "Quais são os índices?"
 msgid "Indexes group documents into a tree like hierarchical structure."
 msgstr ""
 "Indexar documentos agrupados em uma árvore como uma estrutura hierárquica."
-
-
diff --git a/apps/document_indexing/locale/ru/LC_MESSAGES/django.po b/apps/document_indexing/locale/ru/LC_MESSAGES/django.po
index 62f39e1af4..13de1dddad 100644
--- a/apps/document_indexing/locale/ru/LC_MESSAGES/django.po
+++ b/apps/document_indexing/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 22:42+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:12
 msgid "View document indexes"
@@ -209,5 +211,3 @@ msgstr "что за индексы?"
 #: templates/indexing_help.html:4
 msgid "Indexes group documents into a tree like hierarchical structure."
 msgstr "Индексы группы документов в древовидной иерархической структуре."
-
-
diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py
index 959b09c86f..5ff5a84c9a 100644
--- a/apps/documents/__init__.py
+++ b/apps/documents/__init__.py
@@ -6,7 +6,7 @@ from common.utils import validate_path, encapsulate
 from navigation.api import register_links, register_top_menu, \
     register_model_list_columns, register_multi_item_links, \
     register_sidebar_template
-from main.api import register_diagnostic, register_maintenance
+from main.api import register_diagnostic, register_maintenance_links
 from permissions.api import register_permission, set_namespace_title
 from tags.widgets import get_tags_inline_widget_simple
 from history.api import register_history_type
@@ -29,7 +29,6 @@ from documents.conf.settings import ZOOM_MIN_LEVEL
 from documents.conf import settings as document_settings
 from documents.widgets import document_thumbnail
 
-
 # Document page links expressions
 def is_first_page(context):
     return context['page'].page_number <= 1
@@ -81,6 +80,7 @@ document_preview = {'text': _(u'preview'), 'class': 'fancybox', 'view': 'documen
 document_download = {'text': _(u'download'), 'view': 'document_download', 'args': 'object.id', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]}
 document_find_duplicates = {'text': _(u'find duplicates'), 'view': 'document_find_duplicates', 'args': 'object.id', 'famfam': 'page_refresh', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 document_find_all_duplicates = {'text': _(u'find all duplicates'), 'view': 'document_find_all_duplicates', 'famfam': 'page_refresh', 'permissions': [PERMISSION_DOCUMENT_VIEW], 'description': _(u'Search all the documents\' checksums and return a list of the exact matches.')}
+document_update_page_count = {'text': _(u'update office documents\' page count'), 'view': 'document_update_page_count', 'famfam': 'page_white_csharp', 'permissions': [PERMISSION_DOCUMENT_TOOLS], 'description': _(u'Update the page count of the office type documents.  This is useful when enabling office document support after there were already office type documents in the database.')}
 document_clear_transformations = {'text': _(u'clear transformations'), 'view': 'document_clear_transformations', 'args': 'object.id', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]}
 document_multiple_clear_transformations = {'text': _(u'clear transformations'), 'view': 'document_multiple_clear_transformations', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]}
 document_print = {'text': _(u'print'), 'view': 'document_print', 'args': 'object.id', 'famfam': 'printer', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
@@ -158,17 +158,16 @@ register_links(['document_page_transformation_edit', 'document_page_transformati
 
 register_diagnostic('documents', _(u'Documents'), document_missing_list)
 
-register_maintenance(document_find_all_duplicates, namespace='documents', title=_(u'documents'))
+register_maintenance_links([document_find_all_duplicates, document_update_page_count], namespace='documents', title=_(u'documents'))
 
-
-def document_exists(document):
-    try:
-        if document.exists():
-            return u'<span class="famfam active famfam-tick"></span>'
-        else:
-            return u'<span class="famfam active famfam-cross"></span>'
-    except Exception, exc:
-        return exc
+#def document_exists(document):
+#    try:
+#        if document.exists():
+#            return u'<span class="famfam active famfam-tick"></span>'
+#        else:
+#            return u'<span class="famfam active famfam-cross"></span>'
+#    except Exception, exc:
+#        return exc
 
 register_model_list_columns(Document, [
         {'name':_(u'thumbnail'), 'attribute':
diff --git a/apps/documents/forms.py b/apps/documents/forms.py
index 9fdc19c5c2..320b60bc71 100644
--- a/apps/documents/forms.py
+++ b/apps/documents/forms.py
@@ -9,11 +9,11 @@ from common.forms import DetailForm
 from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
 from common.conf.settings import DEFAULT_PAPER_SIZE
 from common.conf.settings import DEFAULT_PAGE_ORIENTATION
-from common.widgets import TextAreaDiv
+from common.widgets import TextAreaDiv 
 
 from documents.models import Document, DocumentType, \
     DocumentPage, DocumentPageTransformation, DocumentTypeFilename
-
+from documents.widgets import document_html_widget
 
 # Document page forms
 class DocumentPageTransformationForm(forms.ModelForm):
@@ -32,22 +32,10 @@ class DocumentPageImageWidget(forms.widgets.Widget):
         rotation = final_attrs.get('rotation', 0)
         if value:
             output = []
-            output.append('''
-                <div class="full-height scrollable" style="overflow: auto;">
-                    <div class="tc">
-                        <img class="lazy-load" data-href="%(img)s?page=%(page)d&zoom=%(zoom)d&rotation=%(rotation)d" src="%(static_url)s/images/ajax-loader.gif" alt="%(string)s" />
-                        <noscript>
-                            <img src="%(img)s?page=%(page)d&zoom=%(zoom)d&rotation=%(rotation)d" alt="%(string)s" />
-                        </noscript>
-                    </div>
-                </div>''' % {
-                'img': reverse('document_display', args=[value.document.id]),
-                'page': value.page_number,
-                'zoom': zoom,
-                'rotation': rotation,
-                'static_url': settings.STATIC_URL,
-                'string': ugettext(u'page image')
-                })
+            output.append('<div class="full-height scrollable" style="overflow: auto;">')
+
+            output.append(document_html_widget(value.document, view='document_display', page=value.page_number, zoom=zoom, rotation=rotation))
+            output.append('</div>')
             return mark_safe(u''.join(output))
         else:
             return u''
@@ -113,52 +101,24 @@ class DocumentPagesCarouselWidget(forms.widgets.Widget):
         output.append(u'<div style="white-space:nowrap; overflow: auto;">')
 
         for page in value.documentpage_set.all():
-            try: 
-                page.document.get_valid_image()
-                template =  u'''<div style="display: inline-block; margin: 5px 10px 10px 10px;">
-                            <div class="tc">%(page_string)s %(page)s</div>
-                            <div class="tc" style="border: 1px solid black; margin: 5px 0px 5px 0px;">
-                                <a rel="page_gallery" class="fancybox-noscaling" href="%(view_url)s?page=%(page)d">
-                                    <img class="lazy-load" data-href="%(img)s?page=%(page)d" src="%(static_url)s/images/ajax-loader.gif" alt="%(string)s" />
-                                    <noscript>
-                                        <img src="%(img)s?page=%(page)d" alt="%(string)s" />
-                                    </noscript>
-                                </a>
-                            </div>
-                            <div class="tc">
-                                <a class="fancybox-iframe" href="%(url)s"><span class="famfam active famfam-page_white_go"></span>%(details_string)s</a>
-                            </div>
-                        </div>'''
-            except:
-                template =  u'''<div style="display: inline-block; margin: 5px 10px 10px 10px;">
-                            <div class="tc">%(page_string)s %(page)s</div>
-                            <div class="tc" style="border: 1px solid black; margin: 5px 0px 5px 0px;">
-                                <img class="lazy-load" data-href="%(img)s?page=%(page)d" src="%(static_url)s/images/ajax-loader.gif" alt="%(string)s" />
-                                <noscript>
-                                    <img src="%(img)s?page=%(page)d" alt="%(string)s" />
-                                </noscript>
-                            </div>
-                            <div class="tc">
-                                <a class="fancybox-iframe" href="%(url)s"><span class="famfam active famfam-page_white_go"></span>%(details_string)s</a>
-                            </div>
-                        </div>'''
-                
-            
-            output.append(template % {
-                    'url': reverse('document_page_view', args=[page.pk]),
-                    'img': reverse('document_preview_multipage', args=[value.pk]),
-                    'page': page.page_number,
-                    'view_url': reverse('document_display', args=[page.document.pk]),
-                    'page_string': ugettext(u'Page'),
-                    'details_string': ugettext(u'Details'),
-                    'static_url': settings.STATIC_URL,
-                    'string': _(u'document page')
-                })
+            output.append(u'<div style="display: inline-block; margin: 5px 10px 10px 10px;">')
+            output.append(
+                document_html_widget(
+                    page.document,
+                    view='document_preview_multipage',
+                    click_view='document_display',
+                    page=page.page_number,
+                    gallery_name='document_pages',
+                    fancybox_class='fancybox-noscaling',
+                )
+            )
+            output.append(u'<div class="tc">')
+            output.append(u'<a class="fancybox-iframe" href="%s"><span class="famfam active famfam-page_white_go"></span>%s</a>' % (reverse('document_page_view', args=[page.pk]), ugettext(u'Details')))
+            output.append(u'</div>')
+            output.append(u'</div>')
 
         output.append(u'</div>')
-        output.append(
-            u'<br /><span class="famfam active famfam-magnifier"></span>%s' %
-             ugettext(u'Click on the image for full size preview'))
+        output.append(u'<br /><span class="famfam active famfam-magnifier"></span>%s' % ugettext(u'Click on the image for full size preview'))
 
         return mark_safe(u''.join(output))
 
diff --git a/apps/documents/locale/en/LC_MESSAGES/django.po b/apps/documents/locale/en/LC_MESSAGES/django.po
index d0337648a7..65016db1b2 100644
--- a/apps/documents/locale/en/LC_MESSAGES/django.po
+++ b/apps/documents/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: 2011-09-29 18:43-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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,66 +17,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: __init__.py:50 __init__.py:159
+#: __init__.py:49 __init__.py:159
 msgid "Documents"
 msgstr ""
 
-#: __init__.py:61
+#: __init__.py:60
 msgid "Documents setup"
 msgstr ""
 
-#: __init__.py:71
+#: __init__.py:70
 msgid "all documents"
 msgstr ""
 
-#: __init__.py:72 models.py:381 views.py:672
+#: __init__.py:71 models.py:415 views.py:709
 msgid "recent documents"
 msgstr ""
 
-#: __init__.py:73
+#: __init__.py:72
 msgid "upload new documents"
 msgstr ""
 
-#: __init__.py:74
+#: __init__.py:73
 msgid "clone metadata"
 msgstr ""
 
-#: __init__.py:75
+#: __init__.py:74
 msgid "details"
 msgstr ""
 
-#: __init__.py:76
+#: __init__.py:75
 msgid "properties"
 msgstr ""
 
-#: __init__.py:77 __init__.py:78 __init__.py:92 __init__.py:114
+#: __init__.py:76 __init__.py:77 __init__.py:92 __init__.py:114
 #: __init__.py:120
 msgid "delete"
 msgstr ""
 
-#: __init__.py:79 __init__.py:91 __init__.py:113 __init__.py:119
+#: __init__.py:78 __init__.py:91 __init__.py:113 __init__.py:119
 msgid "edit"
 msgstr ""
 
-#: __init__.py:80
+#: __init__.py:79
 msgid "preview"
 msgstr ""
 
-#: __init__.py:81
+#: __init__.py:80
 msgid "download"
 msgstr ""
 
-#: __init__.py:82
+#: __init__.py:81
 msgid "find duplicates"
 msgstr ""
 
-#: __init__.py:83
+#: __init__.py:82
 msgid "find all duplicates"
 msgstr ""
 
+#: __init__.py:82
+msgid ""
+"Search all the documents' checksums and return a list of the exact matches."
+msgstr ""
+
+#: __init__.py:83
+msgid "update office documents' page count"
+msgstr ""
+
 #: __init__.py:83
 msgid ""
-"Search all the documents' checksums and return a list of the exact matches."
+"Update the page count of the office type documents.  This is useful when "
+"enabling office document support after there were already office type "
+"documents in the database."
 msgstr ""
 
 #: __init__.py:84 __init__.py:85
@@ -99,7 +110,7 @@ msgstr ""
 msgid "create new transformation"
 msgstr ""
 
-#: __init__.py:94 forms.py:49
+#: __init__.py:94
 msgid "page image"
 msgstr ""
 
@@ -155,7 +166,7 @@ msgstr ""
 msgid "document type list"
 msgstr ""
 
-#: __init__.py:111 views.py:840
+#: __init__.py:111 views.py:877
 msgid "document types"
 msgstr ""
 
@@ -163,7 +174,7 @@ msgstr ""
 msgid "documents of this type"
 msgstr ""
 
-#: __init__.py:115 views.py:953
+#: __init__.py:115 views.py:990
 msgid "create document type"
 msgstr ""
 
@@ -175,76 +186,68 @@ msgstr ""
 msgid "add filename to document type"
 msgstr ""
 
-#: __init__.py:161 __init__.py:187 models.py:97 views.py:68
+#: __init__.py:161 __init__.py:186 models.py:101 views.py:69
 msgid "documents"
 msgstr ""
 
-#: __init__.py:174 widgets.py:13
+#: __init__.py:173
 msgid "thumbnail"
 msgstr ""
 
-#: __init__.py:177
+#: __init__.py:176
 msgid "tags"
 msgstr ""
 
-#: __init__.py:180
+#: __init__.py:179
 msgid "metadata"
 msgstr ""
 
-#: forms.py:72
+#: forms.py:60
 msgid "Page image"
 msgstr ""
 
-#: forms.py:82 forms.py:232
+#: forms.py:70 forms.py:209
 msgid "Contents"
 msgstr ""
 
-#: forms.py:135
-msgid "Page"
-msgstr ""
-
-#: forms.py:136
+#: forms.py:116
 msgid "Details"
 msgstr ""
 
-#: forms.py:138 models.py:312 models.py:349
-msgid "document page"
-msgstr ""
-
-#: forms.py:144
+#: forms.py:121
 msgid "Click on the image for full size preview"
 msgstr ""
 
-#: forms.py:154
+#: forms.py:131
 #, python-format
 msgid "Document pages (%s)"
 msgstr ""
 
-#: forms.py:189
+#: forms.py:166
 msgid "Quick document rename"
 msgstr ""
 
-#: forms.py:192
+#: forms.py:169
 msgid "New document filename"
 msgstr ""
 
-#: forms.py:246
+#: forms.py:223
 msgid "Page size"
 msgstr ""
 
-#: forms.py:247
+#: forms.py:224
 msgid "Custom page width"
 msgstr ""
 
-#: forms.py:248
+#: forms.py:225
 msgid "Custom page height"
 msgstr ""
 
-#: forms.py:249
+#: forms.py:226
 msgid "Page orientation"
 msgstr ""
 
-#: forms.py:250
+#: forms.py:227
 msgid "Page range"
 msgstr ""
 
@@ -337,160 +340,164 @@ msgstr ""
 msgid "Document \"%(document)s\" deleted on %(datetime)s by %(fullname)s."
 msgstr ""
 
-#: models.py:59
+#: models.py:63
 msgid "name"
 msgstr ""
 
-#: models.py:65 models.py:74 models.py:281 views.py:859 views.py:889
-#: views.py:918 views.py:923 views.py:966 views.py:1012 views.py:1046
+#: models.py:69 models.py:78 models.py:315 views.py:896 views.py:926
+#: views.py:955 views.py:960 views.py:1003 views.py:1049 views.py:1083
 msgid "document type"
 msgstr ""
 
-#: models.py:66
+#: models.py:70
 msgid "documents types"
 msgstr ""
 
-#: models.py:75
+#: models.py:79
 msgid "file"
 msgstr ""
 
-#: models.py:82
+#: models.py:86
 msgid "added"
 msgstr ""
 
-#: models.py:83
+#: models.py:87
 msgid "updated"
 msgstr ""
 
-#: models.py:84
+#: models.py:88
 msgid "checksum"
 msgstr ""
 
-#: models.py:85
+#: models.py:89
 msgid "description"
 msgstr ""
 
-#: models.py:96 models.py:298 models.py:370 models.py:385 views.py:208
+#: models.py:100 models.py:332 models.py:404 models.py:419 views.py:209
 msgid "document"
 msgstr ""
 
-#: models.py:177
+#: models.py:181
 msgid ""
 "This document's file format is not known, the page count has therefore "
 "defaulted to 1."
 msgstr ""
 
-#: models.py:282
+#: models.py:316
 msgid "filename"
 msgstr ""
 
-#: models.py:283 views.py:973
+#: models.py:317 views.py:1010
 msgid "enabled"
 msgstr ""
 
-#: models.py:290
+#: models.py:324
 msgid "document type quick rename filename"
 msgstr ""
 
-#: models.py:291
+#: models.py:325
 msgid "document types quick rename filenames"
 msgstr ""
 
-#: models.py:299
+#: models.py:333
 msgid "content"
 msgstr ""
 
-#: models.py:300
+#: models.py:334
 msgid "page label"
 msgstr ""
 
-#: models.py:301
+#: models.py:335
 msgid "page number"
 msgstr ""
 
-#: models.py:304
+#: models.py:338
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr ""
 
-#: models.py:313
+#: models.py:346 models.py:383
+msgid "document page"
+msgstr ""
+
+#: models.py:347
 msgid "document pages"
 msgstr ""
 
-#: models.py:324
+#: models.py:358
 msgid "Enter a valid value."
 msgstr ""
 
-#: models.py:350 views.py:327
+#: models.py:384 views.py:333
 msgid "order"
 msgstr ""
 
-#: models.py:351 views.py:328 views.py:383 views.py:412
+#: models.py:385 views.py:334 views.py:389 views.py:418
 msgid "transformation"
 msgstr ""
 
-#: models.py:352 views.py:329
+#: models.py:386 views.py:335
 msgid "arguments"
 msgstr ""
 
-#: models.py:352
+#: models.py:386
 #, python-format
 msgid "Use dictionaries to indentify arguments, example: %s"
 msgstr ""
 
-#: models.py:360
+#: models.py:394
 msgid "document page transformation"
 msgstr ""
 
-#: models.py:361
+#: models.py:395
 msgid "document page transformations"
 msgstr ""
 
-#: models.py:369
+#: models.py:403
 msgid "user"
 msgstr ""
 
-#: models.py:371
+#: models.py:405
 msgid "accessed"
 msgstr ""
 
-#: models.py:380
+#: models.py:414
 msgid "recent document"
 msgstr ""
 
-#: models.py:386
+#: models.py:420
 msgid "Document type"
 msgstr ""
 
-#: models.py:387
+#: models.py:421
 msgid "MIME type"
 msgstr ""
 
-#: models.py:388 views.py:116
+#: models.py:422 views.py:117
 msgid "Filename"
 msgstr ""
 
-#: models.py:389
+#: models.py:423
 msgid "Filename extension"
 msgstr ""
 
-#: models.py:390
+#: models.py:424
 msgid "Metadata value"
 msgstr ""
 
-#: models.py:391
+#: models.py:425
 msgid "Content"
 msgstr ""
 
-#: models.py:392
+#: models.py:426
 msgid "Description"
 msgstr ""
 
-#: models.py:393
+#: models.py:427
 msgid "Tags"
 msgstr ""
 
-#: models.py:394
+#: models.py:428
 msgid "Comments"
 msgstr ""
 
@@ -540,305 +547,322 @@ msgstr ""
 msgid "Document statistics"
 msgstr ""
 
-#: views.py:117
+#: views.py:118
 msgid "File extension"
 msgstr ""
 
-#: views.py:118
+#: views.py:119
 msgid "File mimetype"
 msgstr ""
 
-#: views.py:119
+#: views.py:120
 msgid "File mime encoding"
 msgstr ""
 
-#: views.py:120
+#: views.py:121
 msgid "File size"
 msgstr ""
 
-#: views.py:121
+#: views.py:122
 msgid "Exists in storage"
 msgstr ""
 
-#: views.py:122
+#: views.py:123
 msgid "File path in storage"
 msgstr ""
 
-#: views.py:123
+#: views.py:124
 msgid "Date added"
 msgstr ""
 
-#: views.py:124
+#: views.py:125
 msgid "Time added"
 msgstr ""
 
-#: views.py:125
+#: views.py:126
 msgid "Checksum"
 msgstr ""
 
-#: views.py:126
+#: views.py:127
 msgid "UUID"
 msgstr ""
 
-#: views.py:127
+#: views.py:128
 msgid "Pages"
 msgstr ""
 
-#: views.py:136
+#: views.py:137
 #, python-format
 msgid "document properties for: %s"
 msgstr ""
 
-#: views.py:158
+#: views.py:159
 msgid "document data"
 msgstr ""
 
-#: views.py:183 views.py:484
+#: views.py:184 views.py:521
 msgid "Must provide at least one document."
 msgstr ""
 
-#: views.py:199
+#: views.py:200
 #, python-format
 msgid "Document: %s deleted successfully."
 msgstr ""
 
-#: views.py:201
+#: views.py:202
 #, python-format
 msgid "Document: %(document)s delete error: %(error)s"
 msgstr ""
 
-#: views.py:216
+#: views.py:217
 #, python-format
 msgid "Are you sure you wish to delete the document: %s?"
 msgstr ""
 
-#: views.py:218
+#: views.py:219
 #, python-format
 msgid "Are you sure you wish to delete the documents: %s?"
 msgstr ""
 
-#: views.py:255
+#: views.py:256
 #, python-format
 msgid "Document \"%s\" edited successfully."
 msgstr ""
 
-#: views.py:323
+#: views.py:329
 #, python-format
 msgid "transformations for: %s"
 msgstr ""
 
-#: views.py:347
+#: views.py:353
 msgid "Document page transformation created successfully."
 msgstr ""
 
-#: views.py:356
+#: views.py:362
 #, python-format
 msgid "Create new transformation for page: %(page)s of document: %(document)s"
 msgstr ""
 
-#: views.py:372
+#: views.py:378
 msgid "Document page transformation edited successfully."
 msgstr ""
 
-#: views.py:385
+#: views.py:391
 #, python-format
 msgid "Edit transformation \"%(transformation)s\" for: %(document_page)s"
 msgstr ""
 
-#: views.py:403
+#: views.py:409
 msgid "Document page transformation deleted successfully."
 msgstr ""
 
-#: views.py:414
+#: views.py:420
 #, python-format
 msgid ""
 "Are you sure you wish to delete transformation \"%(transformation)s\" for: "
 "%(document_page)s"
 msgstr ""
 
-#: views.py:428
+#: views.py:434
 #, python-format
 msgid "duplicates of: %s"
 msgstr ""
 
-#: views.py:440
+#: views.py:446
 msgid "Are you sure you wish to find all duplicates?"
 msgstr ""
 
-#: views.py:441 views.py:534
+#: views.py:447 views.py:506 views.py:571
 msgid "On large databases this operation may take some time to execute."
 msgstr ""
 
-#: views.py:456
+#: views.py:462
 msgid "duplicated documents"
 msgstr ""
 
 #: views.py:497
 #, python-format
 msgid ""
+"Page count update complete.  Documents processed: %(total)d, documents with "
+"changed page count: %(change)d"
+msgstr ""
+
+#: views.py:505
+#, python-format
+msgid ""
+"Are you sure you wish to update the page count for the office documents (%d)?"
+msgstr ""
+
+#: views.py:534
+#, python-format
+msgid ""
 "All the page transformations for document: %s, have been deleted "
 "successfully."
 msgstr ""
 
-#: views.py:499
+#: views.py:536
 #, python-format
 msgid ""
 "Error deleting the page transformations for document: %(document)s; "
 "%(error)s."
 msgstr ""
 
-#: views.py:505
+#: views.py:542
 msgid "document transformation"
 msgstr ""
 
-#: views.py:514
+#: views.py:551
 #, python-format
 msgid ""
 "Are you sure you wish to clear all the page transformations for document: %s?"
 msgstr ""
 
-#: views.py:516
+#: views.py:553
 #, python-format
 msgid ""
 "Are you sure you wish to clear all the page transformations for documents: "
 "%s?"
 msgstr ""
 
-#: views.py:544
+#: views.py:581
 msgid "missing documents"
 msgstr ""
 
-#: views.py:557 views.py:595
+#: views.py:594 views.py:632
 #, python-format
 msgid "details for: %s"
 msgstr ""
 
-#: views.py:610
+#: views.py:647
 msgid "Document page edited successfully."
 msgstr ""
 
-#: views.py:619
+#: views.py:656
 #, python-format
 msgid "edit: %s"
 msgstr ""
 
-#: views.py:630
+#: views.py:667
 msgid "There are no more pages in this document"
 msgstr ""
 
-#: views.py:643
+#: views.py:680
 msgid "You are already at the first page of this document"
 msgstr ""
 
-#: views.py:786
+#: views.py:823
 #, python-format
 msgid "print: %s"
 msgstr ""
 
-#: views.py:857
+#: views.py:894
 #, python-format
 msgid "documents of type \"%s\""
 msgstr ""
 
-#: views.py:877
+#: views.py:914
 msgid "Document type edited successfully"
 msgstr ""
 
-#: views.py:880
+#: views.py:917
 #, python-format
 msgid "Error editing document type; %s"
 msgstr ""
 
-#: views.py:885
+#: views.py:922
 #, python-format
 msgid "edit document type: %s"
 msgstr ""
 
-#: views.py:910
+#: views.py:947
 #, python-format
 msgid "Document type: %s deleted successfully."
 msgstr ""
 
-#: views.py:912
+#: views.py:949
 #, python-format
 msgid "Document type: %(document_type)s delete error: %(error)s"
 msgstr ""
 
-#: views.py:927
+#: views.py:964
 #, python-format
 msgid "Are you sure you wish to delete the document type: %s?"
 msgstr ""
 
-#: views.py:928
+#: views.py:965
 msgid ""
 "The document type of all documents using this document type will be set to "
 "none."
 msgstr ""
 
-#: views.py:944
+#: views.py:981
 msgid "Document type created successfully"
 msgstr ""
 
-#: views.py:947
+#: views.py:984
 #, python-format
 msgid "Error creating document type; %(error)s"
 msgstr ""
 
-#: views.py:965
+#: views.py:1002
 #, python-format
 msgid "filenames for document type: %s"
 msgstr ""
 
-#: views.py:996
+#: views.py:1033
 msgid "Document type filename edited successfully"
 msgstr ""
 
-#: views.py:999
+#: views.py:1036
 #, python-format
 msgid "Error editing document type filename; %s"
 msgstr ""
 
-#: views.py:1004
+#: views.py:1041
 #, python-format
 msgid "edit filename \"%(filename)s\" from document type \"%(document_type)s\""
 msgstr ""
 
-#: views.py:1013 views.py:1039 views.py:1047
+#: views.py:1050 views.py:1076 views.py:1084
 msgid "document type filename"
 msgstr ""
 
-#: views.py:1031
+#: views.py:1068
 #, python-format
 msgid "Document type filename: %s deleted successfully."
 msgstr ""
 
-#: views.py:1033
+#: views.py:1070
 #, python-format
 msgid ""
 "Document type filename: %(document_type_filename)s delete error: %(error)s"
 msgstr ""
 
-#: views.py:1049
+#: views.py:1086
 #, python-format
 msgid ""
 "Are you sure you wish to delete the filename: %(filename)s, from document "
 "type \"%(document_type)s\"?"
 msgstr ""
 
-#: views.py:1074
+#: views.py:1111
 msgid "Document type filename created successfully"
 msgstr ""
 
-#: views.py:1077
+#: views.py:1114
 #, python-format
 msgid "Error creating document type filename; %(error)s"
 msgstr ""
 
-#: views.py:1083
+#: views.py:1120
 #, python-format
 msgid "create filename for document type: %s"
 msgstr ""
 
+#: widgets.py:26
+msgid "document page image"
+msgstr ""
+
 #: wizards.py:34
 msgid "step 1 of 3: Document type"
 msgstr ""
diff --git a/apps/documents/locale/es/LC_MESSAGES/django.mo b/apps/documents/locale/es/LC_MESSAGES/django.mo
index 9d81610efb..670f8b0ae8 100644
Binary files a/apps/documents/locale/es/LC_MESSAGES/django.mo and b/apps/documents/locale/es/LC_MESSAGES/django.mo differ
diff --git a/apps/documents/locale/es/LC_MESSAGES/django.po b/apps/documents/locale/es/LC_MESSAGES/django.po
index cb1756d2aa..533bf311c8 100644
--- a/apps/documents/locale/es/LC_MESSAGES/django.po
+++ b/apps/documents/locale/es/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:43-0400\n"
-"PO-Revision-Date: 2011-11-04 00:54+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 15:33+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,70 +18,84 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: __init__.py:50 __init__.py:159
+#: __init__.py:49 __init__.py:159
 msgid "Documents"
 msgstr "Documentos"
 
-#: __init__.py:61
+#: __init__.py:60
 msgid "Documents setup"
 msgstr "Configuración de documentos"
 
-#: __init__.py:71
+#: __init__.py:70
 msgid "all documents"
 msgstr "todos los documentos"
 
-#: __init__.py:72 models.py:381 views.py:672
+#: __init__.py:71 models.py:415 views.py:709
 msgid "recent documents"
 msgstr "documentos recientes"
 
-#: __init__.py:73
+#: __init__.py:72
 msgid "upload new documents"
 msgstr "subir nuevos documentos"
 
-#: __init__.py:74
+#: __init__.py:73
 msgid "clone metadata"
 msgstr "clonar metadatos"
 
-#: __init__.py:75
+#: __init__.py:74
 msgid "details"
 msgstr "detalles"
 
-#: __init__.py:76
+#: __init__.py:75
 msgid "properties"
 msgstr "propiedades"
 
-#: __init__.py:77 __init__.py:78 __init__.py:92 __init__.py:114
+#: __init__.py:76 __init__.py:77 __init__.py:92 __init__.py:114
 #: __init__.py:120
 msgid "delete"
 msgstr "eliminar"
 
-#: __init__.py:79 __init__.py:91 __init__.py:113 __init__.py:119
+#: __init__.py:78 __init__.py:91 __init__.py:113 __init__.py:119
 msgid "edit"
 msgstr "editar"
 
-#: __init__.py:80
+#: __init__.py:79
 msgid "preview"
 msgstr "muestra"
 
-#: __init__.py:81
+#: __init__.py:80
 msgid "download"
 msgstr "descarga"
 
-#: __init__.py:82
+#: __init__.py:81
 msgid "find duplicates"
 msgstr "encontrar duplicados"
 
-#: __init__.py:83
+#: __init__.py:82
 msgid "find all duplicates"
 msgstr "encontrar todos los duplicados"
 
-#: __init__.py:83
+#: __init__.py:82
 msgid ""
 "Search all the documents' checksums and return a list of the exact matches."
 msgstr ""
 "Buscar todas las sumas de comprobación de los documentos y devolver una "
 "lista de las coincidencias exactas."
 
+#: __init__.py:83
+msgid "update office documents' page count"
+msgstr "actualizar el número de páginas de los documentos de oficina"
+
+#: __init__.py:83
+msgid ""
+"Update the page count of the office type documents.  This is useful when "
+"enabling office document support after there were already office type "
+"documents in the database."
+msgstr ""
+"Actualizar el número de páginas de los documentos de oficina.  Esto es útil "
+"cuando active el apoyo de documentos de oficina después de que ya existían "
+"documentos de oficina en la base de datos."
+
 #: __init__.py:84 __init__.py:85
 msgid "clear transformations"
 msgstr "borrar transformaciones"
@@ -102,7 +116,7 @@ msgstr "transformaciones de la página"
 msgid "create new transformation"
 msgstr "crear nueva transformación"
 
-#: __init__.py:94 forms.py:49
+#: __init__.py:94
 msgid "page image"
 msgstr "imagen de la página"
 
@@ -158,7 +172,7 @@ msgstr "Buscar archivos de documentos perdidos"
 msgid "document type list"
 msgstr "ista de tipos de documentos"
 
-#: __init__.py:111 views.py:840
+#: __init__.py:111 views.py:877
 msgid "document types"
 msgstr "tipos de documentos"
 
@@ -166,7 +180,7 @@ msgstr "tipos de documentos"
 msgid "documents of this type"
 msgstr "documentos de este tipo"
 
-#: __init__.py:115 views.py:953
+#: __init__.py:115 views.py:990
 msgid "create document type"
 msgstr "crear tipo de documento"
 
@@ -178,76 +192,68 @@ msgstr "nombres de archivo"
 msgid "add filename to document type"
 msgstr "Añadir nombre de archivo para tipo de documento"
 
-#: __init__.py:161 __init__.py:187 models.py:97 views.py:68
+#: __init__.py:161 __init__.py:186 models.py:101 views.py:69
 msgid "documents"
 msgstr "documentos"
 
-#: __init__.py:174 widgets.py:13
+#: __init__.py:173
 msgid "thumbnail"
 msgstr "miniatura"
 
-#: __init__.py:177
+#: __init__.py:176
 msgid "tags"
 msgstr "etiquetas"
 
-#: __init__.py:180
+#: __init__.py:179
 msgid "metadata"
 msgstr "metadatos"
 
-#: forms.py:72
+#: forms.py:60
 msgid "Page image"
 msgstr "Imagen de la página"
 
-#: forms.py:82 forms.py:232
+#: forms.py:70 forms.py:209
 msgid "Contents"
 msgstr "Contenido"
 
-#: forms.py:135
-msgid "Page"
-msgstr "Página"
-
-#: forms.py:136
+#: forms.py:116
 msgid "Details"
 msgstr "Detalles"
 
-#: forms.py:138 models.py:312 models.py:349
-msgid "document page"
-msgstr "página de documento"
-
-#: forms.py:144
+#: forms.py:121
 msgid "Click on the image for full size preview"
 msgstr "Haga clic en la imagen para ver una muestra de tamaño completo"
 
-#: forms.py:154
+#: forms.py:131
 #, python-format
 msgid "Document pages (%s)"
 msgstr "Páginas del documento (%s)"
 
-#: forms.py:189
+#: forms.py:166
 msgid "Quick document rename"
 msgstr "Cambio rápido de nombre"
 
-#: forms.py:192
+#: forms.py:169
 msgid "New document filename"
 msgstr "Nuevo nombre del archivo"
 
-#: forms.py:246
+#: forms.py:223
 msgid "Page size"
 msgstr "Tamaño de la página"
 
-#: forms.py:247
+#: forms.py:224
 msgid "Custom page width"
 msgstr "Ancho de página alterno"
 
-#: forms.py:248
+#: forms.py:225
 msgid "Custom page height"
 msgstr "Alto de página alterno"
 
-#: forms.py:249
+#: forms.py:226
 msgid "Page orientation"
 msgstr "Orientación de la página"
 
-#: forms.py:250
+#: forms.py:227
 msgid "Page range"
 msgstr "Rango de páginas"
 
@@ -342,44 +348,44 @@ msgstr "Documento \"%(document)s\" eliminado por %(fullname)s."
 msgid "Document \"%(document)s\" deleted on %(datetime)s by %(fullname)s."
 msgstr "Documento \"%(document)s\" eliminado en %(datetime)s por %(fullname)s."
 
-#: models.py:59
+#: models.py:63
 msgid "name"
 msgstr "nombre"
 
-#: models.py:65 models.py:74 models.py:281 views.py:859 views.py:889
-#: views.py:918 views.py:923 views.py:966 views.py:1012 views.py:1046
+#: models.py:69 models.py:78 models.py:315 views.py:896 views.py:926
+#: views.py:955 views.py:960 views.py:1003 views.py:1049 views.py:1083
 msgid "document type"
 msgstr "tipo de documento"
 
-#: models.py:66
+#: models.py:70
 msgid "documents types"
 msgstr "tipos de documentos"
 
-#: models.py:75
+#: models.py:79
 msgid "file"
 msgstr "archivo"
 
-#: models.py:82
+#: models.py:86
 msgid "added"
 msgstr "agregado"
 
-#: models.py:83
+#: models.py:87
 msgid "updated"
 msgstr "actualizado"
 
-#: models.py:84
+#: models.py:88
 msgid "checksum"
 msgstr "suma de comprobación"
 
-#: models.py:85
+#: models.py:89
 msgid "description"
 msgstr "descripción"
 
-#: models.py:96 models.py:298 models.py:370 models.py:385 views.py:208
+#: models.py:100 models.py:332 models.py:404 models.py:419 views.py:209
 msgid "document"
 msgstr "documento"
 
-#: models.py:177
+#: models.py:181
 msgid ""
 "This document's file format is not known, the page count has therefore "
 "defaulted to 1."
@@ -387,118 +393,122 @@ msgstr ""
 "El formato de este archivo de documento no se conoce, el número de páginas "
 "por lo tanto sera 1."
 
-#: models.py:282
+#: models.py:316
 msgid "filename"
 msgstr "nombre de archivo"
 
-#: models.py:283 views.py:973
+#: models.py:317 views.py:1010
 msgid "enabled"
 msgstr "habilitado"
 
-#: models.py:290
+#: models.py:324
 msgid "document type quick rename filename"
 msgstr "nombre de archivo para cambio rápido de nombre para tipo de documento"
 
-#: models.py:291
+#: models.py:325
 msgid "document types quick rename filenames"
 msgstr ""
 "nombres de archivos para cambio rápido de nombre para tipo de documentos"
 
-#: models.py:299
+#: models.py:333
 msgid "content"
 msgstr "contenido"
 
-#: models.py:300
+#: models.py:334
 msgid "page label"
 msgstr "etiqueta de la página"
 
-#: models.py:301
+#: models.py:335
 msgid "page number"
 msgstr "número de página"
 
-#: models.py:304
+#: models.py:338
 #, python-format
 msgid "Page %(page_num)d out of %(total_pages)d of %(document)s"
 msgstr "Pagína %(page_num)d de %(total_pages)d de %(document)s "
 
-#: models.py:313
+#: models.py:346 models.py:383
+msgid "document page"
+msgstr "página de documento"
+
+#: models.py:347
 msgid "document pages"
 msgstr "páginas de documentos"
 
-#: models.py:324
+#: models.py:358
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
 
-#: models.py:350 views.py:327
+#: models.py:384 views.py:333
 msgid "order"
 msgstr "orden"
 
-#: models.py:351 views.py:328 views.py:383 views.py:412
+#: models.py:385 views.py:334 views.py:389 views.py:418
 msgid "transformation"
 msgstr "transformación"
 
-#: models.py:352 views.py:329
+#: models.py:386 views.py:335
 msgid "arguments"
 msgstr "argumentos"
 
-#: models.py:352
+#: models.py:386
 #, python-format
 msgid "Use dictionaries to indentify arguments, example: %s"
 msgstr "Utilize diccionarios para indentificar argumentos, por ejemplo: %s"
 
-#: models.py:360
+#: models.py:394
 msgid "document page transformation"
 msgstr "transformación de página de documento"
 
-#: models.py:361
+#: models.py:395
 msgid "document page transformations"
 msgstr "transformaciones de páginas de documentos"
 
-#: models.py:369
+#: models.py:403
 msgid "user"
 msgstr "usuario"
 
-#: models.py:371
+#: models.py:405
 msgid "accessed"
 msgstr "accesado"
 
-#: models.py:380
+#: models.py:414
 msgid "recent document"
 msgstr "documento reciente"
 
-#: models.py:386
+#: models.py:420
 msgid "Document type"
 msgstr "Tipo de documento"
 
-#: models.py:387
+#: models.py:421
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: models.py:388 views.py:116
+#: models.py:422 views.py:117
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#: models.py:389
+#: models.py:423
 msgid "Filename extension"
 msgstr "Extensión de archivo"
 
-#: models.py:390
+#: models.py:424
 msgid "Metadata value"
 msgstr "Valor de metadatos"
 
-#: models.py:391
+#: models.py:425
 msgid "Content"
 msgstr "Contenido"
 
-#: models.py:392
+#: models.py:426
 msgid "Description"
 msgstr "Descripción"
 
-#: models.py:393
+#: models.py:427
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: models.py:394
+#: models.py:428
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -550,118 +560,118 @@ msgstr "Promedio de páginas por documento: %(page_count__avg)f"
 msgid "Document statistics"
 msgstr "Estadísticas de documentos"
 
-#: views.py:117
+#: views.py:118
 msgid "File extension"
 msgstr "Extensión de archivo"
 
-#: views.py:118
+#: views.py:119
 msgid "File mimetype"
 msgstr "Tipo MIME del archivo"
 
-#: views.py:119
+#: views.py:120
 msgid "File mime encoding"
 msgstr "Codificación de archivos MIME"
 
-#: views.py:120
+#: views.py:121
 msgid "File size"
 msgstr "Tamaños del archivo"
 
-#: views.py:121
+#: views.py:122
 msgid "Exists in storage"
 msgstr "Existe en el almacenamiento"
 
-#: views.py:122
+#: views.py:123
 msgid "File path in storage"
 msgstr "Ruta de archivos en el almacenamiento"
 
-#: views.py:123
+#: views.py:124
 msgid "Date added"
 msgstr "Fecha en que se agregó"
 
-#: views.py:124
+#: views.py:125
 msgid "Time added"
 msgstr "El tiempo añadido"
 
-#: views.py:125
+#: views.py:126
 msgid "Checksum"
 msgstr "Suma de comprobación"
 
-#: views.py:126
+#: views.py:127
 msgid "UUID"
 msgstr "UUID"
 
-#: views.py:127
+#: views.py:128
 msgid "Pages"
 msgstr "Páginas"
 
-#: views.py:136
+#: views.py:137
 #, python-format
 msgid "document properties for: %s"
 msgstr "propiedades del documento: %s"
 
-#: views.py:158
+#: views.py:159
 msgid "document data"
 msgstr "datos del documento"
 
-#: views.py:183 views.py:484
+#: views.py:184 views.py:521
 msgid "Must provide at least one document."
 msgstr "Debe proveer al menos un documento."
 
-#: views.py:199
+#: views.py:200
 #, python-format
 msgid "Document: %s deleted successfully."
 msgstr "Documento: %s eliminado con éxito."
 
-#: views.py:201
+#: views.py:202
 #, python-format
 msgid "Document: %(document)s delete error: %(error)s"
 msgstr "Documento: %(document)s, error de eliminación: %(error)s "
 
-#: views.py:216
+#: views.py:217
 #, python-format
 msgid "Are you sure you wish to delete the document: %s?"
 msgstr "¿Está seguro que desea eliminar el documento: %s?"
 
-#: views.py:218
+#: views.py:219
 #, python-format
 msgid "Are you sure you wish to delete the documents: %s?"
 msgstr "¿Está seguro que desea eliminar los documentos: %s?"
 
-#: views.py:255
+#: views.py:256
 #, python-format
 msgid "Document \"%s\" edited successfully."
 msgstr "Documento \"%s\" editado exitosamente."
 
-#: views.py:323
+#: views.py:329
 #, python-format
 msgid "transformations for: %s"
 msgstr "transformaciones para: %s"
 
-#: views.py:347
+#: views.py:353
 msgid "Document page transformation created successfully."
 msgstr "Transformación de página de documento creada con exitosamente."
 
-#: views.py:356
+#: views.py:362
 #, python-format
 msgid "Create new transformation for page: %(page)s of document: %(document)s"
 msgstr ""
 "Crear nueva transformación de la página: %(page)s del documento: "
 "%(document)s "
 
-#: views.py:372
+#: views.py:378
 msgid "Document page transformation edited successfully."
 msgstr "Transformación de página de documento editada con exitosamente."
 
-#: views.py:385
+#: views.py:391
 #, python-format
 msgid "Edit transformation \"%(transformation)s\" for: %(document_page)s"
 msgstr "Editar transformación \" %(transformation)s\" para: %(document_page)s"
 
-#: views.py:403
+#: views.py:409
 msgid "Document page transformation deleted successfully."
 msgstr "Transformación de página de documento eliminada exitosamente."
 
-#: views.py:414
+#: views.py:420
 #, python-format
 msgid ""
 "Are you sure you wish to delete transformation \"%(transformation)s\" for: "
@@ -670,35 +680,53 @@ msgstr ""
 "¿Está seguro que desea eliminar la transformación \"%(transformation)s\" "
 "para: %(document_page)s"
 
-#: views.py:428
+#: views.py:434
 #, python-format
 msgid "duplicates of: %s"
 msgstr "duplicados de: %s"
 
-#: views.py:440
+#: views.py:446
 msgid "Are you sure you wish to find all duplicates?"
 msgstr "¿Está seguro que desea encontrar todos los duplicados?"
 
-#: views.py:441 views.py:534
+#: views.py:447 views.py:506 views.py:571
 msgid "On large databases this operation may take some time to execute."
 msgstr ""
 "En bases de datos de gran tamaño esta operación puede tardar algún tiempo en"
 " ejecutarse."
 
-#: views.py:456
+#: views.py:462
 msgid "duplicated documents"
 msgstr "documentos duplicados"
 
 #: views.py:497
 #, python-format
 msgid ""
+"Page count update complete.  Documents processed: %(total)d, documents with "
+"changed page count: %(change)d"
+msgstr ""
+"Actualización de número de páginas completado.  Documentos procesados: "
+"%(total)d, documentos con el número de páginas actualizado: %(change)d"
+
+#: views.py:505
+#, python-format
+msgid ""
+"Are you sure you wish to update the page count for the office documents "
+"(%d)?"
+msgstr ""
+"¿Seguro que desea actualizar el número de páginas de los documentos de "
+"oficina (%d)?"
+
+#: views.py:534
+#, python-format
+msgid ""
 "All the page transformations for document: %s, have been deleted "
 "successfully."
 msgstr ""
 "Todas las transformaciones de la página de documento: %s, se han eliminado "
 "con éxito."
 
-#: views.py:499
+#: views.py:536
 #, python-format
 msgid ""
 "Error deleting the page transformations for document: %(document)s; "
@@ -707,11 +735,11 @@ msgstr ""
 "Error al eliminar las transformaciones de página para el documento: "
 "%(document)s; %(error)s."
 
-#: views.py:505
+#: views.py:542
 msgid "document transformation"
 msgstr "transformación de documento"
 
-#: views.py:514
+#: views.py:551
 #, python-format
 msgid ""
 "Are you sure you wish to clear all the page transformations for document: "
@@ -720,7 +748,7 @@ msgstr ""
 "¿Está seguro que desea eliminar todas las transformaciones de página del "
 "documento: %s?"
 
-#: views.py:516
+#: views.py:553
 #, python-format
 msgid ""
 "Are you sure you wish to clear all the page transformations for documents: "
@@ -729,73 +757,73 @@ msgstr ""
 "¿Está seguro que desea eliminar las transformaciones de página de los "
 "documentos: %s?"
 
-#: views.py:544
+#: views.py:581
 msgid "missing documents"
 msgstr "documentos perdidos"
 
-#: views.py:557 views.py:595
+#: views.py:594 views.py:632
 #, python-format
 msgid "details for: %s"
 msgstr "detalles para: %s"
 
-#: views.py:610
+#: views.py:647
 msgid "Document page edited successfully."
 msgstr "Página del documento se ha editado correctamente."
 
-#: views.py:619
+#: views.py:656
 #, python-format
 msgid "edit: %s"
 msgstr "editar: %s"
 
-#: views.py:630
+#: views.py:667
 msgid "There are no more pages in this document"
 msgstr "No hay más páginas en este documento"
 
-#: views.py:643
+#: views.py:680
 msgid "You are already at the first page of this document"
 msgstr "Usted ya está en la primera página de este documento"
 
-#: views.py:786
+#: views.py:823
 #, python-format
 msgid "print: %s"
 msgstr "Imprimir: %s"
 
-#: views.py:857
+#: views.py:894
 #, python-format
 msgid "documents of type \"%s\""
 msgstr "documentos de tipo \"%s\""
 
-#: views.py:877
+#: views.py:914
 msgid "Document type edited successfully"
 msgstr "Tipo de documento editado exitosamente"
 
-#: views.py:880
+#: views.py:917
 #, python-format
 msgid "Error editing document type; %s"
 msgstr "Error al modificar el tipo de documento; %s"
 
-#: views.py:885
+#: views.py:922
 #, python-format
 msgid "edit document type: %s"
 msgstr "editar tipo de documento: %s"
 
-#: views.py:910
+#: views.py:947
 #, python-format
 msgid "Document type: %s deleted successfully."
 msgstr "Tipo de documento: %s eliminado exitosamente."
 
-#: views.py:912
+#: views.py:949
 #, python-format
 msgid "Document type: %(document_type)s delete error: %(error)s"
 msgstr ""
 "Error de eliminación: %(error)s para tipo de documento: %(document_type)s "
 
-#: views.py:927
+#: views.py:964
 #, python-format
 msgid "Are you sure you wish to delete the document type: %s?"
 msgstr "¿Está seguro que desea eliminar el tipo de documento: %s?"
 
-#: views.py:928
+#: views.py:965
 msgid ""
 "The document type of all documents using this document type will be set to "
 "none."
@@ -803,46 +831,46 @@ msgstr ""
 "El tipo de documento de todos los documentos que utilizan este tipo de "
 "documentos será borrado."
 
-#: views.py:944
+#: views.py:981
 msgid "Document type created successfully"
 msgstr "Tipo de documento creado exitosamente."
 
-#: views.py:947
+#: views.py:984
 #, python-format
 msgid "Error creating document type; %(error)s"
 msgstr "Error documento creando tipo de documento; %(error)s "
 
-#: views.py:965
+#: views.py:1002
 #, python-format
 msgid "filenames for document type: %s"
 msgstr "nombres de archivo para tipo de documento: %s"
 
-#: views.py:996
+#: views.py:1033
 msgid "Document type filename edited successfully"
 msgstr "Nombre de archivo de tipo de documento editado con exitosamente"
 
-#: views.py:999
+#: views.py:1036
 #, python-format
 msgid "Error editing document type filename; %s"
 msgstr "Error al modificar el nombre de archivo para tipo de document; %s"
 
-#: views.py:1004
+#: views.py:1041
 #, python-format
 msgid "edit filename \"%(filename)s\" from document type \"%(document_type)s\""
 msgstr ""
 "editar nombre de archivo \"%(filename)s\" del tipo de documento "
 "\"%(document_type)s\""
 
-#: views.py:1013 views.py:1039 views.py:1047
+#: views.py:1050 views.py:1076 views.py:1084
 msgid "document type filename"
 msgstr "nombre de archivo para tipo de documento"
 
-#: views.py:1031
+#: views.py:1068
 #, python-format
 msgid "Document type filename: %s deleted successfully."
 msgstr "Nombre de archivo para tipo de documento: %s eliminado exitosamente."
 
-#: views.py:1033
+#: views.py:1070
 #, python-format
 msgid ""
 "Document type filename: %(document_type_filename)s delete error: %(error)s"
@@ -850,7 +878,7 @@ msgstr ""
 "Error de eliminación: %(error)s para nombre de archivo de tipo de documento:"
 " %(document_type_filename)s  "
 
-#: views.py:1049
+#: views.py:1086
 #, python-format
 msgid ""
 "Are you sure you wish to delete the filename: %(filename)s, from document "
@@ -859,20 +887,24 @@ msgstr ""
 "¿Está seguro que desea eliminar el nombre del archivo: %(filename)s, del "
 "tipo de documento \"%(document_type)s\"?"
 
-#: views.py:1074
+#: views.py:1111
 msgid "Document type filename created successfully"
 msgstr "Nombre de archivo de tipo de documento creado exitosamente."
 
-#: views.py:1077
+#: views.py:1114
 #, python-format
 msgid "Error creating document type filename; %(error)s"
 msgstr "Error al crear nombre de archivo para tipo de documento; %(error)s"
 
-#: views.py:1083
+#: views.py:1120
 #, python-format
 msgid "create filename for document type: %s"
 msgstr "crear nombre de archivo para tipo de documento: %s"
 
+#: widgets.py:26
+msgid "document page image"
+msgstr "imagen de página de documento"
+
 #: wizards.py:34
 msgid "step 1 of 3: Document type"
 msgstr "paso 1 de 3: Tipo de documento"
diff --git a/apps/documents/locale/pt/LC_MESSAGES/django.po b/apps/documents/locale/pt/LC_MESSAGES/django.po
index 07c4f5271a..97034e32f9 100644
--- a/apps/documents/locale/pt/LC_MESSAGES/django.po
+++ b/apps/documents/locale/pt/LC_MESSAGES/django.po
@@ -1,87 +1,99 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:43-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 21:10+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
-#: __init__.py:50 __init__.py:159
+#: __init__.py:49 __init__.py:159
 msgid "Documents"
 msgstr "Documentos"
 
-#: __init__.py:61
+#: __init__.py:60
 msgid "Documents setup"
 msgstr "Configuração de documentos"
 
-#: __init__.py:71
+#: __init__.py:70
 msgid "all documents"
 msgstr "todos os documentos"
 
-#: __init__.py:72 models.py:381 views.py:672
+#: __init__.py:71 models.py:415 views.py:709
 msgid "recent documents"
 msgstr "documentos recentes"
 
-#: __init__.py:73
+#: __init__.py:72
 msgid "upload new documents"
 msgstr "upload de novos documentos"
 
-#: __init__.py:74
+#: __init__.py:73
 msgid "clone metadata"
 msgstr "clonar metadados"
 
-#: __init__.py:75
+#: __init__.py:74
 msgid "details"
 msgstr "detalhes"
 
-#: __init__.py:76
+#: __init__.py:75
 msgid "properties"
 msgstr "propriedades"
 
-#: __init__.py:77 __init__.py:78 __init__.py:92 __init__.py:114
+#: __init__.py:76 __init__.py:77 __init__.py:92 __init__.py:114
 #: __init__.py:120
 msgid "delete"
 msgstr "excluir"
 
-#: __init__.py:79 __init__.py:91 __init__.py:113 __init__.py:119
+#: __init__.py:78 __init__.py:91 __init__.py:113 __init__.py:119
 msgid "edit"
 msgstr "editar"
 
-#: __init__.py:80
+#: __init__.py:79
 msgid "preview"
 msgstr "visualização"
 
-#: __init__.py:81
+#: __init__.py:80
 msgid "download"
 msgstr "baixar"
 
-#: __init__.py:82
+#: __init__.py:81
 msgid "find duplicates"
 msgstr "encontrar duplicatas"
 
-#: __init__.py:83
+#: __init__.py:82
 msgid "find all duplicates"
 msgstr "encontrar todas as duplicatas"
 
-#: __init__.py:83
+#: __init__.py:82
 msgid ""
 "Search all the documents' checksums and return a list of the exact matches."
 msgstr ""
 "Pesquisar todas as somas de verificação de documentos e retornar uma lista "
 "de correspondências exatas."
 
+#: __init__.py:83
+msgid "update office documents' page count"
+msgstr ""
+
+#: __init__.py:83
+msgid ""
+"Update the page count of the office type documents.  This is useful when "
+"enabling office document support after there were already office type "
+"documents in the database."
+msgstr ""
+
 #: __init__.py:84 __init__.py:85
 msgid "clear transformations"
 msgstr "remover transformações"
@@ -102,7 +114,7 @@ msgstr "transformações de página"
 msgid "create new transformation"
 msgstr "criar nova transformação"
 
-#: __init__.py:94 forms.py:49
+#: __init__.py:94
 msgid "page image"
 msgstr "imagem da página"
 
@@ -158,7 +170,7 @@ msgstr "Encontrar arquivos de documentos em falta"
 msgid "document type list"
 msgstr "lista de tipo de documento"
 
-#: __init__.py:111 views.py:840
+#: __init__.py:111 views.py:877
 msgid "document types"
 msgstr "tipos de documentos"
 
@@ -166,7 +178,7 @@ msgstr "tipos de documentos"
 msgid "documents of this type"
 msgstr "documentos deste tipo"
 
-#: __init__.py:115 views.py:953
+#: __init__.py:115 views.py:990
 msgid "create document type"
 msgstr "criar tipo de documento"
 
@@ -178,76 +190,68 @@ msgstr "nomes de arquivos"
 msgid "add filename to document type"
 msgstr "adicionar nome do arquivo para o tipo de documento"
 
-#: __init__.py:161 __init__.py:187 models.py:97 views.py:68
+#: __init__.py:161 __init__.py:186 models.py:101 views.py:69
 msgid "documents"
 msgstr "documentos"
 
-#: __init__.py:174 widgets.py:13
+#: __init__.py:173
 msgid "thumbnail"
 msgstr "miniatura"
 
-#: __init__.py:177
+#: __init__.py:176
 msgid "tags"
 msgstr "tags"
 
-#: __init__.py:180
+#: __init__.py:179
 msgid "metadata"
 msgstr "metadado"
 
-#: forms.py:72
+#: forms.py:60
 msgid "Page image"
 msgstr "Imagem da página"
 
-#: forms.py:82 forms.py:232
+#: forms.py:70 forms.py:209
 msgid "Contents"
 msgstr "Conteúdos"
 
-#: forms.py:135
-msgid "Page"
-msgstr "Página"
-
-#: forms.py:136
+#: forms.py:116
 msgid "Details"
 msgstr "Detalhes"
 
-#: forms.py:138 models.py:312 models.py:349
-msgid "document page"
-msgstr "página do documento"
-
-#: forms.py:144
+#: forms.py:121
 msgid "Click on the image for full size preview"
 msgstr "Clique na imagem para visualizar em tamanho completo"
 
-#: forms.py:154
+#: forms.py:131
 #, python-format
 msgid "Document pages (%s)"
 msgstr "Páginas do documento (%s)"
 
-#: forms.py:189
+#: forms.py:166
 msgid "Quick document rename"
 msgstr "Renomear documento rápido"
 
-#: forms.py:192
+#: forms.py:169
 msgid "New document filename"
 msgstr "Novo nome de arquivo"
 
-#: forms.py:246
+#: forms.py:223
 msgid "Page size"
 msgstr "Tamanho da página"
 
-#: forms.py:247
+#: forms.py:224
 msgid "Custom page width"
 msgstr "Largura da página personalizada"
 
-#: forms.py:248
+#: forms.py:225
 msgid "Custom page height"
 msgstr "Altura da página personalizada"
 
-#: forms.py:249
+#: forms.py:226
 msgid "Page orientation"
 msgstr "Orientação da página"
 
-#: forms.py:250
+#: forms.py:227
 msgid "Page range"
 msgstr "Intervalo de páginas"
 
@@ -306,8 +310,10 @@ msgstr "Documento \"%(content_object)s\" criado por %(fullname)s."
 
 #: literals.py:25
 #, python-format
-msgid "Document \"%(content_object)s\" created on %(datetime)s by %(fullname)s."
-msgstr "Documento \"%(content_object)s\" criado em %(datetime)s por %(fullname)s."
+msgid ""
+"Document \"%(content_object)s\" created on %(datetime)s by %(fullname)s."
+msgstr ""
+"Documento \"%(content_object)s\" criado em %(datetime)s por %(fullname)s."
 
 #: literals.py:31
 msgid "Document edited"
@@ -321,8 +327,8 @@ msgstr "Documento \"%(content_object)s\" editado por %(fullname)s."
 #: literals.py:33
 #, python-format
 msgid ""
-"Document \"%(content_object)s\" was edited on %(datetime)s by %(fullname)s."
-"  The following changes took place: %(changes)s."
+"Document \"%(content_object)s\" was edited on %(datetime)s by %(fullname)s.  "
+"The following changes took place: %(changes)s."
 msgstr ""
 "Documento \"%(content_object)s\" foi editado em %(datetime)s por "
 "%(fullname)s.  As seguintes alterações foram realizadas: %(changes)s."
@@ -341,162 +347,166 @@ msgstr "Documento \"%(document)s\" deletado por %(fullname)s."
 msgid "Document \"%(document)s\" deleted on %(datetime)s by %(fullname)s."
 msgstr "Documento \"%(document)s\" deletado em %(datetime)s por %(fullname)s."
 
-#: models.py:59
+#: models.py:63
 msgid "name"
 msgstr "nome"
 
-#: models.py:65 models.py:74 models.py:281 views.py:859 views.py:889
-#: views.py:918 views.py:923 views.py:966 views.py:1012 views.py:1046
+#: models.py:69 models.py:78 models.py:315 views.py:896 views.py:926
+#: views.py:955 views.py:960 views.py:1003 views.py:1049 views.py:1083
 msgid "document type"
 msgstr "tipo de documento"
 
-#: models.py:66
+#: models.py:70
 msgid "documents types"
 msgstr "tipos de documentos"
 
-#: models.py:75
+#: models.py:79
 msgid "file"
 msgstr "arquivo"
 
-#: models.py:82
+#: models.py:86
 msgid "added"
 msgstr "adicionado"
 
-#: models.py:83
+#: models.py:87
 msgid "updated"
 msgstr "atualizado"
 
-#: models.py:84
+#: models.py:88
 msgid "checksum"
 msgstr "verificações"
 
-#: models.py:85
+#: models.py:89
 msgid "description"
 msgstr "descrição"
 
-#: models.py:96 models.py:298 models.py:370 models.py:385 views.py:208
+#: models.py:100 models.py:332 models.py:404 models.py:419 views.py:209
 msgid "document"
 msgstr "documento"
 
-#: models.py:177
+#: models.py:181
 msgid ""
 "This document's file format is not known, the page count has therefore "
 "defaulted to 1."
 msgstr ""
-"Este formato de arquivo não é conhecida, a contagem de página, portanto, tem"
-" o padrão 1."
+"Este formato de arquivo não é conhecida, a contagem de página, portanto, tem "
+"o padrão 1."
 
-#: models.py:282
+#: models.py:316
 msgid "filename"
 msgstr "nome do arquivo"
 
-#: models.py:283 views.py:973
+#: models.py:317 views.py:1010
 msgid "enabled"
 msgstr "habilitado"
 
-#: models.py:290
+#: models.py:324
 msgid "document type quick rename filename"
 msgstr "tipo de documento renomear rápido"
 
-#: models.py:291
+#: models.py:325
 msgid "document types quick rename filenames"
 msgstr "tipos de documentos renomear rápido"
 
-#: models.py:299
+#: models.py:333
 msgid "content"
 msgstr "conteúdo"
 
-#: models.py:300
+#: models.py:334
 msgid "page label"
 msgstr "etiqueta da página"
 
-#: models.py:301
+#: models.py:335
 msgid "page number"
 msgstr "número da página"
 
-#: models.py:304
+#: models.py:338
 #, 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:313
+#: models.py:346 models.py:383
+msgid "document page"
+msgstr "página do documento"
+
+#: models.py:347
 msgid "document pages"
 msgstr "páginas do documento"
 
-#: models.py:324
+#: models.py:358
 msgid "Enter a valid value."
 msgstr "Digite um valor válido."
 
-#: models.py:350 views.py:327
+#: models.py:384 views.py:333
 msgid "order"
 msgstr "ordem"
 
-#: models.py:351 views.py:328 views.py:383 views.py:412
+#: models.py:385 views.py:334 views.py:389 views.py:418
 msgid "transformation"
 msgstr "transformação"
 
-#: models.py:352 views.py:329
+#: models.py:386 views.py:335
 msgid "arguments"
 msgstr "argumentos"
 
-#: models.py:352
+#: models.py:386
 #, python-format
 msgid "Use dictionaries to indentify arguments, example: %s"
 msgstr "Use dicionários para identificar os argumentos, exemplo: %s"
 
-#: models.py:360
+#: models.py:394
 msgid "document page transformation"
 msgstr "página de transformações do documento"
 
-#: models.py:361
+#: models.py:395
 msgid "document page transformations"
 msgstr "Página de transformações de documentos"
 
-#: models.py:369
+#: models.py:403
 msgid "user"
 msgstr "usuário"
 
-#: models.py:371
+#: models.py:405
 msgid "accessed"
 msgstr "acessado"
 
-#: models.py:380
+#: models.py:414
 msgid "recent document"
 msgstr "documento recente"
 
-#: models.py:386
+#: models.py:420
 msgid "Document type"
 msgstr "Tipo de documento"
 
-#: models.py:387
+#: models.py:421
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: models.py:388 views.py:116
+#: models.py:422 views.py:117
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: models.py:389
+#: models.py:423
 msgid "Filename extension"
 msgstr "Extensão do arquivo"
 
-#: models.py:390
+#: models.py:424
 msgid "Metadata value"
 msgstr "Valor de metadados"
 
-#: models.py:391
+#: models.py:425
 msgid "Content"
 msgstr "Conteúdo"
 
-#: models.py:392
+#: models.py:426
 msgid "Description"
 msgstr "Descrição"
 
-#: models.py:393
+#: models.py:427
 msgid "Tags"
 msgstr "Tags"
 
-#: models.py:394
+#: models.py:428
 msgid "Comments"
 msgstr "Comentários"
 
@@ -518,8 +528,8 @@ msgstr "Documentos no armazenamento: %d"
 #: statistics.py:46
 #, python-format
 msgid ""
-"Space used in storage: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d"
-" bytes"
+"Space used in storage: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d "
+"bytes"
 msgstr ""
 "Espaço usado no armazenamento: %(base_2)s (base 2), %(base_10)s (base 10), "
 "%(bytes)d bytes"
@@ -548,117 +558,117 @@ msgstr "Quantidade média de páginas por documento: %(page_count__avg)f"
 msgid "Document statistics"
 msgstr "Estatísticas do documento"
 
-#: views.py:117
+#: views.py:118
 msgid "File extension"
 msgstr "Extensão de arquivo"
 
-#: views.py:118
+#: views.py:119
 msgid "File mimetype"
 msgstr "Mimetype do arquivo"
 
-#: views.py:119
+#: views.py:120
 msgid "File mime encoding"
 msgstr "Codificação MIME do arquivo"
 
-#: views.py:120
+#: views.py:121
 msgid "File size"
 msgstr "Tamanho do arquivo"
 
-#: views.py:121
+#: views.py:122
 msgid "Exists in storage"
 msgstr "Existe no armazenamento"
 
-#: views.py:122
+#: views.py:123
 msgid "File path in storage"
 msgstr "Caminho do arquivo no armazenamento"
 
-#: views.py:123
+#: views.py:124
 msgid "Date added"
 msgstr "Data de adição"
 
-#: views.py:124
+#: views.py:125
 msgid "Time added"
 msgstr "Horario de adição"
 
-#: views.py:125
+#: views.py:126
 msgid "Checksum"
 msgstr "Verificação"
 
-#: views.py:126
+#: views.py:127
 msgid "UUID"
 msgstr "UUID"
 
-#: views.py:127
+#: views.py:128
 msgid "Pages"
 msgstr "Páginas"
 
-#: views.py:136
+#: views.py:137
 #, python-format
 msgid "document properties for: %s"
 msgstr "propriedades de documento para: %s"
 
-#: views.py:158
+#: views.py:159
 msgid "document data"
 msgstr "dados do documento"
 
-#: views.py:183 views.py:484
+#: views.py:184 views.py:521
 msgid "Must provide at least one document."
 msgstr "Deve fornecer pelo menos um documento."
 
-#: views.py:199
+#: views.py:200
 #, python-format
 msgid "Document: %s deleted successfully."
 msgstr "Documento: %s apagado com sucesso."
 
-#: views.py:201
+#: views.py:202
 #, python-format
 msgid "Document: %(document)s delete error: %(error)s"
 msgstr "Erro ao excluir documento %(document)s: %(error)s"
 
-#: views.py:216
+#: views.py:217
 #, python-format
 msgid "Are you sure you wish to delete the document: %s?"
 msgstr "Tem certeza de que deseja excluir o documento: %s?"
 
-#: views.py:218
+#: views.py:219
 #, python-format
 msgid "Are you sure you wish to delete the documents: %s?"
 msgstr "Tem certeza de que deseja excluir os documentos: %s?"
 
-#: views.py:255
+#: views.py:256
 #, python-format
 msgid "Document \"%s\" edited successfully."
 msgstr "Documento \"%s\", editado com sucesso."
 
-#: views.py:323
+#: views.py:329
 #, python-format
 msgid "transformations for: %s"
 msgstr "transformações para: %s"
 
-#: views.py:347
+#: views.py:353
 msgid "Document page transformation created successfully."
 msgstr "Transformação para página do documento criada com sucesso."
 
-#: views.py:356
+#: views.py:362
 #, python-format
 msgid "Create new transformation for page: %(page)s of document: %(document)s"
 msgstr ""
 "Criar nova transformação para página: %(page)s do documento:  %(document)s"
 
-#: views.py:372
+#: views.py:378
 msgid "Document page transformation edited successfully."
 msgstr "Transformação para página do documento editada com sucesso."
 
-#: views.py:385
+#: views.py:391
 #, python-format
 msgid "Edit transformation \"%(transformation)s\" for: %(document_page)s"
 msgstr "Editar transformação \"%(transformation)s\" para: %(document_page)s "
 
-#: views.py:403
+#: views.py:409
 msgid "Document page transformation deleted successfully."
 msgstr "Transformação para página do documento excluida com sucesso."
 
-#: views.py:414
+#: views.py:420
 #, python-format
 msgid ""
 "Are you sure you wish to delete transformation \"%(transformation)s\" for: "
@@ -667,35 +677,47 @@ msgstr ""
 "Tem certeza de que deseja excluir \"%(transformation)s\" para: "
 "%(document_page)s "
 
-#: views.py:428
+#: views.py:434
 #, python-format
 msgid "duplicates of: %s"
 msgstr "duplicatas de: %s"
 
-#: views.py:440
+#: views.py:446
 msgid "Are you sure you wish to find all duplicates?"
 msgstr "Tem certeza de que deseja encontrar todas as duplicatas?"
 
-#: views.py:441 views.py:534
+#: views.py:447 views.py:506 views.py:571
 msgid "On large databases this operation may take some time to execute."
 msgstr ""
-"Em grandes bases de dados esta operação pode levar algum tempo para "
-"executar."
+"Em grandes bases de dados esta operação pode levar algum tempo para executar."
 
-#: views.py:456
+#: views.py:462
 msgid "duplicated documents"
 msgstr "documentos duplicados"
 
 #: views.py:497
 #, python-format
 msgid ""
+"Page count update complete.  Documents processed: %(total)d, documents with "
+"changed page count: %(change)d"
+msgstr ""
+
+#: views.py:505
+#, fuzzy, python-format
+msgid ""
+"Are you sure you wish to update the page count for the office documents (%d)?"
+msgstr "Tem certeza de que deseja excluir os documentos: %s?"
+
+#: views.py:534
+#, python-format
+msgid ""
 "All the page transformations for document: %s, have been deleted "
 "successfully."
 msgstr ""
 "Todas as transformações de página para o documento: %s, foram excluídas com "
 "sucesso."
 
-#: views.py:499
+#: views.py:536
 #, python-format
 msgid ""
 "Error deleting the page transformations for document: %(document)s; "
@@ -704,20 +726,19 @@ msgstr ""
 "Erro ao excluir as transformações de página para o documento: %(document)s; "
 "%(error)s ."
 
-#: views.py:505
+#: views.py:542
 msgid "document transformation"
 msgstr "transformação de documento"
 
-#: views.py:514
+#: views.py:551
 #, python-format
 msgid ""
-"Are you sure you wish to clear all the page transformations for document: "
-"%s?"
+"Are you sure you wish to clear all the page transformations for document: %s?"
 msgstr ""
 "Tem certeza de que deseja limpar todas as transformações de página para o "
 "documento: %s?"
 
-#: views.py:516
+#: views.py:553
 #, python-format
 msgid ""
 "Are you sure you wish to clear all the page transformations for documents: "
@@ -726,72 +747,72 @@ msgstr ""
 "Tem certeza de que deseja limpar todas as transformações de página para os "
 "documentos: %s?"
 
-#: views.py:544
+#: views.py:581
 msgid "missing documents"
 msgstr "documentos em falta"
 
-#: views.py:557 views.py:595
+#: views.py:594 views.py:632
 #, python-format
 msgid "details for: %s"
 msgstr "detalhes para: %s"
 
-#: views.py:610
+#: views.py:647
 msgid "Document page edited successfully."
 msgstr "Página do documento editado com sucesso."
 
-#: views.py:619
+#: views.py:656
 #, python-format
 msgid "edit: %s"
 msgstr "editar: %s"
 
-#: views.py:630
+#: views.py:667
 msgid "There are no more pages in this document"
 msgstr "Não há mais páginas neste documento"
 
-#: views.py:643
+#: views.py:680
 msgid "You are already at the first page of this document"
 msgstr "Você já está na primeira página deste documento"
 
-#: views.py:786
+#: views.py:823
 #, python-format
 msgid "print: %s"
 msgstr "imprimir: %s"
 
-#: views.py:857
+#: views.py:894
 #, python-format
 msgid "documents of type \"%s\""
 msgstr "documentos do tipo \"%s\""
 
-#: views.py:877
+#: views.py:914
 msgid "Document type edited successfully"
 msgstr "Tipo de documento editado com sucesso"
 
-#: views.py:880
+#: views.py:917
 #, python-format
 msgid "Error editing document type; %s"
 msgstr "Erro ao editar tipo de documento; %s"
 
-#: views.py:885
+#: views.py:922
 #, python-format
 msgid "edit document type: %s"
 msgstr "editar tipo de documento: %s"
 
-#: views.py:910
+#: views.py:947
 #, python-format
 msgid "Document type: %s deleted successfully."
 msgstr "Tipo de documento: %s apagado com sucesso."
 
-#: views.py:912
+#: views.py:949
 #, python-format
 msgid "Document type: %(document_type)s delete error: %(error)s"
 msgstr "Tipo de documento: %(document_type)s erro ao excluir: %(error)s "
 
-#: views.py:927
+#: views.py:964
 #, python-format
 msgid "Are you sure you wish to delete the document type: %s?"
 msgstr "Tem certeza de que deseja excluir o tipo de documento: %s?"
 
-#: views.py:928
+#: views.py:965
 msgid ""
 "The document type of all documents using this document type will be set to "
 "none."
@@ -799,46 +820,46 @@ msgstr ""
 "O tipo de documento de todos os documentos usando este tipo de documento "
 "será definido como \"nenhum\"."
 
-#: views.py:944
+#: views.py:981
 msgid "Document type created successfully"
 msgstr "Tipo de documento criado com sucesso"
 
-#: views.py:947
+#: views.py:984
 #, python-format
 msgid "Error creating document type; %(error)s"
 msgstr "Erro ao criar tipo de documento; %(error)s "
 
-#: views.py:965
+#: views.py:1002
 #, python-format
 msgid "filenames for document type: %s"
 msgstr "nomes de arquivos para o tipo de documento: %s"
 
-#: views.py:996
+#: views.py:1033
 msgid "Document type filename edited successfully"
 msgstr "Nome de arquivo para tipo de documento editado com sucesso"
 
-#: views.py:999
+#: views.py:1036
 #, python-format
 msgid "Error editing document type filename; %s"
 msgstr "Erro ao editar nome de arquivo do tipo de documento: %s"
 
-#: views.py:1004
+#: views.py:1041
 #, python-format
 msgid "edit filename \"%(filename)s\" from document type \"%(document_type)s\""
 msgstr ""
 "Editar nome de arquivo \"%(filename)s\" do tipo de documento "
 "\"%(document_type)s\""
 
-#: views.py:1013 views.py:1039 views.py:1047
+#: views.py:1050 views.py:1076 views.py:1084
 msgid "document type filename"
 msgstr "nome de arquivo do tipo de documento"
 
-#: views.py:1031
+#: views.py:1068
 #, python-format
 msgid "Document type filename: %s deleted successfully."
 msgstr "Nome de arquivo do tipo de documento: %s excluido com sucesso."
 
-#: views.py:1033
+#: views.py:1070
 #, python-format
 msgid ""
 "Document type filename: %(document_type_filename)s delete error: %(error)s"
@@ -846,7 +867,7 @@ msgstr ""
 "Nome de arquivo do tipo de documento: %(document_type_filename)s erro ao "
 "excluir: %(error)s"
 
-#: views.py:1049
+#: views.py:1086
 #, python-format
 msgid ""
 "Are you sure you wish to delete the filename: %(filename)s, from document "
@@ -855,20 +876,25 @@ msgstr ""
 "Tem certeza de que deseja excluir o nome do arquivo: %(filename)s , do tipo "
 "de documento \" %(document_type)s \"?"
 
-#: views.py:1074
+#: views.py:1111
 msgid "Document type filename created successfully"
 msgstr "Nome de arquivo do tipo de documento criado com sucesso"
 
-#: views.py:1077
+#: views.py:1114
 #, python-format
 msgid "Error creating document type filename; %(error)s"
 msgstr "Erro ao criar nome de arquivo do tipo de documento; %(error)s"
 
-#: views.py:1083
+#: views.py:1120
 #, python-format
 msgid "create filename for document type: %s"
 msgstr "criar nome de arquivo para o tipo de documento: %s"
 
+#: widgets.py:26
+#, fuzzy
+msgid "document page image"
+msgstr "página do documento"
+
 #: wizards.py:34
 msgid "step 1 of 3: Document type"
 msgstr "passo 1 de 3: Tipo de documento"
@@ -887,8 +913,8 @@ msgstr "Próximo passo"
 
 #: conf/settings.py:38
 msgid ""
-"Maximum number of recent (created, edited, viewed) documents to remember per"
-" user."
+"Maximum number of recent (created, edited, viewed) documents to remember per "
+"user."
 msgstr ""
 "Número máximo de documentos recentes (criado, editado, visualizado) à ser "
 "lembrado, por usuário."
@@ -932,9 +958,9 @@ msgid ""
 "creation, as well as assigning default metadata types and sets to it."
 msgstr ""
 "Tipos de documentos definir uma classe que representa um grupo de "
-"documentos, tais como: notas fiscais, regulamentos ou manuais. A vantagem de"
-" usar os tipos de documentos são: a atribuição de uma lista de nomes típicos"
-" para renomear rápidamente durante a criação, bem como atribuir tipos de "
+"documentos, tais como: notas fiscais, regulamentos ou manuais. A vantagem de "
+"usar os tipos de documentos são: a atribuição de uma lista de nomes típicos "
+"para renomear rápidamente durante a criação, bem como atribuir tipos de "
 "padrão de metadados e conjuntos para ele."
 
 #: templates/recent_document_list_help.html:3
@@ -950,4 +976,5 @@ msgstr ""
 "Aqui você encontrará os últimos %(recent_count)s documentos que você tenha "
 "criado ou editado de alguma maneira."
 
-
+#~ msgid "Page"
+#~ msgstr "Página"
diff --git a/apps/documents/locale/ru/LC_MESSAGES/django.mo b/apps/documents/locale/ru/LC_MESSAGES/django.mo
index de2d31def3..af8dc74453 100644
Binary files a/apps/documents/locale/ru/LC_MESSAGES/django.mo and b/apps/documents/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/documents/locale/ru/LC_MESSAGES/django.po b/apps/documents/locale/ru/LC_MESSAGES/django.po
index cf8ae6ddd9..b6a7aeb2e8 100644
--- a/apps/documents/locale/ru/LC_MESSAGES/django.po
+++ b/apps/documents/locale/ru/LC_MESSAGES/django.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Roberto Rosario <roberto.rosario.gonzalez@gmail.com>, 2011.
+# Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:43-0400\n"
-"PO-Revision-Date: 2011-11-03 16:20+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 19:16+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -17,69 +19,82 @@ msgstr ""
 "Language: ru\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"
 
-#: __init__.py:50 __init__.py:159
+#: __init__.py:49 __init__.py:159
 msgid "Documents"
 msgstr "Документы"
 
-#: __init__.py:61
+#: __init__.py:60
 msgid "Documents setup"
 msgstr "Настройки для документов"
 
-#: __init__.py:71
+#: __init__.py:70
 msgid "all documents"
 msgstr "все документы"
 
-#: __init__.py:72 models.py:381 views.py:672
+#: __init__.py:71 models.py:415 views.py:709
 msgid "recent documents"
 msgstr "последние документы"
 
-#: __init__.py:73
+#: __init__.py:72
 msgid "upload new documents"
 msgstr "загрузить новые документы"
 
-#: __init__.py:74
+#: __init__.py:73
 msgid "clone metadata"
 msgstr "клонировать метаданные"
 
-#: __init__.py:75
+#: __init__.py:74
 msgid "details"
 msgstr "детали"
 
-#: __init__.py:76
+#: __init__.py:75
 msgid "properties"
 msgstr "свойства"
 
-#: __init__.py:77 __init__.py:78 __init__.py:92 __init__.py:114
+#: __init__.py:76 __init__.py:77 __init__.py:92 __init__.py:114
 #: __init__.py:120
 msgid "delete"
 msgstr "удалить"
 
-#: __init__.py:79 __init__.py:91 __init__.py:113 __init__.py:119
+#: __init__.py:78 __init__.py:91 __init__.py:113 __init__.py:119
 msgid "edit"
 msgstr "редактировать"
 
-#: __init__.py:80
+#: __init__.py:79
 msgid "preview"
 msgstr "предварительный просмотр"
 
-#: __init__.py:81
+#: __init__.py:80
 msgid "download"
 msgstr "скачать"
 
-#: __init__.py:82
+#: __init__.py:81
 msgid "find duplicates"
 msgstr "поиска дубликатов"
 
-#: __init__.py:83
+#: __init__.py:82
 msgid "find all duplicates"
 msgstr "найти все дубликаты"
 
-#: __init__.py:83
+#: __init__.py:82
 msgid ""
 "Search all the documents' checksums and return a list of the exact matches."
 msgstr ""
 "Искать все контрольные суммы документов  и вернуть список точных совпадений."
 
+#: __init__.py:83
+msgid "update office documents' page count"
+msgstr "обновить количество страниц документа"
+
+#: __init__.py:83
+msgid ""
+"Update the page count of the office type documents.  This is useful when "
+"enabling office document support after there were already office type "
+"documents in the database."
+msgstr ""
+"Пересчитать количество страниц.  Это полезно для включения поддержки уже "
+"существующих офисных документов."
+
 #: __init__.py:84 __init__.py:85
 msgid "clear transformations"
 msgstr "очистить преобразования"
@@ -100,7 +115,7 @@ msgstr " преобразования страницы"
 msgid "create new transformation"
 msgstr "создать новое преобразование"
 
-#: __init__.py:94 forms.py:49
+#: __init__.py:94
 msgid "page image"
 msgstr "изображение страницы"
 
@@ -156,7 +171,7 @@ msgstr "Найти недостающие файлы документов"
 msgid "document type list"
 msgstr "Список типов документов"
 
-#: __init__.py:111 views.py:840
+#: __init__.py:111 views.py:877
 msgid "document types"
 msgstr "типы документов"
 
@@ -164,7 +179,7 @@ msgstr "типы документов"
 msgid "documents of this type"
 msgstr "документы этого типа"
 
-#: __init__.py:115 views.py:953
+#: __init__.py:115 views.py:990
 msgid "create document type"
 msgstr "создать тип документа"
 
@@ -176,76 +191,68 @@ msgstr "Имена файлов"
 msgid "add filename to document type"
 msgstr "добавить имя файла для типа документа"
 
-#: __init__.py:161 __init__.py:187 models.py:97 views.py:68
+#: __init__.py:161 __init__.py:186 models.py:101 views.py:69
 msgid "documents"
 msgstr "документы"
 
-#: __init__.py:174 widgets.py:13
+#: __init__.py:173
 msgid "thumbnail"
 msgstr "миниатюра"
 
-#: __init__.py:177
+#: __init__.py:176
 msgid "tags"
 msgstr "метки"
 
-#: __init__.py:180
+#: __init__.py:179
 msgid "metadata"
 msgstr "метаданные"
 
-#: forms.py:72
+#: forms.py:60
 msgid "Page image"
 msgstr "Страница изображения"
 
-#: forms.py:82 forms.py:232
+#: forms.py:70 forms.py:209
 msgid "Contents"
 msgstr "Содержание"
 
-#: forms.py:135
-msgid "Page"
-msgstr "Страница"
-
-#: forms.py:136
+#: forms.py:116
 msgid "Details"
 msgstr "Детали"
 
-#: forms.py:138 models.py:312 models.py:349
-msgid "document page"
-msgstr "страница документа"
-
-#: forms.py:144
+#: forms.py:121
 msgid "Click on the image for full size preview"
 msgstr "Нажмите на изображение для полного просмотра размера"
 
-#: forms.py:154
+#: forms.py:131
 #, python-format
 msgid "Document pages (%s)"
 msgstr "Страницы документа (%s)"
 
-#: forms.py:189
+#: forms.py:166
 msgid "Quick document rename"
 msgstr "Быстро переименовать документ"
 
-#: forms.py:192
+#: forms.py:169
 msgid "New document filename"
 msgstr "Новое имя файла документа"
 
-#: forms.py:246
+#: forms.py:223
 msgid "Page size"
 msgstr "Размер страницы"
 
-#: forms.py:247
+#: forms.py:224
 msgid "Custom page width"
 msgstr "Своя ширина страницы"
 
-#: forms.py:248
+#: forms.py:225
 msgid "Custom page height"
 msgstr "Своя высота страницы"
 
-#: forms.py:249
+#: forms.py:226
 msgid "Page orientation"
 msgstr "Ориентация страницы"
 
-#: forms.py:250
+#: forms.py:227
 msgid "Page range"
 msgstr "Диапазон страниц"
 
@@ -341,161 +348,165 @@ msgstr "Документ \"%(document)s\" удалил %(fullname)s."
 msgid "Document \"%(document)s\" deleted on %(datetime)s by %(fullname)s."
 msgstr "Документ\"%(document)s\"  удалил %(datetime)s  %(fullname)s."
 
-#: models.py:59
+#: models.py:63
 msgid "name"
 msgstr "имя"
 
-#: models.py:65 models.py:74 models.py:281 views.py:859 views.py:889
-#: views.py:918 views.py:923 views.py:966 views.py:1012 views.py:1046
+#: models.py:69 models.py:78 models.py:315 views.py:896 views.py:926
+#: views.py:955 views.py:960 views.py:1003 views.py:1049 views.py:1083
 msgid "document type"
 msgstr "тип документа"
 
-#: models.py:66
+#: models.py:70
 msgid "documents types"
 msgstr "типы документов"
 
-#: models.py:75
+#: models.py:79
 msgid "file"
 msgstr "файл"
 
-#: models.py:82
+#: models.py:86
 msgid "added"
 msgstr "добавлено"
 
-#: models.py:83
+#: models.py:87
 msgid "updated"
 msgstr "обновлено"
 
-#: models.py:84
+#: models.py:88
 msgid "checksum"
 msgstr "Контрольная сумма"
 
-#: models.py:85
+#: models.py:89
 msgid "description"
 msgstr "описание"
 
-#: models.py:96 models.py:298 models.py:370 models.py:385 views.py:208
+#: models.py:100 models.py:332 models.py:404 models.py:419 views.py:209
 msgid "document"
 msgstr "документ"
 
-#: models.py:177
+#: models.py:181
 msgid ""
 "This document's file format is not known, the page count has therefore "
 "defaulted to 1."
 msgstr ""
 "Этот формат файла документа не известен, количество страниц поэтому 1."
 
-#: models.py:282
+#: models.py:316
 msgid "filename"
 msgstr "имя файла"
 
-#: models.py:283 views.py:973
+#: models.py:317 views.py:1010
 msgid "enabled"
 msgstr "разрешено"
 
-#: models.py:290
+#: models.py:324
 msgid "document type quick rename filename"
 msgstr "имя файла для быстрого переименования документа определённого типа "
 
-#: models.py:291
+#: models.py:325
 msgid "document types quick rename filenames"
 msgstr "имена файлов для быстрого переименования документа определённых типов"
 
-#: models.py:299
+#: models.py:333
 msgid "content"
 msgstr "содержание"
 
-#: models.py:300
+#: models.py:334
 msgid "page label"
 msgstr "метка страницы"
 
-#: models.py:301
+#: models.py:335
 msgid "page number"
 msgstr "номер страницы"
 
-#: models.py:304
+#: models.py:338
 #, 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:313
+#: models.py:346 models.py:383
+msgid "document page"
+msgstr "страница документа"
+
+#: models.py:347
 msgid "document pages"
 msgstr "страницы документа"
 
-#: models.py:324
+#: models.py:358
 msgid "Enter a valid value."
 msgstr "Введите допустимое значение."
 
-#: models.py:350 views.py:327
+#: models.py:384 views.py:333
 msgid "order"
 msgstr "порядок"
 
-#: models.py:351 views.py:328 views.py:383 views.py:412
+#: models.py:385 views.py:334 views.py:389 views.py:418
 msgid "transformation"
 msgstr "преобразование"
 
-#: models.py:352 views.py:329
+#: models.py:386 views.py:335
 msgid "arguments"
 msgstr "аргументы"
 
-#: models.py:352
+#: models.py:386
 #, python-format
 msgid "Use dictionaries to indentify arguments, example: %s"
 msgstr "Использовать словари для идентификации аргументов, например %s"
 
-#: models.py:360
+#: models.py:394
 msgid "document page transformation"
 msgstr "преобразование страницы документа"
 
-#: models.py:361
+#: models.py:395
 msgid "document page transformations"
 msgstr "преобразования документов страницу"
 
-#: models.py:369
+#: models.py:403
 msgid "user"
 msgstr "пользователь"
 
-#: models.py:371
+#: models.py:405
 msgid "accessed"
 msgstr "допущен"
 
-#: models.py:380
+#: models.py:414
 msgid "recent document"
 msgstr "недавний документ"
 
-#: models.py:386
+#: models.py:420
 msgid "Document type"
 msgstr "Тип документа"
 
-#: models.py:387
+#: models.py:421
 msgid "MIME type"
 msgstr "MIME-тип"
 
-#: models.py:388 views.py:116
+#: models.py:422 views.py:117
 msgid "Filename"
 msgstr "Имя файла"
 
-#: models.py:389
+#: models.py:423
 msgid "Filename extension"
 msgstr "Расширение файла"
 
-#: models.py:390
+#: models.py:424
 msgid "Metadata value"
 msgstr "Метаданны значение"
 
-#: models.py:391
+#: models.py:425
 msgid "Content"
 msgstr "Содержимое"
 
-#: models.py:392
+#: models.py:426
 msgid "Description"
 msgstr "Описание"
 
-#: models.py:393
+#: models.py:427
 msgid "Tags"
 msgstr "Метки"
 
-#: models.py:394
+#: models.py:428
 msgid "Comments"
 msgstr "Комментарии"
 
@@ -546,117 +557,117 @@ msgstr "Среднее количество страниц в документе
 msgid "Document statistics"
 msgstr "Статистика документов"
 
-#: views.py:117
+#: views.py:118
 msgid "File extension"
 msgstr "Расширение файла"
 
-#: views.py:118
+#: views.py:119
 msgid "File mimetype"
 msgstr "Mime тип файла"
 
-#: views.py:119
+#: views.py:120
 msgid "File mime encoding"
 msgstr "Mime-кодировка файла"
 
-#: views.py:120
+#: views.py:121
 msgid "File size"
 msgstr "Размер"
 
-#: views.py:121
+#: views.py:122
 msgid "Exists in storage"
 msgstr "Существует в хранилище"
 
-#: views.py:122
+#: views.py:123
 msgid "File path in storage"
 msgstr "Путь к файлу в хранилище"
 
-#: views.py:123
+#: views.py:124
 msgid "Date added"
 msgstr "Дата добавления"
 
-#: views.py:124
+#: views.py:125
 msgid "Time added"
 msgstr "Время добавления"
 
-#: views.py:125
+#: views.py:126
 msgid "Checksum"
 msgstr "Контрольная сумма"
 
-#: views.py:126
+#: views.py:127
 msgid "UUID"
 msgstr "UUID"
 
-#: views.py:127
+#: views.py:128
 msgid "Pages"
 msgstr "Страницы"
 
-#: views.py:136
+#: views.py:137
 #, python-format
 msgid "document properties for: %s"
 msgstr "Свойства документа для: %s"
 
-#: views.py:158
+#: views.py:159
 msgid "document data"
 msgstr "данные документа"
 
-#: views.py:183 views.py:484
+#: views.py:184 views.py:521
 msgid "Must provide at least one document."
 msgstr "Необходимо предоставить хотя бы один документ."
 
-#: views.py:199
+#: views.py:200
 #, python-format
 msgid "Document: %s deleted successfully."
 msgstr "Документ: %s успешно удален. "
 
-#: views.py:201
+#: views.py:202
 #, python-format
 msgid "Document: %(document)s delete error: %(error)s"
 msgstr "Документ:%(document)s ошибка удаления: %(error)s"
 
-#: views.py:216
+#: views.py:217
 #, python-format
 msgid "Are you sure you wish to delete the document: %s?"
 msgstr "Вы действительно хотите удалить документ: %s?"
 
-#: views.py:218
+#: views.py:219
 #, python-format
 msgid "Are you sure you wish to delete the documents: %s?"
 msgstr "Вы действительно хотите удалить документы: %s?"
 
-#: views.py:255
+#: views.py:256
 #, python-format
 msgid "Document \"%s\" edited successfully."
 msgstr "Документ \"%s\" изменен."
 
-#: views.py:323
+#: views.py:329
 #, python-format
 msgid "transformations for: %s"
 msgstr "преобразования для: %s"
 
-#: views.py:347
+#: views.py:353
 msgid "Document page transformation created successfully."
 msgstr "Преобразование страницы документа создано успешно."
 
-#: views.py:356
+#: views.py:362
 #, python-format
 msgid "Create new transformation for page: %(page)s of document: %(document)s"
 msgstr ""
 "Создать новое преобразование для страницы: %(page)s документа: %(document)s"
 
-#: views.py:372
+#: views.py:378
 msgid "Document page transformation edited successfully."
 msgstr "Преобразование страницы успешно изменено."
 
-#: views.py:385
+#: views.py:391
 #, python-format
 msgid "Edit transformation \"%(transformation)s\" for: %(document_page)s"
 msgstr "Изменить преобразования  \"%(transformation)s\" for: %(document_page)s"
 
-#: views.py:403
+#: views.py:409
 msgid "Document page transformation deleted successfully."
 msgstr "Преобразование страницы успешно удалено."
 
-#: views.py:414
+#: views.py:420
 #, python-format
 msgid ""
 "Are you sure you wish to delete transformation \"%(transformation)s\" for: "
@@ -665,33 +676,51 @@ msgstr ""
 "Вы действительно хотите удалить преобразования  \"%(transformation)s\" for: "
 "%(document_page)s\""
 
-#: views.py:428
+#: views.py:434
 #, python-format
 msgid "duplicates of: %s"
 msgstr "дубликатов: %s"
 
-#: views.py:440
+#: views.py:446
 msgid "Are you sure you wish to find all duplicates?"
 msgstr "Вы действительно хотите найти все дубликаты?"
 
-#: views.py:441 views.py:534
+#: views.py:447 views.py:506 views.py:571
 msgid "On large databases this operation may take some time to execute."
 msgstr ""
 "В больших базах данных эта операция может занять некоторое время для "
 "выполнения."
 
-#: views.py:456
+#: views.py:462
 msgid "duplicated documents"
 msgstr "дубликаты документов"
 
 #: views.py:497
 #, python-format
 msgid ""
+"Page count update complete.  Documents processed: %(total)d, documents with "
+"changed page count: %(change)d"
+msgstr ""
+"Страницы посчитаны. Всего обработано %(total)d документов, из них количество"
+" страниц изменилось у %(change)d"
+
+#: views.py:505
+#, python-format
+msgid ""
+"Are you sure you wish to update the page count for the office documents "
+"(%d)?"
+msgstr ""
+"Вы действительно хотите пересчитать количество страниц для офисных "
+"документов (%d)?"
+
+#: views.py:534
+#, python-format
+msgid ""
 "All the page transformations for document: %s, have been deleted "
 "successfully."
 msgstr "Все преобразования  страницы для документа: %s успешно удалены."
 
-#: views.py:499
+#: views.py:536
 #, python-format
 msgid ""
 "Error deleting the page transformations for document: %(document)s; "
@@ -700,11 +729,11 @@ msgstr ""
 "Ошибка при удалении страницы для преобразования документов: %(document)s; "
 "%(error)s."
 
-#: views.py:505
+#: views.py:542
 msgid "document transformation"
 msgstr "преобразование документа"
 
-#: views.py:514
+#: views.py:551
 #, python-format
 msgid ""
 "Are you sure you wish to clear all the page transformations for document: "
@@ -712,7 +741,7 @@ msgid ""
 msgstr ""
 "Вы действительно хотите удалить все преобразования странице документа: %s?"
 
-#: views.py:516
+#: views.py:553
 #, python-format
 msgid ""
 "Are you sure you wish to clear all the page transformations for documents: "
@@ -721,115 +750,115 @@ msgstr ""
 "Вы действительно хотите удалить все преобразования страницы для документов: "
 "%s?"
 
-#: views.py:544
+#: views.py:581
 msgid "missing documents"
 msgstr "недостающие документы"
 
-#: views.py:557 views.py:595
+#: views.py:594 views.py:632
 #, python-format
 msgid "details for: %s"
 msgstr "подробности: %s"
 
-#: views.py:610
+#: views.py:647
 msgid "Document page edited successfully."
 msgstr "Страница документа успешно изменена."
 
-#: views.py:619
+#: views.py:656
 #, python-format
 msgid "edit: %s"
 msgstr "редактировать: %s"
 
-#: views.py:630
+#: views.py:667
 msgid "There are no more pages in this document"
 msgstr " Нет более страниц в этом документе"
 
-#: views.py:643
+#: views.py:680
 msgid "You are already at the first page of this document"
 msgstr "Вы уже на первой странице этого документа"
 
-#: views.py:786
+#: views.py:823
 #, python-format
 msgid "print: %s"
 msgstr "печать: %s"
 
-#: views.py:857
+#: views.py:894
 #, python-format
 msgid "documents of type \"%s\""
 msgstr "документы типа \"%s\""
 
-#: views.py:877
+#: views.py:914
 msgid "Document type edited successfully"
 msgstr "Тип документа успешно изменен"
 
-#: views.py:880
+#: views.py:917
 #, python-format
 msgid "Error editing document type; %s"
 msgstr "Ошибка редактирования типа документа; %s"
 
-#: views.py:885
+#: views.py:922
 #, python-format
 msgid "edit document type: %s"
 msgstr "редактировать тип документа: %s"
 
-#: views.py:910
+#: views.py:947
 #, python-format
 msgid "Document type: %s deleted successfully."
 msgstr "Вид документа: %s успешно удален."
 
-#: views.py:912
+#: views.py:949
 #, python-format
 msgid "Document type: %(document_type)s delete error: %(error)s"
 msgstr "Тип документа: %(document_type)s ошибка удаления: %(error)s"
 
-#: views.py:927
+#: views.py:964
 #, python-format
 msgid "Are you sure you wish to delete the document type: %s?"
 msgstr "Вы действительно хотите удалить тип документа: %s?"
 
-#: views.py:928
+#: views.py:965
 msgid ""
 "The document type of all documents using this document type will be set to "
 "none."
 msgstr "Тип документа всех документов этого типа станет неопределённым."
 
-#: views.py:944
+#: views.py:981
 msgid "Document type created successfully"
 msgstr "Тип документа успешно создан"
 
-#: views.py:947
+#: views.py:984
 #, python-format
 msgid "Error creating document type; %(error)s"
 msgstr "Ошибка при создании типа документа; %(error)s"
 
-#: views.py:965
+#: views.py:1002
 #, python-format
 msgid "filenames for document type: %s"
 msgstr "имена файлов для типа документа: %s"
 
-#: views.py:996
+#: views.py:1033
 msgid "Document type filename edited successfully"
 msgstr "Имя файла для типа документа успешно изменено"
 
-#: views.py:999
+#: views.py:1036
 #, python-format
 msgid "Error editing document type filename; %s"
 msgstr "Ошибка редактирования документа введите имя файла; %s"
 
-#: views.py:1004
+#: views.py:1041
 #, python-format
 msgid "edit filename \"%(filename)s\" from document type \"%(document_type)s\""
 msgstr "редактирование файла \"%(filename)s из типа документа \"%(document_type)s\""
 
-#: views.py:1013 views.py:1039 views.py:1047
+#: views.py:1050 views.py:1076 views.py:1084
 msgid "document type filename"
 msgstr "имя файла для типа документа"
 
-#: views.py:1031
+#: views.py:1068
 #, python-format
 msgid "Document type filename: %s deleted successfully."
 msgstr "Имя файла для типа документа: %s успешно удалено."
 
-#: views.py:1033
+#: views.py:1070
 #, python-format
 msgid ""
 "Document type filename: %(document_type_filename)s delete error: %(error)s"
@@ -837,7 +866,7 @@ msgstr ""
 "При удалении имени файла для типа документа %(document_type_filename)s "
 "произошла ошибка %(error)s"
 
-#: views.py:1049
+#: views.py:1086
 #, python-format
 msgid ""
 "Are you sure you wish to delete the filename: %(filename)s, from document "
@@ -846,20 +875,24 @@ msgstr ""
 "Вы действительно хотите удалить имя файла: %(filename)s из  типа документа  "
 "\"%(document_type)s\"?"
 
-#: views.py:1074
+#: views.py:1111
 msgid "Document type filename created successfully"
 msgstr "Имя файла для типа документа успешно создан"
 
-#: views.py:1077
+#: views.py:1114
 #, python-format
 msgid "Error creating document type filename; %(error)s"
 msgstr "Ошибка создания имени файла для типа документа; %(error)s"
 
-#: views.py:1083
+#: views.py:1120
 #, python-format
 msgid "create filename for document type: %s"
 msgstr "создание имени файла для типа документа: %s"
 
+#: widgets.py:26
+msgid "document page image"
+msgstr "изображение страницы"
+
 #: wizards.py:34
 msgid "step 1 of 3: Document type"
 msgstr "Шаг 1 из 3: Тип документа"
diff --git a/apps/documents/models.py b/apps/documents/models.py
index d4bb53f274..914426a568 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -2,7 +2,9 @@ import os
 import tempfile
 import hashlib
 from ast import literal_eval
-
+import base64
+from StringIO import StringIO
+    
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
@@ -26,6 +28,8 @@ from documents.conf.settings import STORAGE_BACKEND
 from documents.conf.settings import PREVIEW_SIZE
 from documents.conf.settings import DISPLAY_SIZE
 from documents.conf.settings import CACHE_PATH
+from documents.conf.settings import ZOOM_MAX_LEVEL
+from documents.conf.settings import ZOOM_MIN_LEVEL
 
 from documents.managers import RecentDocumentManager, \
     DocumentPageTransformationManager
@@ -194,6 +198,10 @@ class Document(models.Model):
             self.save()
 
         return detected_pages
+        
+    @property
+    def page_count(self):
+        return self.documentpage_set.count()
 
     def save_to_file(self, filepath, buffer_size=1024 * 1024):
         """
@@ -246,21 +254,37 @@ class Document(models.Model):
             return cache_file_path
         else:
             document_file = document_save_to_temp_dir(self, self.checksum)
-            return convert(document_file, output_filepath=cache_file_path, page=page, transformations=transformations)
+            return convert(document_file, output_filepath=cache_file_path, page=page, transformations=transformations, mimetype=self.file_mimetype)
 
     def get_valid_image(self, size=DISPLAY_SIZE, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION):
         image_cache_name = self.get_image_cache_name(page=page)
         return convert(image_cache_name, cleanup_files=False, size=size, zoom=zoom, rotation=rotation)
 
-    def get_image(self, size=DISPLAY_SIZE, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION):
+    def get_image(self, size=DISPLAY_SIZE, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, as_base64=False):
+        if zoom < ZOOM_MIN_LEVEL:
+            zoom = ZOOM_MIN_LEVEL
+
+        if zoom > ZOOM_MAX_LEVEL:
+            zoom = ZOOM_MAX_LEVEL
+
+        rotation = rotation % 360        
+        
         try:
-            return self.get_valid_image(size=size, page=page, zoom=zoom, rotation=rotation)
+            file_path = self.get_valid_image(size=size, page=page, zoom=zoom, rotation=rotation)
         except UnknownFileFormat:
-            return get_icon_file_path(self.file_mimetype)
+            file_path = get_icon_file_path(self.file_mimetype)
         except UnkownConvertError:
-            return get_error_icon_file_path()
+            file_path = get_error_icon_file_path()
         except:
-            return get_error_icon_file_path()
+            file_path = get_error_icon_file_path()
+            
+        if as_base64:
+            image = open(file_path, 'r')
+            out = StringIO()
+            base64.encode(image, out)
+            return u'data:%s;base64,%s' % (get_mimetype(open(file_path, 'r'), file_path, mimetype_only=True)[0], out.getvalue().replace('\n', ''))
+        else:
+            return file_path
 
     def invalidate_cached_image(self, page):
         try:
@@ -274,6 +298,13 @@ class Document(models.Model):
     def delete(self, *args, **kwargs):
         super(Document, self).delete(*args, **kwargs)
         return self.file.storage.delete(self.file.path)
+        
+    @property
+    def size(self):
+        if self.exists():
+            return self.file.storage.size(self.file.path)
+        else:
+            return None
             
 
 class DocumentTypeFilename(models.Model):
diff --git a/apps/documents/static/images/icons/page_white_csharp.png b/apps/documents/static/images/icons/page_white_csharp.png
new file mode 100644
index 0000000000..c28e1b5d23
Binary files /dev/null and b/apps/documents/static/images/icons/page_white_csharp.png differ
diff --git a/apps/documents/urls.py b/apps/documents/urls.py
index 28e88e3e34..0d16fb3880 100644
--- a/apps/documents/urls.py
+++ b/apps/documents/urls.py
@@ -25,6 +25,10 @@ urlpatterns = patterns('documents.views',
     url(r'^(?P<document_id>\d+)/display/$', 'get_document_image', {'size': DISPLAY_SIZE}, 'document_display'),
     url(r'^(?P<document_id>\d+)/display/print/$', 'get_document_image', {'size': PRINT_SIZE}, 'document_display_print'),
 
+    url(r'^(?P<document_id>\d+)/display/preview/base64/$', 'get_document_image', {'size': PREVIEW_SIZE, 'base64_version': True}, 'document_preview_base64'),
+    url(r'^(?P<document_id>\d+)/display/preview/multipage/base64/$', 'get_document_image', {'size': MULTIPAGE_PREVIEW_SIZE, 'base64_version': True}, 'document_preview_multipage_base64'),
+    url(r'^(?P<document_id>\d+)/display/thumbnail/base64/$', 'get_document_image', {'size': THUMBNAIL_SIZE, 'base64_version': True}, 'document_thumbnail_base64'),
+
     url(r'^(?P<document_id>\d+)/download/$', 'document_download', (), 'document_download'),
     url(r'^(?P<document_id>\d+)/create/siblings/$', 'document_create_siblings', (), 'document_create_siblings'),
     url(r'^(?P<document_id>\d+)/find_duplicates/$', 'document_find_duplicates', (), 'document_find_duplicates'),
@@ -32,6 +36,7 @@ urlpatterns = patterns('documents.views',
 
     url(r'^multiple/clear_transformations/$', 'document_multiple_clear_transformations', (), 'document_multiple_clear_transformations'),
     url(r'^duplicates/list/$', 'document_find_all_duplicates', (), 'document_find_all_duplicates'),
+    url(r'^maintenance/update_page_count/$', 'document_update_page_count', (), 'document_update_page_count'),
 
     url(r'^page/(?P<document_page_id>\d+)/$', 'document_page_view', (), 'document_page_view'),
     url(r'^page/(?P<document_page_id>\d+)/text/$', 'document_page_text', (), 'document_page_text'),
diff --git a/apps/documents/views.py b/apps/documents/views.py
index a8b8ee5b01..60a03ee74c 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -2,7 +2,7 @@ import urlparse
 import copy
 
 from django.utils.translation import ugettext_lazy as _
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib import messages
@@ -18,7 +18,8 @@ from common.literals import PAGE_SIZE_DIMENSIONS, \
     PAGE_ORIENTATION_PORTRAIT, PAGE_ORIENTATION_LANDSCAPE
 from common.conf.settings import DEFAULT_PAPER_SIZE
 from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \
-    DEFAULT_PAGE_NUMBER
+    DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT_MIMETYPE
+from converter.office_converter import OfficeConverter
 from filetransfers.api import serve_file
 from metadata.forms import MetadataFormSet, MetadataSelectionForm
 from navigation.utils import resolve_to_name
@@ -40,7 +41,7 @@ from documents.literals import PERMISSION_DOCUMENT_CREATE, \
     PERMISSION_DOCUMENT_VIEW, \
     PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD, \
     PERMISSION_DOCUMENT_TRANSFORM, \
-    PERMISSION_DOCUMENT_EDIT
+    PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_TOOLS
 from documents.literals import HISTORY_DOCUMENT_CREATED, \
     HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED
 
@@ -117,14 +118,14 @@ def document_view(request, document_id, advanced=False):
             {'label': _(u'File extension'), 'field': 'file_extension'},
             {'label': _(u'File mimetype'), 'field': 'file_mimetype'},
             {'label': _(u'File mime encoding'), 'field': 'file_mime_encoding'},
-            {'label': _(u'File size'), 'field':lambda x: pretty_size(x.file.storage.size(x.file.path)) if x.exists() else '-'},
+            {'label': _(u'File size'), 'field':lambda x: pretty_size(x.size) if x.size else '-'},
             {'label': _(u'Exists in storage'), 'field': 'exists'},
             {'label': _(u'File path in storage'), 'field': 'file'},
             {'label': _(u'Date added'), 'field':lambda x: x.date_added.date()},
             {'label': _(u'Time added'), 'field':lambda x: unicode(x.date_added.time()).split('.')[0]},
             {'label': _(u'Checksum'), 'field': 'checksum'},
             {'label': _(u'UUID'), 'field': 'uuid'},
-            {'label': _(u'Pages'), 'field': lambda x: x.documentpage_set.count()},
+            {'label': _(u'Pages'), 'field': 'page_count'},
         ])
 
         subtemplates_list.append(
@@ -270,7 +271,7 @@ def document_edit(request, document_id):
     }, context_instance=RequestContext(request))
 
 
-def get_document_image(request, document_id, size=PREVIEW_SIZE):
+def get_document_image(request, document_id, size=PREVIEW_SIZE, base64_version=False):
     check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW])
 
     document = get_object_or_404(Document, pk=document_id)
@@ -287,7 +288,12 @@ def get_document_image(request, document_id, size=PREVIEW_SIZE):
 
     rotation = int(request.GET.get('rotation', DEFAULT_ROTATION)) % 360
 
-    return sendfile.sendfile(request, document.get_image(size=size, page=page, zoom=zoom, rotation=rotation))
+    if base64_version:
+        return HttpResponse(u'<html><body><img src="%s" /></body></html>' % document.get_image(size=size, page=page, zoom=zoom, rotation=rotation, as_base64=True))
+    else:
+        # TODO: hardcoded MIMETYPE
+        return sendfile.sendfile(request, document.get_image(size=size, page=page, zoom=zoom, rotation=rotation), mimetype=DEFAULT_FILE_FORMAT_MIMETYPE)
+        
 
 
 def document_download(request, document_id):
@@ -471,6 +477,37 @@ def document_find_all_duplicates(request):
     return _find_duplicate_list(request, include_source=True)
 
 
+def document_update_page_count(request):
+    check_permissions(request.user, [PERMISSION_DOCUMENT_TOOLS])
+
+    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
+    office_converter = OfficeConverter()
+    qs = Document.objects.exclude(file_extension__iendswith='dxf').filter(file_mimetype__in=office_converter.mimetypes())
+
+    if request.method == 'POST':
+        updated = 0
+        processed = 0
+        for document in qs:
+            old_page_count = document.page_count
+            document.update_page_count()
+            processed += 1
+            if old_page_count != document.page_count:
+                updated += 1
+            
+        messages.success(request, _(u'Page count update complete.  Documents processed: %(total)d, documents with changed page count: %(change)d') % {
+            'total': processed,
+            'change': updated
+        })
+        return HttpResponseRedirect(previous)
+
+    return render_to_response('generic_confirm.html', {
+        'previous': previous,
+        'title': _(u'Are you sure you wish to update the page count for the office documents (%d)?') % qs.count(),
+        'message': _(u'On large databases this operation may take some time to execute.'),
+        'form_icon': u'page_white_csharp.png',
+    }, context_instance=RequestContext(request))
+
+
 def document_clear_transformations(request, document_id=None, document_id_list=None):
     check_permissions(request.user, [PERMISSION_DOCUMENT_TRANSFORM])
 
diff --git a/apps/documents/widgets.py b/apps/documents/widgets.py
index b875aade25..e449ffc335 100644
--- a/apps/documents/widgets.py
+++ b/apps/documents/widgets.py
@@ -2,25 +2,77 @@ from django.utils.safestring import mark_safe
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
+from django.utils.http import urlencode
+
+from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \
+    DEFAULT_PAGE_NUMBER
+from converter.exceptions import UnknownFileFormat, UnkownConvertError
+from mimetype.api import get_error_icon_url
+    
+from documents.conf.settings import DISPLAY_SIZE
 
 
 def document_thumbnail(document):
-    try:
-        document.get_valid_image()
-        template = u'<a class="fancybox" href="%(url)s"><img class="lazy-load" data-href="%(thumbnail)s" src="%(static_url)s/images/ajax-loader.gif" alt="%(string)s" /><noscript><img src="%(thumbnail)s" alt="%(string)s" /></noscript></a>'
-    except:
-        template = u'<img class="lazy-load" data-href="%(thumbnail)s" src="%(static_url)s/images/ajax-loader.gif" alt="%(string)s" /><noscript><img src="%(thumbnail)s" alt="%(string)s" /></noscript>'
-   
-    try:
-        return mark_safe(template % {
-            'url': reverse('document_preview', args=[document.pk]),
-            'thumbnail': reverse('document_thumbnail', args=[document.pk]),
-            'static_url': settings.STATIC_URL,
-            'string': _(u'thumbnail')
-        })
-    except:
-        return u''
+    return document_html_widget(document, click_view='document_preview')
 
 
 def document_link(document):
     return mark_safe(u'<a href="%s">%s</a>' % (reverse('document_view_simple', args=[document.pk]), document))
+
+
+def document_html_widget(document, view='document_thumbnail', click_view=None, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, gallery_name=None, fancybox_class='fancybox'):
+    result = []
+                       
+    alt_text = _(u'document page image')
+    query_dict = {
+        'page': page,
+        'zoom': zoom,
+        'rotation': rotation,
+    }
+
+    if gallery_name:
+        gallery_template = u'rel="%s"' % gallery_name
+    else:
+        gallery_template = u''
+    
+    query_string = urlencode(query_dict)
+    preview_view = u'%s?%s' % (reverse(view, args=[document.pk]), query_string)
+   
+    plain_template = []
+    plain_template.append(u'<img src="%s" alt="%s" />' % (preview_view, alt_text))
+    
+    result.append(u'<div class="tc" id="document-%d-%d">' % (document.pk, page if page else 1))
+
+    if click_view:
+        result.append(u'<a %s class="%s" href="%s">' % (gallery_template, fancybox_class, u'%s?%s' % (reverse(click_view, args=[document.pk]), query_string)))
+    result.append(u'<img class="thin_border lazy-load" data-href="%s" src="%simages/ajax-loader.gif" alt="%s" />' % (preview_view, settings.STATIC_URL, alt_text))
+    result.append(u'<noscript><img style="border: 1px solid black;" src="%s" alt="%s" /></noscript>' % (preview_view, alt_text))
+
+    if click_view:    
+        result.append(u'</a>')
+    result.append(u'</div>')
+
+    result.append(u'''
+        <script type="text/javascript">
+        $(document).ready(function() {
+            $.get('%(url)s', function(data) {})
+                .success(function(data) {
+                    if (!data.result) {
+                        $('#document-%(pk)d-%(page)d').html('%(plain_template)s');
+                    }
+                })
+                .error(function(data) {
+                    $('#document-%(pk)d-%(page)d').html('<img src="%(error_image)s" />');
+                });
+        });
+        </script>
+    ''' % {
+            'url': reverse('documents-expensive-is_zoomable', args=[document.pk, page]),
+            'pk': document.pk,
+            'page': page if page else 1,
+            'plain_template': mark_safe(u''.join(plain_template)),
+            'error_image': u''.join([settings.STATIC_URL, get_error_icon_url()]),
+        }
+    )
+
+    return mark_safe(u''.join(result))
diff --git a/apps/dynamic_search/locale/en/LC_MESSAGES/django.po b/apps/dynamic_search/locale/en/LC_MESSAGES/django.po
index d7c262ced4..9cea6f8909 100644
--- a/apps/dynamic_search/locale/en/LC_MESSAGES/django.po
+++ b/apps/dynamic_search/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: 2011-09-29 18:45-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -33,27 +33,27 @@ msgstr ""
 msgid "Search terms"
 msgstr ""
 
-#: models.py:18
+#: models.py:20
 msgid "user"
 msgstr ""
 
-#: models.py:19
+#: models.py:21
 msgid "query"
 msgstr ""
 
-#: models.py:20
+#: models.py:22
 msgid "datetime created"
 msgstr ""
 
-#: models.py:21
+#: models.py:23
 msgid "hits"
 msgstr ""
 
-#: models.py:59
+#: models.py:61
 msgid "recent search"
 msgstr ""
 
-#: models.py:60
+#: models.py:62
 msgid "recent searches"
 msgstr ""
 
diff --git a/apps/dynamic_search/locale/es/LC_MESSAGES/django.po b/apps/dynamic_search/locale/es/LC_MESSAGES/django.po
index 2811642d41..b7c928d60c 100644
--- a/apps/dynamic_search/locale/es/LC_MESSAGES/django.po
+++ b/apps/dynamic_search/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 17:06+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:5
@@ -34,27 +35,27 @@ msgstr "buscar de nuevo"
 msgid "Search terms"
 msgstr "Términos de búsqueda"
 
-#: models.py:18
+#: models.py:20
 msgid "user"
 msgstr "usuario"
 
-#: models.py:19
+#: models.py:21
 msgid "query"
 msgstr "pregunta"
 
-#: models.py:20
+#: models.py:22
 msgid "datetime created"
 msgstr "fecha y hora creados"
 
-#: models.py:21
+#: models.py:23
 msgid "hits"
 msgstr "accesos"
 
-#: models.py:59
+#: models.py:61
 msgid "recent search"
 msgstr "búsqueda reciente"
 
-#: models.py:60
+#: models.py:62
 msgid "recent searches"
 msgstr "búsquedas recientes"
 
@@ -117,5 +118,3 @@ msgstr "Tiempo transcurrido: %(time_delta)s segundos"
 #, python-format
 msgid "recent searches (maximum of %d)"
 msgstr "búsquedas recientes (máximo de %d)"
-
-
diff --git a/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po b/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po
index 8f0cb6d4e2..cd156fba16 100644
--- a/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po
+++ b/apps/dynamic_search/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 02:32+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:5
@@ -34,27 +35,27 @@ msgstr "pesquisar novamente"
 msgid "Search terms"
 msgstr "Termos de pesquisa"
 
-#: models.py:18
+#: models.py:20
 msgid "user"
 msgstr "usuário"
 
-#: models.py:19
+#: models.py:21
 msgid "query"
 msgstr "pergunta"
 
-#: models.py:20
+#: models.py:22
 msgid "datetime created"
 msgstr "Data e hora da criação"
 
-#: models.py:21
+#: models.py:23
 msgid "hits"
 msgstr "visitas"
 
-#: models.py:59
+#: models.py:61
 msgid "recent search"
 msgstr "pesquisa recente"
 
-#: models.py:60
+#: models.py:62
 msgid "recent searches"
 msgstr "pesquisas recentes"
 
@@ -116,5 +117,3 @@ msgstr "Tempo decorrido: %(time_delta)s segundos"
 #, python-format
 msgid "recent searches (maximum of %d)"
 msgstr "pesquisas recentes (maximum of %d)"
-
-
diff --git a/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po b/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
index 47283aec7a..758ddcbf0e 100644
--- a/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
+++ b/apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 22:40+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:5
 msgid "search"
@@ -33,27 +35,27 @@ msgstr "искать ещё раз"
 msgid "Search terms"
 msgstr "Слова для поиска"
 
-#: models.py:18
+#: models.py:20
 msgid "user"
 msgstr "пользователь"
 
-#: models.py:19
+#: models.py:21
 msgid "query"
 msgstr "запрос"
 
-#: models.py:20
+#: models.py:22
 msgid "datetime created"
 msgstr "даты и время создания"
 
-#: models.py:21
+#: models.py:23
 msgid "hits"
 msgstr "хитов"
 
-#: models.py:59
+#: models.py:61
 msgid "recent search"
 msgstr "недавний поиск"
 
-#: models.py:60
+#: models.py:62
 msgid "recent searches"
 msgstr "последние запросы"
 
@@ -83,8 +85,7 @@ msgstr "Поиск"
 
 #: conf/settings.py:12
 msgid "Maximum amount search hits to fetch and display."
-msgstr ""
-"Максимальное количество отображаемых документов из результатов поиска."
+msgstr "Максимальное количество отображаемых документов из результатов поиска."
 
 #: conf/settings.py:13
 msgid "Maximum number of search queries to remember per user."
@@ -118,5 +119,3 @@ msgstr "Прошедшее время в секундах: %(time_delta)s"
 #, python-format
 msgid "recent searches (maximum of %d)"
 msgstr "Последние запросы (максимум %d)"
-
-
diff --git a/apps/folders/locale/en/LC_MESSAGES/django.po b/apps/folders/locale/en/LC_MESSAGES/django.po
index f512b1be97..f44a557331 100644
--- a/apps/folders/locale/en/LC_MESSAGES/django.po
+++ b/apps/folders/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: 2011-09-29 18:45-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/folders/locale/es/LC_MESSAGES/django.po b/apps/folders/locale/es/LC_MESSAGES/django.po
index 0b317dc8d6..39c54e00b2 100644
--- a/apps/folders/locale/es/LC_MESSAGES/django.po
+++ b/apps/folders/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 05:10+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:10
@@ -192,8 +193,8 @@ msgstr ""
 #: views.py:268
 #, python-format
 msgid ""
-"Are you sure you wish to remove the documents: %(documents)s from the folder"
-" \"%(folder)s\"?"
+"Are you sure you wish to remove the documents: %(documents)s from the folder "
+"\"%(folder)s\"?"
 msgstr ""
 "¿Está seguro que desea eliminar los documentos: %(documents)s de la carpeta "
 "\"%(folder)s\"?"
@@ -218,5 +219,3 @@ msgstr ""
 #: templatetags/folder_tags.py:17
 msgid "Add document to a folder"
 msgstr "Agregar documento a una carpeta"
-
-
diff --git a/apps/folders/locale/pt/LC_MESSAGES/django.po b/apps/folders/locale/pt/LC_MESSAGES/django.po
index 7e938f3a56..40ab6db2d2 100644
--- a/apps/folders/locale/pt/LC_MESSAGES/django.po
+++ b/apps/folders/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Renata Oliveira <renatabels@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 03:33+0000\n"
 "Last-Translator: renataoliveira <renatabels@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:10
@@ -192,8 +193,8 @@ msgstr ""
 #: views.py:268
 #, python-format
 msgid ""
-"Are you sure you wish to remove the documents: %(documents)s from the folder"
-" \"%(folder)s\"?"
+"Are you sure you wish to remove the documents: %(documents)s from the folder "
+"\"%(folder)s\"?"
 msgstr ""
 "Tem certeza de que deseja remover os documentos: %(documents)s  da pasta "
 "\"%(folder)s\"?"
@@ -209,8 +210,8 @@ msgid ""
 "created by one user and the documents contained by them don't affect any "
 "other user folders or documents."
 msgstr ""
-"Estas pastas também podem ser descritas como pastas de usuário. Elas são uma"
-" maneira de permitir que os usuários individuais criem os seus próprios "
+"Estas pastas também podem ser descritas como pastas de usuário. Elas são uma "
+"maneira de permitir que os usuários individuais criem os seus próprios "
 "métodos de organização do documento. Pastas criadas por um usuário e os "
 "documentos contidos nelas não afetam todas as pastas de outros usuários ou "
 "documentos."
@@ -218,5 +219,3 @@ msgstr ""
 #: templatetags/folder_tags.py:17
 msgid "Add document to a folder"
 msgstr "Adicionar documento à uma pasta"
-
-
diff --git a/apps/folders/locale/ru/LC_MESSAGES/django.po b/apps/folders/locale/ru/LC_MESSAGES/django.po
index ace34d7713..6c43201638 100644
--- a/apps/folders/locale/ru/LC_MESSAGES/django.po
+++ b/apps/folders/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 16:56+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:10
 msgid "folder list"
@@ -185,14 +187,14 @@ msgid ""
 "Are you sure you wish to remove the document: %(document)s from the folder "
 "\"%(folder)s\"?"
 msgstr ""
-"Вы действительно хотите удалить документ: %(document)s из папки \"%(folder)s"
-" \"?"
+"Вы действительно хотите удалить документ: %(document)s из папки \"%(folder)s "
+"\"?"
 
 #: views.py:268
 #, python-format
 msgid ""
-"Are you sure you wish to remove the documents: %(documents)s from the folder"
-" \"%(folder)s\"?"
+"Are you sure you wish to remove the documents: %(documents)s from the folder "
+"\"%(folder)s\"?"
 msgstr ""
 "Вы действительно хотите удалить документы: %(documents)s из папки "
 "\"%(folder)s\"?"
@@ -215,5 +217,3 @@ msgstr ""
 #: templatetags/folder_tags.py:17
 msgid "Add document to a folder"
 msgstr "Добавить документ в папку"
-
-
diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py
deleted file mode 100644
index b939fc5fa6..0000000000
--- a/apps/grouping/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-
-from navigation.api import register_links
-
-from documents.literals import PERMISSION_DOCUMENT_VIEW
-from documents.models import Document
-
-document_group_link = {'text': _(u'group actions'), 'view': 'document_group_view', 'famfam': 'page_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
-groups_for_document = {'text': _(u'groups'), 'view': 'groups_for_document', 'args': 'object.pk', 'famfam': 'page_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
-
-register_links(Document, [groups_for_document], menu_name='form_header')
diff --git a/apps/grouping/admin.py b/apps/grouping/admin.py
deleted file mode 100644
index 0f741d02b8..0000000000
--- a/apps/grouping/admin.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.contrib import admin
-
-from grouping.models import DocumentGroup, DocumentGroupItem
-
-
-class DocumentGroupItemInline(admin.StackedInline):
-    model = DocumentGroupItem
-    extra = 1
-    classes = ('collapse-open',)
-    allow_add = True
-
-
-class DocumentGroupAdmin(admin.ModelAdmin):
-    inlines = [DocumentGroupItemInline]
-
-admin.site.register(DocumentGroup, DocumentGroupAdmin)
diff --git a/apps/grouping/conf/settings.py b/apps/grouping/conf/settings.py
deleted file mode 100644
index 5625201a15..0000000000
--- a/apps/grouping/conf/settings.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""Configuration options for the grouping app"""
-
-from smart_settings.api import register_settings
-
-register_settings(
-    namespace=u'grouping',
-    module=u'grouping.conf.settings',
-    settings=[
-        {'name': u'SHOW_EMPTY_GROUPS', 'global_name': u'GROUPING_SHOW_EMPTY_GROUPS', 'default': True},
-    ]
-)
diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py
deleted file mode 100644
index 389987ab7a..0000000000
--- a/apps/grouping/forms.py
+++ /dev/null
@@ -1,106 +0,0 @@
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext
-from django.core.urlresolvers import reverse
-from django.utils.safestring import mark_safe
-from django.template.defaultfilters import capfirst
-from django.conf import settings
-
-from tags.widgets import get_tags_inline_widget
-
-
-class DocumentGroupImageWidget(forms.widgets.Widget):
-    def render(self, name, value, attrs=None):
-        output = []
-        if value['links']:
-            output.append(u'<div class="group navform wat-cf">')
-            for link in value['links']:
-                output.append(u'''
-                    <button class="button" type="submit" name="action" value="%(action)s">
-                        <span class="famfam active famfam-%(famfam)s"></span>%(text)s
-                    </button>
-                ''' % {
-                    'famfam': link.get('famfam', u'link'),
-                    'text': capfirst(link['text']),
-                    'action': reverse('document_group_view', args=[value['current_document'].pk, value['group'].pk])
-                })
-            output.append(u'</div>')
-
-        output.append(u'<div style="white-space:nowrap; overflow: auto;">')
-        for document in value['group_data']:
-            tags_template = get_tags_inline_widget(document)
-
-            try:
-                document.get_valid_image()
-                template = u'''<div style="display: inline-block; margin: 0px 10px 10px 10px; %(current)s">
-                        <div class="tc">%(document_name)s</div>
-                        <div class="tc">%(page_string)s: %(document_pages)d</div>
-                        %(tags_template)s
-                        <div class="tc">
-                            <a rel="group_%(group_id)d_documents_gallery" class="fancybox-noscaling" href="%(view_url)s">
-                                <img class="lazy-load" style="border: 1px solid black; margin: 10px;" src="%(static_url)s/images/ajax-loader.gif" data-href="%(img)s" alt="%(string)s" />
-                                <noscript>
-                                    <img style="border: 1px solid black; margin: 10px;" src="%(img)s" alt="%(string)s" />
-                                </noscript>
-                            </a>
-                        </div>
-                        <div class="tc">
-                            <a href="%(url)s"><span class="famfam active famfam-page_go"></span>%(details_string)s</a>
-                        </div>
-                    </div>'''
-            except:
-                template = u'''<div style="display: inline-block; margin: 0px 10px 10px 10px; %(current)s">
-                        <div class="tc">%(document_name)s</div>
-                        <div class="tc">%(page_string)s: %(document_pages)d</div>
-                        %(tags_template)s
-                        <div class="tc">
-                            <img class="lazy-load" style="border: 1px solid black; margin: 10px;" src="%(static_url)s/images/ajax-loader.gif" data-href="%(img)s" alt="%(string)s" />
-                            <noscript>
-                                <img style="border: 1px solid black; margin: 10px;" src="%(img)s" alt="%(string)s" />
-                            </noscript>
-                        </div>
-                        <div class="tc">
-                            <a href="%(url)s"><span class="famfam active famfam-page_go"></span>%(details_string)s</a>
-                        </div>
-                    </div>'''
-                    
-            output.append(template % {
-                    'url': reverse('document_view_simple', args=[document.pk]),
-                    'img': reverse('document_preview_multipage', args=[document.pk]),
-                    'current': u'border: 5px solid black; padding: 3px;' if value['current_document'] == document else u'',
-                    'view_url': reverse('document_display', args=[document.pk]),
-                    'document_pages': document.documentpage_set.count(),
-                    'page_string': ugettext(u'Pages'),
-                    'details_string': ugettext(u'Select'),
-                    'group_id': value['group'].pk,
-                    'document_name': document,
-                    'static_url': settings.STATIC_URL,
-                    'tags_template': tags_template if tags_template else u'',
-                    'string': _(u'group document'),
-                })
-        output.append(u'</div>')
-        output.append(
-            u'<br /><span class="famfam active famfam-magnifier"></span>%s' %
-             ugettext(u'Click on the image for full size view of the first page.'))
-
-        return mark_safe(u''.join(output))
-
-
-class DocumentDataGroupForm(forms.Form):
-    def __init__(self, *args, **kwargs):
-        groups = kwargs.pop('groups', None)
-        links = kwargs.pop('links', None)
-        current_document = kwargs.pop('current_document', None)
-        super(DocumentDataGroupForm, self).__init__(*args, **kwargs)
-        for group, data in groups.items():
-            self.fields['preview-%s' % group] = forms.CharField(
-                widget=DocumentGroupImageWidget(),
-                label=u'%s (%d)' % (unicode(data['title']), len(data['documents'])),
-                required=False,
-                initial={
-                    'group': group,
-                    'group_data': data['documents'],
-                    'current_document': current_document,
-                    'links': links
-                }
-            )
diff --git a/apps/grouping/locale/en/LC_MESSAGES/django.po b/apps/grouping/locale/en/LC_MESSAGES/django.po
deleted file mode 100644
index a72d9392de..0000000000
--- a/apps/grouping/locale/en/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,198 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# 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: 2011-09-29 18:45-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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: __init__.py:8
-msgid "group actions"
-msgstr ""
-
-#: __init__.py:9
-msgid "groups"
-msgstr ""
-
-#: forms.py:55
-msgid "Pages"
-msgstr ""
-
-#: forms.py:56
-msgid "Select"
-msgstr ""
-
-#: forms.py:61
-msgid "group document"
-msgstr ""
-
-#: forms.py:66
-msgid "Click on the image for full size view of the first page."
-msgstr ""
-
-#: literals.py:7
-msgid "and"
-msgstr ""
-
-#: literals.py:8
-msgid "or"
-msgstr ""
-
-#: literals.py:12
-msgid "is equal to"
-msgstr ""
-
-#: literals.py:13
-msgid "is equal to (case insensitive)"
-msgstr ""
-
-#: literals.py:14
-msgid "contains"
-msgstr ""
-
-#: literals.py:15
-msgid "contains (case insensitive)"
-msgstr ""
-
-#: literals.py:16
-msgid "is in"
-msgstr ""
-
-#: literals.py:17
-msgid "is greater than"
-msgstr ""
-
-#: literals.py:18
-msgid "is greater than or equal to"
-msgstr ""
-
-#: literals.py:19
-msgid "is less than"
-msgstr ""
-
-#: literals.py:20
-msgid "is less than or equal to"
-msgstr ""
-
-#: literals.py:21
-msgid "starts with"
-msgstr ""
-
-#: literals.py:22
-msgid "starts with (case insensitive)"
-msgstr ""
-
-#: literals.py:23
-msgid "ends with"
-msgstr ""
-
-#: literals.py:24
-msgid "ends with (case insensitive)"
-msgstr ""
-
-#: literals.py:25
-msgid "is in regular expression"
-msgstr ""
-
-#: literals.py:26
-msgid "is in regular expression (case insensitive)"
-msgstr ""
-
-#: models.py:10
-msgid "title"
-msgstr ""
-
-#: models.py:11
-msgid "dynamic title"
-msgstr ""
-
-#: models.py:12 models.py:33
-msgid "enabled"
-msgstr ""
-
-#: models.py:20 models.py:25
-msgid "document group"
-msgstr ""
-
-#: models.py:21
-msgid "document groups"
-msgstr ""
-
-#: models.py:26
-msgid "The inclusion is ignored for the first item."
-msgstr ""
-
-#: models.py:27
-msgid "foreign document data"
-msgstr ""
-
-#: models.py:27
-msgid ""
-"This represents the metadata of all other documents.  Available objects: "
-"`document.<attribute>` and `metadata.<metadata_type_name>`."
-msgstr ""
-
-#: models.py:31
-msgid "expression"
-msgstr ""
-
-#: models.py:31
-msgid ""
-"This expression will be evaluated against the current selected document.  "
-"The document metadata is available as variables `metadata` and document "
-"properties under the variable `document`."
-msgstr ""
-
-#: models.py:32
-msgid "negated"
-msgstr ""
-
-#: models.py:32
-msgid "Inverts the logic of the operator."
-msgstr ""
-
-#: models.py:36
-msgid "not"
-msgstr ""
-
-#: models.py:39
-msgid "group item"
-msgstr ""
-
-#: models.py:40
-msgid "group items"
-msgstr ""
-
-#: views.py:21
-msgid "No action selected."
-msgstr ""
-
-#: views.py:34
-#, python-format
-msgid "documents in group: %(group)s"
-msgstr ""
-
-#: views.py:50
-#, python-format
-msgid "Document group query error: %s"
-msgstr ""
-
-#: views.py:61
-#, python-format
-msgid "document groups (%s)"
-msgstr ""
-
-#: views.py:75
-msgid "There no defined groups for the current document."
-msgstr ""
diff --git a/apps/grouping/locale/es/LC_MESSAGES/django.mo b/apps/grouping/locale/es/LC_MESSAGES/django.mo
deleted file mode 100644
index eb39e947d4..0000000000
Binary files a/apps/grouping/locale/es/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/apps/grouping/locale/es/LC_MESSAGES/django.po b/apps/grouping/locale/es/LC_MESSAGES/django.po
deleted file mode 100644
index b2b5e43308..0000000000
--- a/apps/grouping/locale/es/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,208 +0,0 @@
-# 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
-"PO-Revision-Date: 2011-11-04 00:55+0000\n"
-"Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/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"
-
-#: __init__.py:8
-msgid "group actions"
-msgstr "acciones de grupo"
-
-#: __init__.py:9
-msgid "groups"
-msgstr "grupos"
-
-#: forms.py:55
-msgid "Pages"
-msgstr "Páginas"
-
-#: forms.py:56
-msgid "Select"
-msgstr "Seleccionar"
-
-#: forms.py:61
-msgid "group document"
-msgstr "documento del grupo"
-
-#: forms.py:66
-msgid "Click on the image for full size view of the first page."
-msgstr ""
-"Haga clic en la imagen para ver el tamaño completo de la primera página."
-
-#: literals.py:7
-msgid "and"
-msgstr "y"
-
-#: literals.py:8
-msgid "or"
-msgstr "o"
-
-#: literals.py:12
-msgid "is equal to"
-msgstr "es igual a"
-
-#: literals.py:13
-msgid "is equal to (case insensitive)"
-msgstr "es igual a (mayúsculas y minúsculas)"
-
-#: literals.py:14
-msgid "contains"
-msgstr "contiene"
-
-#: literals.py:15
-msgid "contains (case insensitive)"
-msgstr "contiene (mayúsculas y minúsculas)"
-
-#: literals.py:16
-msgid "is in"
-msgstr "está en"
-
-#: literals.py:17
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: literals.py:18
-msgid "is greater than or equal to"
-msgstr "es mayor o igual a"
-
-#: literals.py:19
-msgid "is less than"
-msgstr "es menor que"
-
-#: literals.py:20
-msgid "is less than or equal to"
-msgstr "es menor o igual a"
-
-#: literals.py:21
-msgid "starts with"
-msgstr "comienza con"
-
-#: literals.py:22
-msgid "starts with (case insensitive)"
-msgstr "comienza con (mayúsculas y minúsculas)"
-
-#: literals.py:23
-msgid "ends with"
-msgstr "termina con"
-
-#: literals.py:24
-msgid "ends with (case insensitive)"
-msgstr "termina con (mayúsculas y minúsculas)"
-
-#: literals.py:25
-msgid "is in regular expression"
-msgstr "está en la expresión regular"
-
-#: literals.py:26
-msgid "is in regular expression (case insensitive)"
-msgstr "está en la expresión regular (mayúsculas y minúsculas)"
-
-#: models.py:10
-msgid "title"
-msgstr "título"
-
-#: models.py:11
-msgid "dynamic title"
-msgstr "título dinámico"
-
-#: models.py:12 models.py:33
-msgid "enabled"
-msgstr "habilitado"
-
-#: models.py:20 models.py:25
-msgid "document group"
-msgstr "grupo de documento"
-
-#: models.py:21
-msgid "document groups"
-msgstr "grupos de documentos"
-
-#: models.py:26
-msgid "The inclusion is ignored for the first item."
-msgstr "La inclusión es ignorada para el primer artículo."
-
-#: models.py:27
-msgid "foreign document data"
-msgstr "datos de documento foráneo"
-
-#: models.py:27
-msgid ""
-"This represents the metadata of all other documents.  Available objects: "
-"`document.<attribute>` and `metadata.<metadata_type_name>`."
-msgstr ""
-"Esto representa los metadatos de todos los demás documentos.  Objetos "
-"disponibles: `document.<attributo>` y `metadata.<nombre de tipo de "
-"metadata>`."
-
-#: models.py:31
-msgid "expression"
-msgstr "expresión"
-
-#: models.py:31
-msgid ""
-"This expression will be evaluated against the current selected document.  "
-"The document metadata is available as variables `metadata` and document "
-"properties under the variable `document`."
-msgstr ""
-"Esta expresión sera evaluada con respecto al documento seleccionado actual."
-"  Los metadatos del documento están disponible como variables `metadata` y "
-"las propiedades del documento en la variable `document`."
-
-#: models.py:32
-msgid "negated"
-msgstr "negado"
-
-#: models.py:32
-msgid "Inverts the logic of the operator."
-msgstr "Invierte la lógica del operador."
-
-#: models.py:36
-msgid "not"
-msgstr "no"
-
-#: models.py:39
-msgid "group item"
-msgstr "artículo del grupo"
-
-#: models.py:40
-msgid "group items"
-msgstr "artículo del grupo"
-
-#: views.py:21
-msgid "No action selected."
-msgstr "Ninguna acción seleccionada."
-
-#: views.py:34
-#, python-format
-msgid "documents in group: %(group)s"
-msgstr "documentos en el grupo: %(group)s "
-
-#: views.py:50
-#, python-format
-msgid "Document group query error: %s"
-msgstr "Error en consulta de grupo de documentos: %s"
-
-#: views.py:61
-#, python-format
-msgid "document groups (%s)"
-msgstr "grupos de documentos (%s)"
-
-#: views.py:75
-msgid "There no defined groups for the current document."
-msgstr "No hay grupos definidos para el documento actual."
-
-
diff --git a/apps/grouping/locale/pt/LC_MESSAGES/django.po b/apps/grouping/locale/pt/LC_MESSAGES/django.po
deleted file mode 100644
index 03d9614e7c..0000000000
--- a/apps/grouping/locale/pt/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,206 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-#   <dev.emerson@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
-"PO-Revision-Date: 2011-11-02 05:05+0000\n"
-"Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/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"
-
-#: __init__.py:8
-msgid "group actions"
-msgstr "ações do grupo"
-
-#: __init__.py:9
-msgid "groups"
-msgstr "grupos"
-
-#: forms.py:55
-msgid "Pages"
-msgstr "Páginas"
-
-#: forms.py:56
-msgid "Select"
-msgstr "Selecionar"
-
-#: forms.py:61
-msgid "group document"
-msgstr "agrupar documento"
-
-#: forms.py:66
-msgid "Click on the image for full size view of the first page."
-msgstr "Clique na imagem para ver em tamanho grande a primeira página."
-
-#: literals.py:7
-msgid "and"
-msgstr "e"
-
-#: literals.py:8
-msgid "or"
-msgstr "ou"
-
-#: literals.py:12
-msgid "is equal to"
-msgstr "é igual a"
-
-#: literals.py:13
-msgid "is equal to (case insensitive)"
-msgstr "é igual a (case insensitive)"
-
-#: literals.py:14
-msgid "contains"
-msgstr "contém"
-
-#: literals.py:15
-msgid "contains (case insensitive)"
-msgstr "contém (case insensitive)"
-
-#: literals.py:16
-msgid "is in"
-msgstr "está em"
-
-#: literals.py:17
-msgid "is greater than"
-msgstr "é maior do que"
-
-#: literals.py:18
-msgid "is greater than or equal to"
-msgstr "é maior ou igual a"
-
-#: literals.py:19
-msgid "is less than"
-msgstr "é inferior a"
-
-#: literals.py:20
-msgid "is less than or equal to"
-msgstr "é menor ou igual a"
-
-#: literals.py:21
-msgid "starts with"
-msgstr "começa com"
-
-#: literals.py:22
-msgid "starts with (case insensitive)"
-msgstr "começa com (case insensitive)"
-
-#: literals.py:23
-msgid "ends with"
-msgstr "termina com"
-
-#: literals.py:24
-msgid "ends with (case insensitive)"
-msgstr "termina com (case insensitive)"
-
-#: literals.py:25
-msgid "is in regular expression"
-msgstr "está em expressão regular"
-
-#: literals.py:26
-msgid "is in regular expression (case insensitive)"
-msgstr "está em expressão regular (case insensitive)"
-
-#: models.py:10
-msgid "title"
-msgstr "título"
-
-#: models.py:11
-msgid "dynamic title"
-msgstr "título dinâmico"
-
-#: models.py:12 models.py:33
-msgid "enabled"
-msgstr "habilitado"
-
-#: models.py:20 models.py:25
-msgid "document group"
-msgstr "grupo de documentos"
-
-#: models.py:21
-msgid "document groups"
-msgstr "grupos de documentos"
-
-#: models.py:26
-msgid "The inclusion is ignored for the first item."
-msgstr "A inclusão é ignorada para o primeiro item."
-
-#: models.py:27
-msgid "foreign document data"
-msgstr "dados de documentos estrangeiros"
-
-#: models.py:27
-msgid ""
-"This represents the metadata of all other documents.  Available objects: "
-"`document.<attribute>` and `metadata.<metadata_type_name>`."
-msgstr ""
-"Isto representa os metadados de todos os outros documentos. Objetos "
-"disponíveis: `document. <attribute> ` e ` metadata. <metadata_type_name> `."
-
-#: models.py:31
-msgid "expression"
-msgstr "expressão"
-
-#: models.py:31
-msgid ""
-"This expression will be evaluated against the current selected document.  "
-"The document metadata is available as variables `metadata` and document "
-"properties under the variable `document`."
-msgstr ""
-"Esta expressão será avaliada em relação ao documento atual selecionado. Os "
-"metadados do documento estão disponíveis como variáveis \"​metadados \" e "
-"propriedades do documento em  variáveis `documento`."
-
-#: models.py:32
-msgid "negated"
-msgstr "negada"
-
-#: models.py:32
-msgid "Inverts the logic of the operator."
-msgstr "Inverte a lógica do operador."
-
-#: models.py:36
-msgid "not"
-msgstr "não"
-
-#: models.py:39
-msgid "group item"
-msgstr "item do grupo"
-
-#: models.py:40
-msgid "group items"
-msgstr "itens do grupo"
-
-#: views.py:21
-msgid "No action selected."
-msgstr "Nenhuma ação selecionada."
-
-#: views.py:34
-#, python-format
-msgid "documents in group: %(group)s"
-msgstr "documentos no grupo: %(group)s "
-
-#: views.py:50
-#, python-format
-msgid "Document group query error: %s"
-msgstr "Erro na consulta de grupo do documento: %s"
-
-#: views.py:61
-#, python-format
-msgid "document groups (%s)"
-msgstr "grupos do documento (%s)"
-
-#: views.py:75
-msgid "There no defined groups for the current document."
-msgstr "Não há grupos definidos para o documento atual."
-
-
diff --git a/apps/grouping/locale/ru/LC_MESSAGES/django.mo b/apps/grouping/locale/ru/LC_MESSAGES/django.mo
deleted file mode 100644
index 29c3bb2d20..0000000000
Binary files a/apps/grouping/locale/ru/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/apps/grouping/locale/ru/LC_MESSAGES/django.po b/apps/grouping/locale/ru/LC_MESSAGES/django.po
deleted file mode 100644
index 173b84391c..0000000000
--- a/apps/grouping/locale/ru/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,207 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Sergey Glita <gsv70@mail.ru>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:45-0400\n"
-"PO-Revision-Date: 2011-11-04 10:53+0000\n"
-"Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: __init__.py:8
-msgid "group actions"
-msgstr "групповые действия"
-
-#: __init__.py:9
-msgid "groups"
-msgstr "группы"
-
-#: forms.py:55
-msgid "Pages"
-msgstr "Страницы"
-
-#: forms.py:56
-msgid "Select"
-msgstr "Выбрать"
-
-#: forms.py:61
-msgid "group document"
-msgstr "group document"
-
-#: forms.py:66
-msgid "Click on the image for full size view of the first page."
-msgstr ""
-"Нажмите на изображение для просмотра  первой страницы в полном размере."
-
-#: literals.py:7
-msgid "and"
-msgstr "и"
-
-#: literals.py:8
-msgid "or"
-msgstr "или"
-
-#: literals.py:12
-msgid "is equal to"
-msgstr "равно"
-
-#: literals.py:13
-msgid "is equal to (case insensitive)"
-msgstr "равно (без учета регистра)"
-
-#: literals.py:14
-msgid "contains"
-msgstr "содержит"
-
-#: literals.py:15
-msgid "contains (case insensitive)"
-msgstr "содержит (без учета регистра)"
-
-#: literals.py:16
-msgid "is in"
-msgstr "находится в"
-
-#: literals.py:17
-msgid "is greater than"
-msgstr "больше"
-
-#: literals.py:18
-msgid "is greater than or equal to"
-msgstr "больше или равно"
-
-#: literals.py:19
-msgid "is less than"
-msgstr "меньше"
-
-#: literals.py:20
-msgid "is less than or equal to"
-msgstr "меньше или равно"
-
-#: literals.py:21
-msgid "starts with"
-msgstr "начинается с"
-
-#: literals.py:22
-msgid "starts with (case insensitive)"
-msgstr "начинается с (без учета регистра)"
-
-#: literals.py:23
-msgid "ends with"
-msgstr "заканчивается на"
-
-#: literals.py:24
-msgid "ends with (case insensitive)"
-msgstr "заканчивается на (без учета регистра)"
-
-#: literals.py:25
-msgid "is in regular expression"
-msgstr "В регулярном выражении"
-
-#: literals.py:26
-msgid "is in regular expression (case insensitive)"
-msgstr "В регулярном выражении (без учета регистра)"
-
-#: models.py:10
-msgid "title"
-msgstr "название"
-
-#: models.py:11
-msgid "dynamic title"
-msgstr "динамический заголовок"
-
-#: models.py:12 models.py:33
-msgid "enabled"
-msgstr "разрешено"
-
-#: models.py:20 models.py:25
-msgid "document group"
-msgstr "document group"
-
-#: models.py:21
-msgid "document groups"
-msgstr "document groups"
-
-#: models.py:26
-msgid "The inclusion is ignored for the first item."
-msgstr "Включение игнорируется для первого элемента."
-
-#: models.py:27
-msgid "foreign document data"
-msgstr "foreign document data"
-
-#: models.py:27
-msgid ""
-"This represents the metadata of all other documents.  Available objects: "
-"`document.<attribute>` and `metadata.<metadata_type_name>`."
-msgstr ""
-"Это представляет метаданные всех других документов. Доступные объекты: "
-"`document. <attribute> ` и `metadata. <metadata_type_name> `."
-
-#: models.py:31
-msgid "expression"
-msgstr "выражение"
-
-#: models.py:31
-msgid ""
-"This expression will be evaluated against the current selected document.  "
-"The document metadata is available as variables `metadata` and document "
-"properties under the variable `document`."
-msgstr ""
-"Это выражение будет вычислено вмето выбранного документа. Метаданные "
-"документа доступны как переменные `metadata` и свойства документа в "
-"переменной `document`."
-
-#: models.py:32
-msgid "negated"
-msgstr "отрицание"
-
-#: models.py:32
-msgid "Inverts the logic of the operator."
-msgstr "Инвертирует логику оператора."
-
-#: models.py:36
-msgid "not"
-msgstr "не"
-
-#: models.py:39
-msgid "group item"
-msgstr "член группы"
-
-#: models.py:40
-msgid "group items"
-msgstr "члены группы"
-
-#: views.py:21
-msgid "No action selected."
-msgstr "Никаких действий не выбрано."
-
-#: views.py:34
-#, python-format
-msgid "documents in group: %(group)s"
-msgstr "Документы в группе: %(group)s"
-
-#: views.py:50
-#, python-format
-msgid "Document group query error: %s"
-msgstr "Документ группы запросов ошибка: %s"
-
-#: views.py:61
-#, python-format
-msgid "document groups (%s)"
-msgstr "группы документов (%s)"
-
-#: views.py:75
-msgid "There no defined groups for the current document."
-msgstr "Для текущего документа не выбрана группа"
-
-
diff --git a/apps/grouping/urls.py b/apps/grouping/urls.py
deleted file mode 100644
index ecb15abd27..0000000000
--- a/apps/grouping/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.conf.urls.defaults import patterns, url
-
-urlpatterns = patterns('grouping.views',
-    url(r'^action/$', 'document_group_action', (), 'document_group_action'),
-    url(r'^document/(?P<document_id>\d+)/group/(?P<document_group_id>\d+)/$', 'document_group_view', (), 'document_group_view'),
-    url(r'^groups/for_document/(?P<document_id>\d+)/$', 'groups_for_document', (), 'groups_for_document'),
-)
diff --git a/apps/grouping/views.py b/apps/grouping/views.py
deleted file mode 100644
index 704483ce45..0000000000
--- a/apps/grouping/views.py
+++ /dev/null
@@ -1,83 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-from django.contrib import messages
-from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render_to_response
-from django.core.urlresolvers import reverse
-from django.template import RequestContext
-
-from documents.models import Document
-from documents.views import document_list
-
-from grouping.models import DocumentGroup
-from grouping.conf.settings import SHOW_EMPTY_GROUPS
-from grouping.forms import DocumentDataGroupForm
-from grouping import document_group_link
-
-
-def document_group_action(request):
-    action = request.GET.get('action', None)
-
-    if not action:
-        messages.error(request, _(u'No action selected.'))
-        return HttpResponseRedirect(request.META.get('HTTP_REFERER', u'/'))
-
-    return HttpResponseRedirect(action)
-
-
-def document_group_view(request, document_id, document_group_id):
-    document = get_object_or_404(Document, pk=document_id)
-    document_group = get_object_or_404(DocumentGroup, pk=document_group_id)
-    object_list, errors = DocumentGroup.objects.get_groups_for(document, document_group)
-
-    return document_list(
-        request,
-        title=_(u'documents in group: %(group)s') % {
-            'group': object_list['title']
-        },
-        object_list=object_list['documents'],
-        extra_context={
-            'object': document
-        }
-    )
-
-
-def groups_for_document(request, document_id):
-    subtemplates_list = []
-    document = get_object_or_404(Document, pk=document_id)
-    document_groups, errors = DocumentGroup.objects.get_groups_for(document)
-    if (request.user.is_staff or request.user.is_superuser) and errors:
-        for error in errors:
-            messages.warning(request, _(u'Document group query error: %s' % error))
-
-    if not SHOW_EMPTY_GROUPS:
-        #If GROUP_SHOW_EMPTY is False, remove empty groups from
-        #dictionary
-        document_groups = dict([(group, data) for group, data in document_groups.items() if data['documents']])
-
-    if document_groups:
-        subtemplates_list = [{
-            'name': 'generic_form_subtemplate.html',
-            'context': {
-                'title': _(u'document groups (%s)') % len(document_groups.keys()),
-                'form': DocumentDataGroupForm(
-                    groups=document_groups, current_document=document,
-                    links=[document_group_link]
-                ),
-                'form_action': reverse('document_group_action'),
-                'submit_method': 'GET',
-            }
-        }]
-    else:
-        # If there are not group display a placeholder messages saying so
-        subtemplates_list = [{
-            'name': 'generic_subtemplate.html',
-            'context': {
-                'content': _(u'There no defined groups for the current document.'),
-            }
-        }]
-
-    return render_to_response('generic_detail.html', {
-        'object': document,
-        'document': document,
-        'subtemplates_list': subtemplates_list,
-    }, context_instance=RequestContext(request))        
diff --git a/apps/history/locale/en/LC_MESSAGES/django.po b/apps/history/locale/en/LC_MESSAGES/django.po
index 03d90c2b94..c16d3cc85d 100644
--- a/apps/history/locale/en/LC_MESSAGES/django.po
+++ b/apps/history/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: 2011-09-29 18:46-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/history/locale/es/LC_MESSAGES/django.po b/apps/history/locale/es/LC_MESSAGES/django.po
index d030134719..1d198465b4 100644
--- a/apps/history/locale/es/LC_MESSAGES/django.po
+++ b/apps/history/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 05:10+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:6
@@ -102,5 +103,3 @@ msgstr "Detalles del evento"
 #, python-format
 msgid "details for: %s"
 msgstr "Detalles para: %s"
-
-
diff --git a/apps/history/locale/pt/LC_MESSAGES/django.po b/apps/history/locale/pt/LC_MESSAGES/django.po
index 7e81b1541b..6ed4ecd216 100644
--- a/apps/history/locale/pt/LC_MESSAGES/django.po
+++ b/apps/history/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 03:22+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:6
@@ -103,5 +104,3 @@ msgstr "Detalhes do evento"
 #, python-format
 msgid "details for: %s"
 msgstr "detalhes para: %s"
-
-
diff --git a/apps/history/locale/ru/LC_MESSAGES/django.po b/apps/history/locale/ru/LC_MESSAGES/django.po
index 24c2e5b878..78cf703a30 100644
--- a/apps/history/locale/ru/LC_MESSAGES/django.po
+++ b/apps/history/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 23:30+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:6
 msgid "Access the history app"
@@ -102,5 +104,3 @@ msgstr "Подробности события"
 #, python-format
 msgid "details for: %s"
 msgstr "подробности: %s"
-
-
diff --git a/apps/linking/__init__.py b/apps/linking/__init__.py
new file mode 100644
index 0000000000..ab1bdc616a
--- /dev/null
+++ b/apps/linking/__init__.py
@@ -0,0 +1,44 @@
+from django.utils.translation import ugettext_lazy as _
+
+from navigation.api import register_links, register_sidebar_template
+from permissions.api import register_permission, set_namespace_title
+from project_setup.api import register_setup
+from documents.literals import PERMISSION_DOCUMENT_VIEW
+from documents.models import Document
+
+from linking.models import SmartLink, SmartLinkCondition
+
+PERMISSION_SMART_LINK_VIEW = {'namespace': 'linking', 'name': 'smart_link_view', 'label': _(u'View existing smart links')}
+PERMISSION_SMART_LINK_CREATE = {'namespace': 'linking', 'name': 'smart_link_create', 'label': _(u'Create new smart links')}
+PERMISSION_SMART_LINK_DELETE = {'namespace': 'linking', 'name': 'smart_link_delete', 'label': _(u'Delete smart links')}
+PERMISSION_SMART_LINK_EDIT = {'namespace': 'linking', 'name': 'smart_link_edit', 'label': _(u'Edit smart links')}
+
+set_namespace_title('linking', _(u'Smart links'))
+register_permission(PERMISSION_SMART_LINK_VIEW)
+register_permission(PERMISSION_SMART_LINK_CREATE)
+register_permission(PERMISSION_SMART_LINK_DELETE)
+register_permission(PERMISSION_SMART_LINK_EDIT)
+
+smart_link_instance_view_link = {'text': _(u'smart links actions'), 'view': 'smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
+smart_link_instances_for_document = {'text': _(u'smart links'), 'view': 'smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
+
+smart_link_setup = {'text': _(u'smart links'), 'view': 'smart_link_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+smart_link_list = {'text': _(u'smart links list'), 'view': 'smart_link_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+smart_link_create = {'text': _(u'create new smart link'), 'view': 'smart_link_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+smart_link_edit = {'text': _(u'edit'), 'view': 'smart_link_edit', 'args': 'smart_link.pk', 'famfam': 'link_edit', 'permissions': [PERMISSION_SMART_LINK_EDIT]}
+smart_link_delete = {'text': _(u'delete'), 'view': 'smart_link_delete', 'args': 'smart_link.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]}
+
+smart_link_condition_list = {'text': _(u'conditions'), 'view': 'smart_link_condition_list', 'args': 'smart_link.pk', 'famfam': 'cog', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_CREATE]}
+smart_link_condition_create = {'text': _(u'create condition'), 'view': 'smart_link_condition_create', 'args': 'smart_link.pk', 'famfam': 'cog_add', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]}
+smart_link_condition_edit = {'text': _(u'edit'), 'view': 'smart_link_condition_edit', 'args': 'condition.pk', 'famfam': 'cog_edit', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]}
+smart_link_condition_delete = {'text': _(u'delete'), 'view': 'smart_link_condition_delete', 'args': 'condition.pk', 'famfam': 'cog_delete', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]}
+
+register_links(Document, [smart_link_instances_for_document], menu_name='form_header')
+
+register_links(SmartLink, [smart_link_edit, smart_link_delete, smart_link_condition_list])
+register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete])
+register_links(['smart_link_list', 'smart_link_create', 'smart_link_edit', 'smart_link_delete', 'smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [smart_link_list, smart_link_create], menu_name='sidebar')
+register_links(['smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar')
+
+register_setup(smart_link_setup)
+register_sidebar_template(['smart_link_list'], 'smart_links_help.html')
diff --git a/apps/linking/admin.py b/apps/linking/admin.py
new file mode 100644
index 0000000000..045244bc5a
--- /dev/null
+++ b/apps/linking/admin.py
@@ -0,0 +1,16 @@
+from django.contrib import admin
+
+from linking.models import SmartLink, SmartLinkCondition
+
+
+class SmartLinkConditionInline(admin.StackedInline):
+    model = SmartLinkCondition
+    extra = 1
+    classes = ('collapse-open',)
+    allow_add = True
+
+
+class SmartLinkAdmin(admin.ModelAdmin):
+    inlines = [SmartLinkConditionInline]
+
+admin.site.register(SmartLink, SmartLinkAdmin)
diff --git a/apps/grouping/conf/__init__.py b/apps/linking/conf/__init__.py
similarity index 100%
rename from apps/grouping/conf/__init__.py
rename to apps/linking/conf/__init__.py
diff --git a/apps/linking/conf/settings.py b/apps/linking/conf/settings.py
new file mode 100644
index 0000000000..cf0d855350
--- /dev/null
+++ b/apps/linking/conf/settings.py
@@ -0,0 +1,13 @@
+'''Configuration options for the linking app'''
+
+from django.utils.translation import ugettext_lazy as _
+
+from smart_settings.api import register_settings
+
+register_settings(
+    namespace=u'linking',
+    module=u'linking.conf.settings',
+    settings=[
+        {'name': u'SHOW_EMPTY_SMART_LINKS', 'global_name': u'LINKING_SHOW_EMPTY_SMART_LINKS', 'default': True, 'description': _(u'Show smart link that don\'t return any documents.')},
+    ]
+)
diff --git a/apps/linking/forms.py b/apps/linking/forms.py
new file mode 100644
index 0000000000..9568994b89
--- /dev/null
+++ b/apps/linking/forms.py
@@ -0,0 +1,85 @@
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext
+from django.core.urlresolvers import reverse
+from django.utils.safestring import mark_safe
+from django.template.defaultfilters import capfirst
+from django.conf import settings
+
+from documents.widgets import document_html_widget
+from tags.widgets import get_tags_inline_widget
+
+from linking.models import SmartLink, SmartLinkCondition
+
+
+class SmartLinkForm(forms.ModelForm):
+    class Meta:
+        model = SmartLink
+
+        
+class SmartLinkConditionForm(forms.ModelForm):
+    class Meta:
+        model = SmartLinkCondition
+        exclude = ('smart_link',)
+
+
+class SmartLinkImageWidget(forms.widgets.Widget):
+    def render(self, name, value, attrs=None):
+        output = []
+        # TODO: convert to navigation app
+        if value['links']:
+            output.append(u'<div class="group navform wat-cf">')
+            for link in value['links']:
+                output.append(u'''
+                    <button class="button" type="submit" name="action" value="%(action)s">
+                        <span class="famfam active famfam-%(famfam)s"></span>%(text)s
+                    </button>
+                ''' % {
+                    'famfam': link.get('famfam', u'link'),
+                    'text': capfirst(link['text']),
+                    'action': reverse(link.get('view'), args=[value['current_document'].pk, value['smart_link_instance'].pk])
+                })
+            output.append(u'</div>')
+
+        output.append(u'<div style="white-space:nowrap; overflow: auto;">')
+        for document in value['documents']:
+            output.append(u'<div style="display: inline-block; margin: 0px 10px 10px 10px; %s">' % (u'border: 5px solid black; padding: 3px;' if value['current_document'] == document else u''))
+            output.append(u'<div class="tc">%s</div>' % document)
+            output.append(u'<div class="tc">%s: %d</div>' % (ugettext(u'Pages'), document.documentpage_set.count()))
+            output.append(get_tags_inline_widget(document))
+            output.append(u'<div style="padding: 5px;">' % document)
+            output.append(document_html_widget(document, click_view='document_display', view='document_preview_multipage', fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk))
+            output.append(u'</div>')
+            output.append(u'<div class="tc">')
+            output.append(u'<a href="%s"><span class="famfam active famfam-page_go"></span>%s</a>' % (reverse('document_view_simple', args=[document.pk]), ugettext(u'Select')))
+            output.append(u'</div>')
+            output.append(u'</div>')
+            
+        output.append(u'</div>')
+        output.append(
+            u'<br /><span class="famfam active famfam-magnifier"></span>%s' %
+             ugettext(u'Click on the image for full size view of the first page.'))
+
+        return mark_safe(u''.join(output))
+
+
+class SmartLinkInstanceForm(forms.Form):
+    def __init__(self, *args, **kwargs):
+        smart_link_instances = kwargs.pop('smart_link_instances', None)
+        links = kwargs.pop('links', None)
+        current_document = kwargs.pop('current_document', None)
+        
+        super(SmartLinkInstanceForm, self).__init__(*args, **kwargs)
+        
+        for smart_link_instance, data in smart_link_instances.items():
+            self.fields['preview-%s' % smart_link_instance] = forms.CharField(
+                widget=SmartLinkImageWidget(),
+                label=u'%s (%d)' % (unicode(data['title']), len(data['documents'])),
+                required=False,
+                initial={
+                    'smart_link_instance': smart_link_instance,
+                    'documents': data['documents'],
+                    'current_document': current_document,
+                    'links': links
+                }
+            )
diff --git a/apps/grouping/literals.py b/apps/linking/literals.py
similarity index 100%
rename from apps/grouping/literals.py
rename to apps/linking/literals.py
diff --git a/apps/linking/locale/en/LC_MESSAGES/django.po b/apps/linking/locale/en/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..17272844d4
--- /dev/null
+++ b/apps/linking/locale/en/LC_MESSAGES/django.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# 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: 2011-11-22 11:26-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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: __init__.py:11
+msgid "View existing smart links"
+msgstr ""
+
+#: __init__.py:12
+msgid "Create new smart links"
+msgstr ""
+
+#: __init__.py:13
+msgid "Delete smart links"
+msgstr ""
+
+#: __init__.py:14
+msgid "Edit smart links"
+msgstr ""
+
+#: __init__.py:16
+msgid "Smart links"
+msgstr ""
+
+#: __init__.py:22
+msgid "smart links actions"
+msgstr ""
+
+#: __init__.py:23 __init__.py:25 models.py:21 views.py:105
+msgid "smart links"
+msgstr ""
+
+#: __init__.py:26
+msgid "smart links list"
+msgstr ""
+
+#: __init__.py:27
+msgid "create new smart link"
+msgstr ""
+
+#: __init__.py:28 __init__.py:33
+msgid "edit"
+msgstr ""
+
+#: __init__.py:29 __init__.py:34
+msgid "delete"
+msgstr ""
+
+#: __init__.py:31
+msgid "conditions"
+msgstr ""
+
+#: __init__.py:32
+msgid "create condition"
+msgstr ""
+
+#: forms.py:48
+msgid "Pages"
+msgstr ""
+
+#: forms.py:54
+msgid "Select"
+msgstr ""
+
+#: forms.py:61
+msgid "Click on the image for full size view of the first page."
+msgstr ""
+
+#: literals.py:7
+msgid "and"
+msgstr ""
+
+#: literals.py:8
+msgid "or"
+msgstr ""
+
+#: literals.py:12
+msgid "is equal to"
+msgstr ""
+
+#: literals.py:13
+msgid "is equal to (case insensitive)"
+msgstr ""
+
+#: literals.py:14
+msgid "contains"
+msgstr ""
+
+#: literals.py:15
+msgid "contains (case insensitive)"
+msgstr ""
+
+#: literals.py:16
+msgid "is in"
+msgstr ""
+
+#: literals.py:17
+msgid "is greater than"
+msgstr ""
+
+#: literals.py:18
+msgid "is greater than or equal to"
+msgstr ""
+
+#: literals.py:19
+msgid "is less than"
+msgstr ""
+
+#: literals.py:20
+msgid "is less than or equal to"
+msgstr ""
+
+#: literals.py:21
+msgid "starts with"
+msgstr ""
+
+#: literals.py:22
+msgid "starts with (case insensitive)"
+msgstr ""
+
+#: literals.py:23
+msgid "ends with"
+msgstr ""
+
+#: literals.py:24
+msgid "ends with (case insensitive)"
+msgstr ""
+
+#: literals.py:25
+msgid "is in regular expression"
+msgstr ""
+
+#: literals.py:26
+msgid "is in regular expression (case insensitive)"
+msgstr ""
+
+#: models.py:10
+msgid "title"
+msgstr ""
+
+#: models.py:11 views.py:108
+msgid "dynamic title"
+msgstr ""
+
+#: models.py:11 models.py:29
+msgid ""
+"This expression will be evaluated against the current selected document.  "
+"The document metadata is available as variables `metadata` and document "
+"properties under the variable `document`."
+msgstr ""
+
+#: models.py:12 models.py:31 views.py:109 views.py:196
+msgid "enabled"
+msgstr ""
+
+#: models.py:20 models.py:25 views.py:256 views.py:287
+msgid "smart link"
+msgstr ""
+
+#: models.py:26
+msgid "The inclusion is ignored for the first item."
+msgstr ""
+
+#: models.py:27
+msgid "foreign document data"
+msgstr ""
+
+#: models.py:27
+msgid ""
+"This represents the metadata of all other documents.  Available objects: "
+"`document.<attribute>` and `metadata.<metadata_type_name>`."
+msgstr ""
+
+#: models.py:29
+msgid "expression"
+msgstr ""
+
+#: models.py:30
+msgid "negated"
+msgstr ""
+
+#: models.py:30
+msgid "Inverts the logic of the operator."
+msgstr ""
+
+#: models.py:34
+msgid "not"
+msgstr ""
+
+#: models.py:37
+msgid "link condition"
+msgstr ""
+
+#: models.py:38
+msgid "link conditions"
+msgstr ""
+
+#: views.py:32
+msgid "No action selected."
+msgstr ""
+
+#: views.py:47
+#, python-format
+msgid "documents in smart link: %(group)s"
+msgstr ""
+
+#: views.py:65
+#, python-format
+msgid "Smart link query error: %s"
+msgstr ""
+
+#: views.py:76
+#, python-format
+msgid "smart links (%s)"
+msgstr ""
+
+#: views.py:90
+msgid "There no defined smart links for the current document."
+msgstr ""
+
+#: views.py:124
+#, python-format
+msgid "Smart link: %s created successfully."
+msgstr ""
+
+#: views.py:131
+msgid "Create new smart link"
+msgstr ""
+
+#: views.py:144
+#, python-format
+msgid "Smart link: %s edited successfully."
+msgstr ""
+
+#: views.py:153
+#, python-format
+msgid "Edit smart link: %s"
+msgstr ""
+
+#: views.py:168
+#, python-format
+msgid "Smart link: %s deleted successfully."
+msgstr ""
+
+#: views.py:170
+#, python-format
+msgid "Error deleting smart link: %(smart_link)s; %(error)s."
+msgstr ""
+
+#: views.py:180
+#, python-format
+msgid "Are you sure you wish to delete smart link: %s?"
+msgstr ""
+
+#: views.py:193
+#, python-format
+msgid "conditions for smart link: %s"
+msgstr ""
+
+#: views.py:216
+#, python-format
+msgid "Smart link condition: \"%s\" created successfully."
+msgstr ""
+
+#: views.py:223
+#, python-format
+msgid "Add new conditions to smart link: \"%s\""
+msgstr ""
+
+#: views.py:243
+#, python-format
+msgid "Smart link condition: \"%s\" edited successfully."
+msgstr ""
+
+#: views.py:250
+msgid "Edit smart link condition"
+msgstr ""
+
+#: views.py:257 views.py:288
+msgid "condition"
+msgstr ""
+
+#: views.py:274
+#, python-format
+msgid "Smart link condition: \"%s\" deleted successfully."
+msgstr ""
+
+#: views.py:276
+#, python-format
+msgid ""
+"Error deleting smart link condition: %(smart_link_condition)s; %(error)s."
+msgstr ""
+
+#: views.py:290
+#, python-format
+msgid "Are you sure you wish to delete smart link condition: \"%s\"?"
+msgstr ""
+
+#: conf/settings.py:11
+msgid "Show smart link that don't return any documents."
+msgstr ""
+
+#: templates/smart_links_help.html:3
+msgid "What are smart links?"
+msgstr ""
+
+#: templates/smart_links_help.html:4
+msgid ""
+"Smart links are a set of conditional statements that are used to query the "
+"database using the current document the user is accessing as the data "
+"source, the results of these queries are a list of documents that relate in "
+"some manner to the document being displayed and allow users the ability to "
+"jump to and from linked documents very easily."
+msgstr ""
diff --git a/apps/linking/locale/es/LC_MESSAGES/django.mo b/apps/linking/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..17ed6df31e
Binary files /dev/null and b/apps/linking/locale/es/LC_MESSAGES/django.mo differ
diff --git a/apps/linking/locale/es/LC_MESSAGES/django.po b/apps/linking/locale/es/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..653a34abd0
--- /dev/null
+++ b/apps/linking/locale/es/LC_MESSAGES/django.po
@@ -0,0 +1,351 @@
+# 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: Mayan EDMS\n"
+"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 20:56+0000\n"
+"Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/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"
+
+#: __init__.py:11
+msgid "View existing smart links"
+msgstr "Ver enlaces inteligentes existentes"
+
+#: __init__.py:12
+msgid "Create new smart links"
+msgstr "Crear nuevos enlaces inteligentes"
+
+#: __init__.py:13
+msgid "Delete smart links"
+msgstr "Eliminar enlaces inteligentes"
+
+#: __init__.py:14
+msgid "Edit smart links"
+msgstr "Editar enlaces inteligentes"
+
+#: __init__.py:16
+msgid "Smart links"
+msgstr "Enlaces inteligentes"
+
+#: __init__.py:22
+msgid "smart links actions"
+msgstr "acciones de enlaces inteligentes"
+
+#: __init__.py:23 __init__.py:25 models.py:21 views.py:105
+msgid "smart links"
+msgstr "enlaces inteligentes"
+
+#: __init__.py:26
+msgid "smart links list"
+msgstr "lista de enlaces inteligentes"
+
+#: __init__.py:27
+msgid "create new smart link"
+msgstr "crear un enlace inteligente nuevo"
+
+#: __init__.py:28 __init__.py:33
+msgid "edit"
+msgstr "editar"
+
+#: __init__.py:29 __init__.py:34
+msgid "delete"
+msgstr "borrar"
+
+#: __init__.py:31
+msgid "conditions"
+msgstr "condiciones"
+
+#: __init__.py:32
+msgid "create condition"
+msgstr "crear condicion"
+
+#: forms.py:48
+msgid "Pages"
+msgstr "Páginas"
+
+#: forms.py:54
+msgid "Select"
+msgstr "Seleccionar"
+
+#: forms.py:61
+msgid "Click on the image for full size view of the first page."
+msgstr ""
+"Haga clic en la imagen para ver el tamaño completo de la primera página."
+
+#: literals.py:7
+msgid "and"
+msgstr "y"
+
+#: literals.py:8
+msgid "or"
+msgstr "o"
+
+#: literals.py:12
+msgid "is equal to"
+msgstr "es igual a"
+
+#: literals.py:13
+msgid "is equal to (case insensitive)"
+msgstr "es igual a (mayúsculas y minúsculas)"
+
+#: literals.py:14
+msgid "contains"
+msgstr "contiene"
+
+#: literals.py:15
+msgid "contains (case insensitive)"
+msgstr "contiene (mayúsculas y minúsculas)"
+
+#: literals.py:16
+msgid "is in"
+msgstr "está en"
+
+#: literals.py:17
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: literals.py:18
+msgid "is greater than or equal to"
+msgstr "es mayor o igual a"
+
+#: literals.py:19
+msgid "is less than"
+msgstr "es menor que"
+
+#: literals.py:20
+msgid "is less than or equal to"
+msgstr "es menor o igual a"
+
+#: literals.py:21
+msgid "starts with"
+msgstr "comienza con"
+
+#: literals.py:22
+msgid "starts with (case insensitive)"
+msgstr "comienza con (mayúsculas y minúsculas)"
+
+#: literals.py:23
+msgid "ends with"
+msgstr "termina con"
+
+#: literals.py:24
+msgid "ends with (case insensitive)"
+msgstr "termina con (mayúsculas y minúsculas)"
+
+#: literals.py:25
+msgid "is in regular expression"
+msgstr "está en la expresión regular"
+
+#: literals.py:26
+msgid "is in regular expression (case insensitive)"
+msgstr "está en la expresión regular (mayúsculas y minúsculas)"
+
+#: models.py:10
+msgid "title"
+msgstr "título"
+
+#: models.py:11 views.py:108
+msgid "dynamic title"
+msgstr "título dinámico"
+
+#: models.py:11 models.py:29
+msgid ""
+"This expression will be evaluated against the current selected document.  "
+"The document metadata is available as variables `metadata` and document "
+"properties under the variable `document`."
+msgstr ""
+"Esta expresión sera evaluada con respecto al documento seleccionado actual."
+"  Los metadatos del documento están disponible como variables `metadata` y "
+"las propiedades del documento en la variable `document`."
+
+#: models.py:12 models.py:31 views.py:109 views.py:196
+msgid "enabled"
+msgstr "habilitado"
+
+#: models.py:20 models.py:25 views.py:256 views.py:287
+msgid "smart link"
+msgstr "enlace inteligente"
+
+#: models.py:26
+msgid "The inclusion is ignored for the first item."
+msgstr "La inclusión es ignorada para el primer artículo."
+
+#: models.py:27
+msgid "foreign document data"
+msgstr "datos de documento foráneo"
+
+#: models.py:27
+msgid ""
+"This represents the metadata of all other documents.  Available objects: "
+"`document.<attribute>` and `metadata.<metadata_type_name>`."
+msgstr ""
+"Esto representa los metadatos de todos los demás documentos.  Objetos "
+"disponibles: `document.<attributo>` y `metadata.<nombre de tipo de "
+"metadata>`."
+
+#: models.py:29
+msgid "expression"
+msgstr "expresión"
+
+#: models.py:30
+msgid "negated"
+msgstr "negado"
+
+#: models.py:30
+msgid "Inverts the logic of the operator."
+msgstr "Invierte la lógica del operador."
+
+#: models.py:34
+msgid "not"
+msgstr "no"
+
+#: models.py:37
+msgid "link condition"
+msgstr "condición de enlace"
+
+#: models.py:38
+msgid "link conditions"
+msgstr "condiciones de enlace"
+
+#: views.py:32
+msgid "No action selected."
+msgstr "Ninguna acción seleccionada."
+
+#: views.py:47
+#, python-format
+msgid "documents in smart link: %(group)s"
+msgstr "documentos en el enlace inteligente: %(group)s"
+
+#: views.py:65
+#, python-format
+msgid "Smart link query error: %s"
+msgstr "Error en consulta de enlace inteligente: %s"
+
+#: views.py:76
+#, python-format
+msgid "smart links (%s)"
+msgstr "enlaces inteligentes (%s)"
+
+#: views.py:90
+msgid "There no defined smart links for the current document."
+msgstr "No hay enlaces inteligentes definidos para el documento actual."
+
+#: views.py:124
+#, python-format
+msgid "Smart link: %s created successfully."
+msgstr "Enlace inteligente: %s creado exitosamente."
+
+#: views.py:131
+msgid "Create new smart link"
+msgstr "Crear un enlace inteligente nuevo"
+
+#: views.py:144
+#, python-format
+msgid "Smart link: %s edited successfully."
+msgstr "Enlace inteligente: %s editado exitosamente."
+
+#: views.py:153
+#, python-format
+msgid "Edit smart link: %s"
+msgstr "Editar enlace inteligente: %s"
+
+#: views.py:168
+#, python-format
+msgid "Smart link: %s deleted successfully."
+msgstr "Enlace inteligente: %s eliminado exitosamente."
+
+#: views.py:170
+#, python-format
+msgid "Error deleting smart link: %(smart_link)s; %(error)s."
+msgstr ""
+"Error al tratar de eliminar enlace inteligente: %(smart_link)s; %(error)s."
+
+#: views.py:180
+#, python-format
+msgid "Are you sure you wish to delete smart link: %s?"
+msgstr "¿Está seguro que desea eliminar el enlace inteligente: %s?"
+
+#: views.py:193
+#, python-format
+msgid "conditions for smart link: %s"
+msgstr "condiciones de enlace inteligente: %s"
+
+#: views.py:216
+#, python-format
+msgid "Smart link condition: \"%s\" created successfully."
+msgstr "Condición de enlace inteligente: \"%s\" creada exitosamente."
+
+#: views.py:223
+#, python-format
+msgid "Add new conditions to smart link: \"%s\""
+msgstr "Añadir nuevas condiciones de enlace inteligente: \"%s\""
+
+#: views.py:243
+#, python-format
+msgid "Smart link condition: \"%s\" edited successfully."
+msgstr "Condición de enlace inteligente: \"%s\", editada exitosamente."
+
+#: views.py:250
+msgid "Edit smart link condition"
+msgstr "Editar condición de enlace inteligente"
+
+#: views.py:257 views.py:288
+msgid "condition"
+msgstr "condición"
+
+#: views.py:274
+#, python-format
+msgid "Smart link condition: \"%s\" deleted successfully."
+msgstr "Condición de enlace inteligente: \"%s\" ha eliminada exitosamente."
+
+#: views.py:276
+#, python-format
+msgid ""
+"Error deleting smart link condition: %(smart_link_condition)s; %(error)s."
+msgstr ""
+"Error al tratar de eliminar la condición de enlace inteligente: "
+"%(smart_link_condition)s; %(error)s."
+
+#: views.py:290
+#, python-format
+msgid "Are you sure you wish to delete smart link condition: \"%s\"?"
+msgstr ""
+"¿Está seguro que desea eliminar la condición de enlace inteligente: \"%s\"?"
+
+#: conf/settings.py:11
+msgid "Show smart link that don't return any documents."
+msgstr ""
+"Mostrar enlace inteligente que no devuelven ningun documentos como "
+"resultado."
+
+#: templates/smart_links_help.html:3
+msgid "What are smart links?"
+msgstr "¿Qué son los enlaces inteligentes?"
+
+#: templates/smart_links_help.html:4
+msgid ""
+"Smart links are a set of conditional statements that are used to query the "
+"database using the current document the user is accessing as the data "
+"source, the results of these queries are a list of documents that relate in "
+"some manner to the document being displayed and allow users the ability to "
+"jump to and from linked documents very easily."
+msgstr ""
+"Enlaces inteligentes son un conjunto de condiciones que se utilizan para "
+"consultar la base de datos en relacion al documento actual que el usuario "
+"está accediendo, los resultados de estas consultas son una lista de "
+"documentos que se relacionan de alguna manera al documento que se muestra y "
+"permite a los usuarios la capacidad de navegar entre los documentos "
+"vinculados con mucha facilidad."
+
+
diff --git a/apps/grouping/locale/pt/LC_MESSAGES/django.mo b/apps/linking/locale/pt/LC_MESSAGES/django.mo
similarity index 100%
rename from apps/grouping/locale/pt/LC_MESSAGES/django.mo
rename to apps/linking/locale/pt/LC_MESSAGES/django.mo
diff --git a/apps/linking/locale/pt/LC_MESSAGES/django.po b/apps/linking/locale/pt/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..120688a322
--- /dev/null
+++ b/apps/linking/locale/pt/LC_MESSAGES/django.po
@@ -0,0 +1,361 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+#   <dev.emerson@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: Mayan EDMS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-02 05:05+0000\n"
+"Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/pt/)\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: __init__.py:11
+msgid "View existing smart links"
+msgstr ""
+
+#: __init__.py:12
+msgid "Create new smart links"
+msgstr ""
+
+#: __init__.py:13
+msgid "Delete smart links"
+msgstr ""
+
+#: __init__.py:14
+msgid "Edit smart links"
+msgstr ""
+
+#: __init__.py:16
+msgid "Smart links"
+msgstr ""
+
+#: __init__.py:22
+msgid "smart links actions"
+msgstr ""
+
+#: __init__.py:23 __init__.py:25 models.py:21 views.py:105
+msgid "smart links"
+msgstr ""
+
+#: __init__.py:26
+msgid "smart links list"
+msgstr ""
+
+#: __init__.py:27
+msgid "create new smart link"
+msgstr ""
+
+#: __init__.py:28 __init__.py:33
+msgid "edit"
+msgstr ""
+
+#: __init__.py:29 __init__.py:34
+msgid "delete"
+msgstr ""
+
+#: __init__.py:31
+msgid "conditions"
+msgstr ""
+
+#: __init__.py:32
+msgid "create condition"
+msgstr ""
+
+#: forms.py:48
+msgid "Pages"
+msgstr "Páginas"
+
+#: forms.py:54
+msgid "Select"
+msgstr "Selecionar"
+
+#: forms.py:61
+msgid "Click on the image for full size view of the first page."
+msgstr "Clique na imagem para ver em tamanho grande a primeira página."
+
+#: literals.py:7
+msgid "and"
+msgstr "e"
+
+#: literals.py:8
+msgid "or"
+msgstr "ou"
+
+#: literals.py:12
+msgid "is equal to"
+msgstr "é igual a"
+
+#: literals.py:13
+msgid "is equal to (case insensitive)"
+msgstr "é igual a (case insensitive)"
+
+#: literals.py:14
+msgid "contains"
+msgstr "contém"
+
+#: literals.py:15
+msgid "contains (case insensitive)"
+msgstr "contém (case insensitive)"
+
+#: literals.py:16
+msgid "is in"
+msgstr "está em"
+
+#: literals.py:17
+msgid "is greater than"
+msgstr "é maior do que"
+
+#: literals.py:18
+msgid "is greater than or equal to"
+msgstr "é maior ou igual a"
+
+#: literals.py:19
+msgid "is less than"
+msgstr "é inferior a"
+
+#: literals.py:20
+msgid "is less than or equal to"
+msgstr "é menor ou igual a"
+
+#: literals.py:21
+msgid "starts with"
+msgstr "começa com"
+
+#: literals.py:22
+msgid "starts with (case insensitive)"
+msgstr "começa com (case insensitive)"
+
+#: literals.py:23
+msgid "ends with"
+msgstr "termina com"
+
+#: literals.py:24
+msgid "ends with (case insensitive)"
+msgstr "termina com (case insensitive)"
+
+#: literals.py:25
+msgid "is in regular expression"
+msgstr "está em expressão regular"
+
+#: literals.py:26
+msgid "is in regular expression (case insensitive)"
+msgstr "está em expressão regular (case insensitive)"
+
+#: models.py:10
+msgid "title"
+msgstr "título"
+
+#: models.py:11 views.py:108
+msgid "dynamic title"
+msgstr "título dinâmico"
+
+#: models.py:11 models.py:29
+msgid ""
+"This expression will be evaluated against the current selected document.  "
+"The document metadata is available as variables `metadata` and document "
+"properties under the variable `document`."
+msgstr ""
+"Esta expressão será avaliada em relação ao documento atual selecionado. Os "
+"metadados do documento estão disponíveis como variáveis \"​metadados \" e "
+"propriedades do documento em  variáveis `documento`."
+
+#: models.py:12 models.py:31 views.py:109 views.py:196
+msgid "enabled"
+msgstr "habilitado"
+
+#: models.py:20 models.py:25 views.py:256 views.py:287
+msgid "smart link"
+msgstr ""
+
+#: models.py:26
+msgid "The inclusion is ignored for the first item."
+msgstr "A inclusão é ignorada para o primeiro item."
+
+#: models.py:27
+msgid "foreign document data"
+msgstr "dados de documentos estrangeiros"
+
+#: models.py:27
+msgid ""
+"This represents the metadata of all other documents.  Available objects: "
+"`document.<attribute>` and `metadata.<metadata_type_name>`."
+msgstr ""
+"Isto representa os metadados de todos os outros documentos. Objetos "
+"disponíveis: `document. <attribute> ` e ` metadata. <metadata_type_name> `."
+
+#: models.py:29
+msgid "expression"
+msgstr "expressão"
+
+#: models.py:30
+msgid "negated"
+msgstr "negada"
+
+#: models.py:30
+msgid "Inverts the logic of the operator."
+msgstr "Inverte a lógica do operador."
+
+#: models.py:34
+msgid "not"
+msgstr "não"
+
+#: models.py:37
+msgid "link condition"
+msgstr ""
+
+#: models.py:38
+msgid "link conditions"
+msgstr ""
+
+#: views.py:32
+msgid "No action selected."
+msgstr "Nenhuma ação selecionada."
+
+#: views.py:47
+#, fuzzy, python-format
+msgid "documents in smart link: %(group)s"
+msgstr "documentos no grupo: %(group)s "
+
+#: views.py:65
+#, fuzzy, python-format
+msgid "Smart link query error: %s"
+msgstr "Erro na consulta de grupo do documento: %s"
+
+#: views.py:76
+#, python-format
+msgid "smart links (%s)"
+msgstr ""
+
+#: views.py:90
+#, fuzzy
+msgid "There no defined smart links for the current document."
+msgstr "Não há grupos definidos para o documento atual."
+
+#: views.py:124
+#, python-format
+msgid "Smart link: %s created successfully."
+msgstr ""
+
+#: views.py:131
+msgid "Create new smart link"
+msgstr ""
+
+#: views.py:144
+#, python-format
+msgid "Smart link: %s edited successfully."
+msgstr ""
+
+#: views.py:153
+#, python-format
+msgid "Edit smart link: %s"
+msgstr ""
+
+#: views.py:168
+#, python-format
+msgid "Smart link: %s deleted successfully."
+msgstr ""
+
+#: views.py:170
+#, python-format
+msgid "Error deleting smart link: %(smart_link)s; %(error)s."
+msgstr ""
+
+#: views.py:180
+#, python-format
+msgid "Are you sure you wish to delete smart link: %s?"
+msgstr ""
+
+#: views.py:193
+#, python-format
+msgid "conditions for smart link: %s"
+msgstr ""
+
+#: views.py:216
+#, python-format
+msgid "Smart link condition: \"%s\" created successfully."
+msgstr ""
+
+#: views.py:223
+#, python-format
+msgid "Add new conditions to smart link: \"%s\""
+msgstr ""
+
+#: views.py:243
+#, python-format
+msgid "Smart link condition: \"%s\" edited successfully."
+msgstr ""
+
+#: views.py:250
+msgid "Edit smart link condition"
+msgstr ""
+
+#: views.py:257 views.py:288
+msgid "condition"
+msgstr ""
+
+#: views.py:274
+#, python-format
+msgid "Smart link condition: \"%s\" deleted successfully."
+msgstr ""
+
+#: views.py:276
+#, python-format
+msgid ""
+"Error deleting smart link condition: %(smart_link_condition)s; %(error)s."
+msgstr ""
+
+#: views.py:290
+#, python-format
+msgid "Are you sure you wish to delete smart link condition: \"%s\"?"
+msgstr ""
+
+#: conf/settings.py:11
+msgid "Show smart link that don't return any documents."
+msgstr ""
+
+#: templates/smart_links_help.html:3
+msgid "What are smart links?"
+msgstr ""
+
+#: templates/smart_links_help.html:4
+msgid ""
+"Smart links are a set of conditional statements that are used to query the "
+"database using the current document the user is accessing as the data "
+"source, the results of these queries are a list of documents that relate in "
+"some manner to the document being displayed and allow users the ability to "
+"jump to and from linked documents very easily."
+msgstr ""
+
+#~ msgid "group actions"
+#~ msgstr "ações do grupo"
+
+#~ msgid "groups"
+#~ msgstr "grupos"
+
+#~ msgid "group document"
+#~ msgstr "agrupar documento"
+
+#~ msgid "document group"
+#~ msgstr "grupo de documentos"
+
+#~ msgid "document groups"
+#~ msgstr "grupos de documentos"
+
+#~ msgid "group item"
+#~ msgstr "item do grupo"
+
+#~ msgid "group items"
+#~ msgstr "itens do grupo"
+
+#~ msgid "document groups (%s)"
+#~ msgstr "grupos do documento (%s)"
diff --git a/apps/linking/locale/ru/LC_MESSAGES/django.mo b/apps/linking/locale/ru/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..982203f193
Binary files /dev/null and b/apps/linking/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/linking/locale/ru/LC_MESSAGES/django.po b/apps/linking/locale/ru/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..5a02a2120d
--- /dev/null
+++ b/apps/linking/locale/ru/LC_MESSAGES/django.po
@@ -0,0 +1,343 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sergey Glita <gsv70@mail.ru>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: Mayan EDMS\n"
+"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 18:47+0000\n"
+"Last-Translator: gsv70 <gsv70@mail.ru>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: __init__.py:11
+msgid "View existing smart links"
+msgstr "Просмотр отношений"
+
+#: __init__.py:12
+msgid "Create new smart links"
+msgstr "Создать отношение"
+
+#: __init__.py:13
+msgid "Delete smart links"
+msgstr "Удалить отношения"
+
+#: __init__.py:14
+msgid "Edit smart links"
+msgstr "Редактировать отношения"
+
+#: __init__.py:16
+msgid "Smart links"
+msgstr "Отношения"
+
+#: __init__.py:22
+msgid "smart links actions"
+msgstr "действия отношений"
+
+#: __init__.py:23 __init__.py:25 models.py:21 views.py:105
+msgid "smart links"
+msgstr "отношения"
+
+#: __init__.py:26
+msgid "smart links list"
+msgstr "список отношений"
+
+#: __init__.py:27
+msgid "create new smart link"
+msgstr "создать отношение"
+
+#: __init__.py:28 __init__.py:33
+msgid "edit"
+msgstr "редактировать"
+
+#: __init__.py:29 __init__.py:34
+msgid "delete"
+msgstr "удалить"
+
+#: __init__.py:31
+msgid "conditions"
+msgstr "условия"
+
+#: __init__.py:32
+msgid "create condition"
+msgstr "создать условие"
+
+#: forms.py:48
+msgid "Pages"
+msgstr "Страницы"
+
+#: forms.py:54
+msgid "Select"
+msgstr "Выбрать"
+
+#: forms.py:61
+msgid "Click on the image for full size view of the first page."
+msgstr ""
+"Нажмите на изображение для просмотра  первой страницы в полном размере."
+
+#: literals.py:7
+msgid "and"
+msgstr "и"
+
+#: literals.py:8
+msgid "or"
+msgstr "или"
+
+#: literals.py:12
+msgid "is equal to"
+msgstr "равно"
+
+#: literals.py:13
+msgid "is equal to (case insensitive)"
+msgstr "равно (без учета регистра)"
+
+#: literals.py:14
+msgid "contains"
+msgstr "содержит"
+
+#: literals.py:15
+msgid "contains (case insensitive)"
+msgstr "содержит (без учета регистра)"
+
+#: literals.py:16
+msgid "is in"
+msgstr "находится в"
+
+#: literals.py:17
+msgid "is greater than"
+msgstr "больше"
+
+#: literals.py:18
+msgid "is greater than or equal to"
+msgstr "больше или равно"
+
+#: literals.py:19
+msgid "is less than"
+msgstr "меньше"
+
+#: literals.py:20
+msgid "is less than or equal to"
+msgstr "меньше или равно"
+
+#: literals.py:21
+msgid "starts with"
+msgstr "начинается с"
+
+#: literals.py:22
+msgid "starts with (case insensitive)"
+msgstr "начинается с (без учета регистра)"
+
+#: literals.py:23
+msgid "ends with"
+msgstr "заканчивается на"
+
+#: literals.py:24
+msgid "ends with (case insensitive)"
+msgstr "заканчивается на (без учета регистра)"
+
+#: literals.py:25
+msgid "is in regular expression"
+msgstr "В регулярном выражении"
+
+#: literals.py:26
+msgid "is in regular expression (case insensitive)"
+msgstr "В регулярном выражении (без учета регистра)"
+
+#: models.py:10
+msgid "title"
+msgstr "название"
+
+#: models.py:11 views.py:108
+msgid "dynamic title"
+msgstr "динамический заголовок"
+
+#: models.py:11 models.py:29
+msgid ""
+"This expression will be evaluated against the current selected document.  "
+"The document metadata is available as variables `metadata` and document "
+"properties under the variable `document`."
+msgstr ""
+"Это выражение будет вычислено вмето выбранного документа. Метаданные "
+"документа доступны как переменные `metadata` и свойства документа в "
+"переменной `document`."
+
+#: models.py:12 models.py:31 views.py:109 views.py:196
+msgid "enabled"
+msgstr "разрешено"
+
+#: models.py:20 models.py:25 views.py:256 views.py:287
+msgid "smart link"
+msgstr "отношение"
+
+#: models.py:26
+msgid "The inclusion is ignored for the first item."
+msgstr "Включение игнорируется для первого элемента."
+
+#: models.py:27
+msgid "foreign document data"
+msgstr "foreign document data"
+
+#: models.py:27
+msgid ""
+"This represents the metadata of all other documents.  Available objects: "
+"`document.<attribute>` and `metadata.<metadata_type_name>`."
+msgstr ""
+"Это представляет метаданные всех других документов. Доступные объекты: "
+"`document. <attribute> ` и `metadata. <metadata_type_name> `."
+
+#: models.py:29
+msgid "expression"
+msgstr "выражение"
+
+#: models.py:30
+msgid "negated"
+msgstr "отрицание"
+
+#: models.py:30
+msgid "Inverts the logic of the operator."
+msgstr "Инвертирует логику оператора."
+
+#: models.py:34
+msgid "not"
+msgstr "не"
+
+#: models.py:37
+msgid "link condition"
+msgstr "условие ссылки"
+
+#: models.py:38
+msgid "link conditions"
+msgstr "условия ссылки"
+
+#: views.py:32
+msgid "No action selected."
+msgstr "Никаких действий не выбрано."
+
+#: views.py:47
+#, python-format
+msgid "documents in smart link: %(group)s"
+msgstr "документы в отношении %(group)s"
+
+#: views.py:65
+#, python-format
+msgid "Smart link query error: %s"
+msgstr "Ошибка запроса в отношении %s"
+
+#: views.py:76
+#, python-format
+msgid "smart links (%s)"
+msgstr "отношения (%s)"
+
+#: views.py:90
+msgid "There no defined smart links for the current document."
+msgstr "Для этого документа отношения не определены."
+
+#: views.py:124
+#, python-format
+msgid "Smart link: %s created successfully."
+msgstr "Отношение %s создано."
+
+#: views.py:131
+msgid "Create new smart link"
+msgstr "Создать новое отношение"
+
+#: views.py:144
+#, python-format
+msgid "Smart link: %s edited successfully."
+msgstr "Отношение %s изменено."
+
+#: views.py:153
+#, python-format
+msgid "Edit smart link: %s"
+msgstr "Редактировать отношение %s"
+
+#: views.py:168
+#, python-format
+msgid "Smart link: %s deleted successfully."
+msgstr "Отношение %s удалено."
+
+#: views.py:170
+#, python-format
+msgid "Error deleting smart link: %(smart_link)s; %(error)s."
+msgstr "Ошибка при удалении отношения %(smart_link)s; %(error)s."
+
+#: views.py:180
+#, python-format
+msgid "Are you sure you wish to delete smart link: %s?"
+msgstr "Вы действительно хотите удалить отношение %s?"
+
+#: views.py:193
+#, python-format
+msgid "conditions for smart link: %s"
+msgstr "условия для отношения %s"
+
+#: views.py:216
+#, python-format
+msgid "Smart link condition: \"%s\" created successfully."
+msgstr "Условие для отношения \"%s\" успешно создано."
+
+#: views.py:223
+#, python-format
+msgid "Add new conditions to smart link: \"%s\""
+msgstr "Добавить новые условия отношения \"%s\""
+
+#: views.py:243
+#, python-format
+msgid "Smart link condition: \"%s\" edited successfully."
+msgstr "Условие отношения  \"%s\" изменено."
+
+#: views.py:250
+msgid "Edit smart link condition"
+msgstr "Изменить условие отношения"
+
+#: views.py:257 views.py:288
+msgid "condition"
+msgstr "состояние"
+
+#: views.py:274
+#, python-format
+msgid "Smart link condition: \"%s\" deleted successfully."
+msgstr "Условие отношения \"%s\" удалено."
+
+#: views.py:276
+#, python-format
+msgid ""
+"Error deleting smart link condition: %(smart_link_condition)s; %(error)s."
+msgstr "Ошибка при удалении условия %(smart_link_condition)s; %(error)s."
+
+#: views.py:290
+#, python-format
+msgid "Are you sure you wish to delete smart link condition: \"%s\"?"
+msgstr "Вы действительно хотите удалить условие отношения \"%s\"?"
+
+#: conf/settings.py:11
+msgid "Show smart link that don't return any documents."
+msgstr "Показать отношения без документов."
+
+#: templates/smart_links_help.html:3
+msgid "What are smart links?"
+msgstr "Что такое отношение?"
+
+#: templates/smart_links_help.html:4
+msgid ""
+"Smart links are a set of conditional statements that are used to query the "
+"database using the current document the user is accessing as the data "
+"source, the results of these queries are a list of documents that relate in "
+"some manner to the document being displayed and allow users the ability to "
+"jump to and from linked documents very easily."
+msgstr ""
+"Отношение, в оригинале smart-link, представляет собой набор условий, которые"
+" используются для поиска документов отвечающих им . Результатом такого "
+"поискового запроса является список документов, относящихся к текущему, и "
+"позволяющих быстро переходить от одного к другому. Условия строятся исходя "
+"из содержимого документа и метаданных."
+
+
diff --git a/apps/grouping/managers.py b/apps/linking/managers.py
similarity index 52%
rename from apps/grouping/managers.py
rename to apps/linking/managers.py
index 4ed9a174d4..03f9203b24 100644
--- a/apps/grouping/managers.py
+++ b/apps/linking/managers.py
@@ -4,13 +4,13 @@ from django.db.models import Q
 from metadata.classes import MetadataObject
 from documents.models import Document
 
-from grouping.literals import INCLUSION_AND, INCLUSION_OR
+from linking.literals import INCLUSION_AND, INCLUSION_OR
 
 
-class DocumentGroupManager(models.Manager):
-    def get_groups_for(self, document, group_obj=None):
+class SmartLinkManager(models.Manager):
+    def get_smart_link_instances_for(self, document, smart_link_obj=None):
         errors = []
-        document_groups = {}
+        result = {}
         metadata_dict = {}
         for document_metadata in document.documentmetadata_set.all():
             metadata_dict[document_metadata.metadata_type.name] = document_metadata.value
@@ -18,38 +18,38 @@ class DocumentGroupManager(models.Manager):
         eval_dict['document'] = document
         eval_dict['metadata'] = MetadataObject(metadata_dict)
 
-        if group_obj:
-            groups_qs = self.model.objects.filter(Q(enabled=True) & Q(pk=group_obj.pk))
+        if smart_link_obj:
+            smart_link_qs = self.model.objects.filter(Q(enabled=True) & Q(pk=smart_link_obj.pk))
         else:
-            groups_qs = self.model.objects.filter(enabled=True)
+            smart_link_qs = self.model.objects.filter(enabled=True)
 
-        for group in groups_qs:
+        for smart_link in smart_link_qs:
             total_query = Q()
-            for item in group.documentgroupitem_set.filter(enabled=True):
-                cls, attribute = item.foreign_document_data.lower().split(u'.')
+            for condition in smart_link.smartlinkcondition_set.filter(enabled=True):
+                cls, attribute = condition.foreign_document_data.lower().split(u'.')
                 try:
                     if cls == u'metadata':
-                        value_query = Q(**{'documentmetadata__value__%s' % item.operator: eval(item.expression, eval_dict)})
-                        if item.negated:
+                        value_query = Q(**{'documentmetadata__value__%s' % condition.operator: eval(condition.expression, eval_dict)})
+                        if condition.negated:
                             query = (Q(documentmetadata__metadata_type__name=attribute) & ~value_query)
                         else:
                             query = (Q(documentmetadata__metadata_type__name=attribute) & value_query)
-                        if item.inclusion == INCLUSION_AND:
+                        if condition.inclusion == INCLUSION_AND:
                             total_query &= query
-                        elif item.inclusion == INCLUSION_OR:
+                        elif condition.inclusion == INCLUSION_OR:
                             total_query |= query
 
                     elif cls == u'document':
                         value_query = Q(**{
-                            '%s__%s' % (attribute, item.operator): eval(item.expression, eval_dict)
+                            '%s__%s' % (attribute, condition.operator): eval(condition.expression, eval_dict)
                         })
-                        if item.negated:
+                        if condition.negated:
                             query = ~value_query
                         else:
                             query = value_query
-                        if item.inclusion == INCLUSION_AND:
+                        if condition.inclusion == INCLUSION_AND:
                             total_query &= query
-                        elif item.inclusion == INCLUSION_OR:
+                        elif condition.inclusion == INCLUSION_OR:
                             total_query |= query
 
                 except Exception, e:
@@ -59,24 +59,24 @@ class DocumentGroupManager(models.Manager):
             if total_query:
                 try:
                     document_qs = Document.objects.filter(total_query)
-                    document_groups[group] = {'documents': document_qs.order_by('file_filename') or []}
+                    result[smart_link] = {'documents': document_qs.order_by('file_filename') or []}
                 except Exception, e:
-                    document_groups[group] = {'documents': []}
+                    result[smart_link] = {'documents': []}
                     errors.append(e)
             else:
-                document_groups[group] = {'documents': []}
+                result[smart_link] = {'documents': []}
 
-            if group.dynamic_title:
+            if smart_link.dynamic_title:
                 try:
-                    document_groups[group]['title'] = eval(group.dynamic_title, eval_dict)
+                    result[smart_link]['title'] = eval(smart_link.dynamic_title, eval_dict)
                 except Exception, e:
-                    document_groups[group]['title'] = 'Error; %s' % e
+                    result[smart_link]['title'] = 'Error; %s' % e
             else:
-                document_groups[group]['title'] = group.title
+                result[smart_link]['title'] = smart_link.title
 
-        if group_obj:
+        if smart_link_obj:
             # Return a single group if documents even if there were
             # many matches
-            return document_groups[group_obj], errors
+            return result[smart_link_obj], errors
 
-        return document_groups, errors
+        return result, errors
diff --git a/apps/grouping/models.py b/apps/linking/models.py
similarity index 59%
rename from apps/grouping/models.py
rename to apps/linking/models.py
index fc8bb76ed5..ccc04f5537 100644
--- a/apps/grouping/models.py
+++ b/apps/linking/models.py
@@ -1,40 +1,38 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from grouping.managers import DocumentGroupManager
-from grouping.literals import OPERATOR_CHOICES, INCLUSION_AND, \
+from linking.managers import SmartLinkManager
+from linking.literals import OPERATOR_CHOICES, INCLUSION_AND, \
     INCLUSION_CHOICES
 
 
-class DocumentGroup(models.Model):
+class SmartLink(models.Model):
     title = models.CharField(max_length=96, verbose_name=_(u'title'))
-    dynamic_title = models.CharField(blank=True, max_length=96, verbose_name=_(u'dynamic title'))
+    dynamic_title = models.CharField(blank=True, max_length=96, verbose_name=_(u'dynamic title'), help_text=_(u'This expression will be evaluated against the current selected document.  The document metadata is available as variables `metadata` and document properties under the variable `document`.'))
     enabled = models.BooleanField(default=True, verbose_name=_(u'enabled'))
 
-    objects = DocumentGroupManager()
+    objects = SmartLinkManager()
 
     def __unicode__(self):
         return self.title
 
     class Meta:
-        verbose_name = _(u'document group')
-        verbose_name_plural = _(u'document groups')
+        verbose_name = _(u'smart link')
+        verbose_name_plural = _(u'smart links')
 
 
-class DocumentGroupItem(models.Model):
-    document_group = models.ForeignKey(DocumentGroup, verbose_name=_(u'document group'))
+class SmartLinkCondition(models.Model):
+    smart_link = models.ForeignKey(SmartLink, verbose_name=_(u'smart link'))
     inclusion = models.CharField(default=INCLUSION_AND, max_length=16, choices=INCLUSION_CHOICES, help_text=_(u'The inclusion is ignored for the first item.'))
     foreign_document_data = models.CharField(max_length=32, verbose_name=_(u'foreign document data'), help_text=_(u'This represents the metadata of all other documents.  Available objects: `document.<attribute>` and `metadata.<metadata_type_name>`.'))
     operator = models.CharField(max_length=16, choices=OPERATOR_CHOICES)
-
-    #local_document_data = models.ForeignKey(MetadataType, related_name='metadata_type_local', verbose_name=_(u'local metadata'), help_text=_(u'This represents the metadata of the current document.'))
     expression = models.TextField(verbose_name=_(u'expression'), help_text=_(u'This expression will be evaluated against the current selected document.  The document metadata is available as variables `metadata` and document properties under the variable `document`.'))
     negated = models.BooleanField(default=False, verbose_name=_(u'negated'), help_text=_(u'Inverts the logic of the operator.'))
     enabled = models.BooleanField(default=True, verbose_name=_(u'enabled'))
 
     def __unicode__(self):
-        return u'[%s] %s foreign %s %s %s %s' % (u'x' if self.enabled else u' ', self.get_inclusion_display(), self.foreign_document_data, _(u'not') if self.negated else u'', self.get_operator_display(), self.expression)
+        return u'%s foreign %s %s %s %s' % (self.get_inclusion_display(), self.foreign_document_data, _(u'not') if self.negated else u'', self.get_operator_display(), self.expression)
 
     class Meta:
-        verbose_name = _(u'group item')
-        verbose_name_plural = _(u'group items')
+        verbose_name = _(u'link condition')
+        verbose_name_plural = _(u'link conditions')
diff --git a/apps/linking/static/images/icons/cog_delete.png b/apps/linking/static/images/icons/cog_delete.png
new file mode 100644
index 0000000000..924e04d69c
Binary files /dev/null and b/apps/linking/static/images/icons/cog_delete.png differ
diff --git a/apps/linking/static/images/icons/link.png b/apps/linking/static/images/icons/link.png
new file mode 100644
index 0000000000..b0c35b59a3
Binary files /dev/null and b/apps/linking/static/images/icons/link.png differ
diff --git a/apps/linking/static/images/icons/link_delete.png b/apps/linking/static/images/icons/link_delete.png
new file mode 100644
index 0000000000..b584c29f39
Binary files /dev/null and b/apps/linking/static/images/icons/link_delete.png differ
diff --git a/apps/linking/templates/smart_links_help.html b/apps/linking/templates/smart_links_help.html
new file mode 100644
index 0000000000..8a23361a9b
--- /dev/null
+++ b/apps/linking/templates/smart_links_help.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+<div class="block notice">
+<h4>{% trans "What are smart links?" %}</h4>
+<p>{% blocktrans %}Smart links are a set of conditional statements that are used to query the database using the current document the user is accessing as the data source, the results of these queries are a list of documents that relate in some manner to the document being displayed and allow users the ability to jump to and from linked documents very easily.{% endblocktrans %}</p>
+</div>
diff --git a/apps/grouping/tests.py b/apps/linking/tests.py
similarity index 100%
rename from apps/grouping/tests.py
rename to apps/linking/tests.py
diff --git a/apps/linking/urls.py b/apps/linking/urls.py
new file mode 100644
index 0000000000..080a180b2b
--- /dev/null
+++ b/apps/linking/urls.py
@@ -0,0 +1,17 @@
+from django.conf.urls.defaults import patterns, url
+
+urlpatterns = patterns('linking.views',
+    url(r'^action/$', 'smart_link_action', (), 'smart_link_action'),
+    url(r'^document/(?P<document_id>\d+)/smart_link/(?P<smart_link_pk>\d+)/$', 'smart_link_instance_view', (), 'smart_link_instance_view'),
+    url(r'^smart/for_document/(?P<document_id>\d+)/$', 'smart_link_instances_for_document', (), 'smart_link_instances_for_document'),
+    
+    url(r'^setup/list/$', 'smart_link_list', (), 'smart_link_list'),
+    url(r'^setup/create/$', 'smart_link_create', (), 'smart_link_create'),
+    url(r'^setup/(?P<smart_link_pk>\d+)/delete/$', 'smart_link_delete', (), 'smart_link_delete'),
+    url(r'^setup/(?P<smart_link_pk>\d+)/edit/$', 'smart_link_edit', (), 'smart_link_edit'),
+    
+    url(r'^setup/(?P<smart_link_pk>\d+)/condition/list/$', 'smart_link_condition_list', (), 'smart_link_condition_list'),
+    url(r'^setup/(?P<smart_link_pk>\d+)/condition/create/$', 'smart_link_condition_create', (), 'smart_link_condition_create'),
+    url(r'^setup/smart_link/condition/(?P<smart_link_condition_pk>\d+)/edit/$', 'smart_link_condition_edit', (), 'smart_link_condition_edit'),
+    url(r'^setup/smart_link/condition/(?P<smart_link_condition_pk>\d+)/delete/$', 'smart_link_condition_delete', (), 'smart_link_condition_delete'),
+)
diff --git a/apps/linking/views.py b/apps/linking/views.py
new file mode 100644
index 0000000000..2b1770cb12
--- /dev/null
+++ b/apps/linking/views.py
@@ -0,0 +1,294 @@
+from django.utils.translation import ugettext_lazy as _
+from django.contrib import messages
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404, render_to_response
+from django.core.urlresolvers import reverse
+from django.template import RequestContext
+
+from common.utils import generate_choices_w_labels, encapsulate
+from common.widgets import two_state_template
+
+from documents.models import Document
+from documents.views import document_list
+
+from permissions.api import check_permissions
+
+from linking.models import SmartLink, SmartLinkCondition
+from linking.conf.settings import SHOW_EMPTY_SMART_LINKS
+from linking.forms import (SmartLinkInstanceForm, SmartLinkForm,
+    SmartLinkConditionForm)
+from linking import smart_link_instance_view_link
+from linking import (PERMISSION_SMART_LINK_VIEW,
+    PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
+    PERMISSION_SMART_LINK_EDIT)
+
+
+def smart_link_action(request):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
+    
+    action = request.GET.get('action', None)
+
+    if not action:
+        messages.error(request, _(u'No action selected.'))
+        return HttpResponseRedirect(request.META.get('HTTP_REFERER', u'/'))
+
+    return HttpResponseRedirect(action)
+
+
+def smart_link_instance_view(request, document_id, smart_link_pk):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
+
+    document = get_object_or_404(Document, pk=document_id)
+    smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)
+    object_list, errors = SmartLink.objects.get_smart_link_instances_for(document, smart_link)
+
+    return document_list(
+        request,
+        title=_(u'documents in smart link: %(group)s') % {
+            'group': object_list['title']
+        },
+        object_list=object_list['documents'],
+        extra_context={
+            'object': document
+        }
+    )
+
+
+def smart_link_instances_for_document(request, document_id):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
+
+    subtemplates_list = []
+    document = get_object_or_404(Document, pk=document_id)
+    smart_link_instances, errors = SmartLink.objects.get_smart_link_instances_for(document)
+    if (request.user.is_staff or request.user.is_superuser) and errors:
+        for error in errors:
+            messages.warning(request, _(u'Smart link query error: %s' % error))
+
+    if not SHOW_EMPTY_SMART_LINKS:
+        #If SHOW_EMPTY_SMART_LINKS is False, remove empty groups from
+        #dictionary
+        smart_link_instances = dict([(group, data) for group, data in smart_link_instances.items() if data['documents']])
+
+    if smart_link_instances:
+        subtemplates_list = [{
+            'name': 'generic_form_subtemplate.html',
+            'context': {
+                'title': _(u'smart links (%s)') % len(smart_link_instances.keys()),
+                'form': SmartLinkInstanceForm(
+                    smart_link_instances=smart_link_instances, current_document=document,
+                    links=[smart_link_instance_view_link]
+                ),
+                'form_action': reverse('smart_link_action'),
+                'submit_method': 'GET',
+            }
+        }]
+    else:
+        # If there are not group display a placeholder messages saying so
+        subtemplates_list = [{
+            'name': 'generic_subtemplate.html',
+            'context': {
+                'content': _(u'There no defined smart links for the current document.'),
+            }
+        }]
+
+    return render_to_response('generic_detail.html', {
+        'object': document,
+        'document': document,
+        'subtemplates_list': subtemplates_list,
+    }, context_instance=RequestContext(request))
+    
+    
+def smart_link_list(request):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE])
+    
+    return render_to_response('generic_list.html', {
+        'title': _(u'smart links'),
+        'object_list': SmartLink.objects.all(),
+        'extra_columns': [
+            {'name': _(u'dynamic title'), 'attribute': 'dynamic_title'},
+            {'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
+        ],        
+        'hide_link': True,
+        'list_object_variable_name': 'smart_link',
+
+        }, context_instance=RequestContext(request))
+        
+        
+def smart_link_create(request):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE])
+
+    if request.method == 'POST':
+        form = SmartLinkForm(request.POST)
+        if form.is_valid():
+            document_group = form.save()
+            messages.success(request, _(u'Smart link: %s created successfully.') % document_group)
+            return HttpResponseRedirect(reverse('document_group_list'))
+    else:
+        form = SmartLinkForm()
+
+    return render_to_response('generic_form.html', {
+        'form': form,
+        'title': _(u'Create new smart link')
+    }, context_instance=RequestContext(request))    
+    
+    
+def smart_link_edit(request, smart_link_pk):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_EDIT])
+    
+    smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)
+
+    if request.method == 'POST':
+        form = SmartLinkForm(request.POST, instance=smart_link)
+        if form.is_valid():
+            smart_link = form.save()
+            messages.success(request, _(u'Smart link: %s edited successfully.') % smart_link)
+            return HttpResponseRedirect(reverse('document_group_list'))
+    else:
+        form = SmartLinkForm(instance=smart_link)
+
+    return render_to_response('generic_form.html', {
+        'navigation_object_name': 'smart_link',
+        'smart_link': smart_link,
+        'form': form,
+        'title': _(u'Edit smart link: %s') % smart_link
+    }, context_instance=RequestContext(request))    
+        
+    
+def smart_link_delete(request, smart_link_pk):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE])
+    
+    smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)
+
+    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
+    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
+
+    if request.method == 'POST':
+        try:
+            smart_link.delete()
+            messages.success(request, _(u'Smart link: %s deleted successfully.') % smart_link)
+        except Exception, error:
+            messages.error(request, _(u'Error deleting smart link: %(smart_link)s; %(error)s.') % {
+                'smart_link': smart_link,
+                'error': error
+            })
+        return HttpResponseRedirect(next)
+
+    return render_to_response('generic_confirm.html', {
+        'delete_view': True,
+        'navigation_object_name': 'smart_link',
+        'smart_link': smart_link,
+        'title': _(u'Are you sure you wish to delete smart link: %s?') % smart_link,
+        'next': next,
+        'previous': previous,
+        'form_icon': u'link_delete.png',
+    }, context_instance=RequestContext(request))    
+       
+
+def smart_link_condition_list(request, smart_link_pk):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
+    
+    smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)
+    
+    return render_to_response('generic_list.html', {
+        'title': _(u'conditions for smart link: %s') % smart_link,
+        'object_list': smart_link.smartlinkcondition_set.all(),
+        'extra_columns': [
+            {'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
+        ],        
+        'hide_link': True,
+        'smart_link': smart_link,
+        'navigation_object_name': 'smart_link',
+        'list_object_variable_name': 'condition',        
+        }, context_instance=RequestContext(request))
+
+
+def smart_link_condition_create(request, smart_link_pk):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
+
+    smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)
+
+    if request.method == 'POST':
+        form = SmartLinkConditionForm(request.POST)
+        if form.is_valid():
+            new_smart_link_condition = form.save(commit=False)
+            new_smart_link_condition.smart_link = smart_link
+            new_smart_link_condition.save()            
+            messages.success(request, _(u'Smart link condition: "%s" created successfully.') % new_smart_link_condition)
+            return HttpResponseRedirect(reverse('smart_link_condition_list', args=[smart_link.pk]))
+    else:
+        form = SmartLinkConditionForm(initial={'smart_link': smart_link})
+
+    return render_to_response('generic_form.html', {
+        'form': form,
+        'title': _(u'Add new conditions to smart link: "%s"') % smart_link,
+        'navigation_object_name': 'smart_link',
+        'smart_link': smart_link,        
+    }, context_instance=RequestContext(request))    
+
+
+def smart_link_condition_edit(request, smart_link_condition_pk):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
+
+    smart_link_condition = get_object_or_404(SmartLinkCondition, pk=smart_link_condition_pk)
+
+    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
+    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
+
+    if request.method == 'POST':
+        form = SmartLinkConditionForm(request.POST, instance=smart_link_condition)
+        if form.is_valid():
+            new_smart_link_condition = form.save(commit=False)
+            new_smart_link_condition.smart_link = smart_link_condition.smart_link
+            new_smart_link_condition.save()
+            messages.success(request, _(u'Smart link condition: "%s" edited successfully.') % new_smart_link_condition)
+            return HttpResponseRedirect(next)
+    else:
+        form = SmartLinkConditionForm(instance=smart_link_condition)
+
+    return render_to_response('generic_form.html', {
+        'form': form,
+        'title': _(u'Edit smart link condition'),
+        'next': next,
+        'previous': previous,
+        'condition': smart_link_condition,
+        'smart_link': smart_link_condition.smart_link,
+        'navigation_object_list': [
+            {'object': 'smart_link', 'name': _(u'smart link')},
+            {'object': 'condition', 'name': _(u'condition')}
+        ],
+        
+    }, context_instance=RequestContext(request))    
+
+
+def smart_link_condition_delete(request, smart_link_condition_pk):
+    check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
+
+    smart_link_condition = get_object_or_404(SmartLinkCondition, pk=smart_link_condition_pk)
+
+    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
+    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
+
+    if request.method == 'POST':
+        try:
+            smart_link_condition.delete()
+            messages.success(request, _(u'Smart link condition: "%s" deleted successfully.') % smart_link_condition)
+        except Exception, error:
+            messages.error(request, _(u'Error deleting smart link condition: %(smart_link_condition)s; %(error)s.') % {
+                'smart_link_condition': smart_link_condition,
+                'error': error
+            })
+        return HttpResponseRedirect(next)
+
+    return render_to_response('generic_confirm.html', {
+        'delete_view': True,
+        'condition': smart_link_condition,
+        'smart_link': smart_link_condition.smart_link,
+        'navigation_object_list': [
+            {'object': 'smart_link', 'name': _(u'smart link')},
+            {'object': 'condition', 'name': _(u'condition')}
+        ],
+        'title': _(u'Are you sure you wish to delete smart link condition: "%s"?') % smart_link_condition,
+        'next': next,
+        'previous': previous,
+        'form_icon': u'cog_delete.png',
+    }, context_instance=RequestContext(request))    
diff --git a/apps/lock_manager/__init__.py b/apps/lock_manager/__init__.py
index e69de29bb2..34913f856f 100644
--- a/apps/lock_manager/__init__.py
+++ b/apps/lock_manager/__init__.py
@@ -0,0 +1,4 @@
+from lock_manager.exceptions import LockError
+from lock_manager.models import Lock as LockModel
+
+Lock = LockModel.objects
diff --git a/apps/lock_manager/admin.py b/apps/lock_manager/admin.py
new file mode 100644
index 0000000000..12dbee8fe1
--- /dev/null
+++ b/apps/lock_manager/admin.py
@@ -0,0 +1,10 @@
+from django.contrib import admin
+
+from lock_manager.models import Lock
+
+
+class LockAdmin(admin.ModelAdmin):
+    model = Lock
+
+
+admin.site.register(Lock, LockAdmin)
diff --git a/apps/lock_manager/backend_memcached.py b/apps/lock_manager/backend_memcached.py
new file mode 100644
index 0000000000..8458fbb395
--- /dev/null
+++ b/apps/lock_manager/backend_memcached.py
@@ -0,0 +1,16 @@
+from django.core.cache import get_cache
+
+if CACHE_URI:
+    try:
+        cache_backend = get_cache(CACHE_URI)
+    except ImportError:
+        # TODO: display or log error
+        cache_backend = None
+else:
+    cache_backend = None
+if cache_backend:
+    acquire_lock = lambda lock_id: cache_backend.add(lock_id, u'true', LOCK_EXPIRE)
+    release_lock = lambda lock_id: cache_backend.delete(lock_id)
+else:
+    acquire_lock = lambda lock_id: True
+    release_lock = lambda lock_id: True
diff --git a/apps/lock_manager/conf/settings.py b/apps/lock_manager/conf/settings.py
index 05f4ae374c..869e121f4d 100644
--- a/apps/lock_manager/conf/settings.py
+++ b/apps/lock_manager/conf/settings.py
@@ -1,5 +1,5 @@
 from django.conf import settings
 
-DEFAULT_LOCK_TIMEOUT_VALUE = 10
+DEFAULT_LOCK_TIMEOUT_VALUE = 30
 
 DEFAULT_LOCK_TIMEOUT = getattr(settings, 'LOCK_MANAGER_DEFAULT_LOCK_TIMEOUT', DEFAULT_LOCK_TIMEOUT_VALUE)
diff --git a/apps/lock_manager/managers.py b/apps/lock_manager/managers.py
index 96c57ca02b..6c69fada19 100644
--- a/apps/lock_manager/managers.py
+++ b/apps/lock_manager/managers.py
@@ -1,9 +1,4 @@
-try:
-    from psycopg2 import OperationalError
-except ImportError:
-    class OperationalError(Exception):
-        pass
-
+import logging
 import datetime
 
 from django.db.utils import DatabaseError
@@ -13,40 +8,34 @@ from django.db import models
 
 from lock_manager.exceptions import LockError
 
+logger = logging.getLogger(__name__)
+
 
 class LockManager(models.Manager):
-    @transaction.commit_manually
+    @transaction.commit_on_success
     def acquire_lock(self, name, timeout=None):
+        logger.debug('trying to acquire lock: %s' % name)
         lock = self.model(name=name, timeout=timeout)
         try:
             lock.save(force_insert=True)
+            logger.debug('acquired lock: %s' % name)
+            return lock
         except IntegrityError:
-            transaction.rollback()
             # There is already an existing lock
-            # Check it's expiration date and if expired, delete it and 
-            # create it again
-            lock = self.model.objects.get(name=name)
-            transaction.rollback()
+            # Check it's expiration date and if expired, reset it
+            try:
+                lock = self.model.objects.get(name=name)
+            except self.model.DoesNotExist:
+                # Table based locking
+                logger.debug('lock: %s does not exist' % name)
+                raise LockError('Unable to acquire lock')
 
             if datetime.datetime.now() > lock.creation_datetime + datetime.timedelta(seconds=lock.timeout):
-                self.release_lock(name)
+                logger.debug('reseting deleting stale lock: %s' % name)
                 lock.timeout=timeout
+                logger.debug('try to reacquire stale lock: %s' % name)
                 lock.save()
-                transaction.commit()
+                return lock
             else:
+                logger.debug('unable to acquire lock: %s' % name)
                 raise LockError('Unable to acquire lock')
-        except DatabaseError:
-            transaction.rollback()
-            # Special case for ./manage.py syncdb
-        except (OperationalError, ImproperlyConfigured):
-            transaction.rollback()
-            # Special for DjangoZoom, which executes collectstatic media
-            # doing syncdb and creating the database tables
-        else:
-            transaction.commit()
-        
-    @transaction.commit_manually
-    def release_lock(self, name):
-        lock = self.model.objects.get(name=name)
-        lock.delete()
-        transaction.commit()
diff --git a/apps/lock_manager/models.py b/apps/lock_manager/models.py
index 53c6b6e49d..535d3366a6 100644
--- a/apps/lock_manager/models.py
+++ b/apps/lock_manager/models.py
@@ -10,17 +10,28 @@ from lock_manager.conf.settings import DEFAULT_LOCK_TIMEOUT
 class Lock(models.Model):
     creation_datetime = models.DateTimeField(verbose_name=_(u'creation datetime'))
     timeout = models.IntegerField(default=DEFAULT_LOCK_TIMEOUT, verbose_name=_(u'timeout'))
-    name = models.CharField(max_length=32, verbose_name=_(u'name'), unique=True)
-    
+    name = models.CharField(max_length=48, verbose_name=_(u'name'), unique=True)
+
     objects = LockManager()
-    
+
     def __unicode__(self):
         return self.name
-        
+
     def save(self, *args, **kwargs):
         self.creation_datetime = datetime.datetime.now()
+        if not self.timeout and not kwarget.get('timeout'):
+            self.timeout = DEFAULT_LOCK_TIMEOUT
+
         super(Lock, self).save(*args, **kwargs)
-        
+
+    def release(self):
+        try:
+            lock = Lock.objects.get(name=self.name, creation_datetime=self.creation_datetime)
+            lock.delete()
+        except Lock.DoesNotExist:
+            # Out lock expired and was reassigned
+            pass
+
     class Meta:
         verbose_name = _(u'lock')
         verbose_name_plural = _(u'locks')
diff --git a/apps/lock_manager/tests.py b/apps/lock_manager/tests.py
index 501deb776c..140393d027 100644
--- a/apps/lock_manager/tests.py
+++ b/apps/lock_manager/tests.py
@@ -1,10 +1,3 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
 from django.test import TestCase
 
 
diff --git a/apps/main/__init__.py b/apps/main/__init__.py
index ac43d99f7b..0532245481 100644
--- a/apps/main/__init__.py
+++ b/apps/main/__init__.py
@@ -20,8 +20,8 @@ admin_site = {'text': _(u'admin site'), 'view': 'admin:index', 'famfam': 'keyboa
 
 __version_info__ = {
     'major': 0,
-    'minor': 9,
-    'micro': 1,
+    'minor': 10,
+    'micro': 0,
     'releaselevel': 'final',
     'serial': 0
 }
diff --git a/apps/main/api.py b/apps/main/api.py
index 2f250eb470..8e3ae1f7a6 100644
--- a/apps/main/api.py
+++ b/apps/main/api.py
@@ -14,9 +14,10 @@ def register_diagnostic(namespace, title, link):
     diagnostics[namespace] = namespace_dict
 
 
-def register_maintenance(link, title=None, namespace=None):
+def register_maintenance_links(links, title=None, namespace=None):
     namespace_dict = tools.get(namespace, {'title': None, 'links': []})
     namespace_dict['title'] = title
-    link['url'] = link.get('url', reverse_lazy(link['view']))
-    namespace_dict['links'].append(link)
+    for link in links:
+        link['url'] = link.get('url', reverse_lazy(link['view']))
+        namespace_dict['links'].append(link)
     tools[namespace] = namespace_dict
diff --git a/apps/main/locale/en/LC_MESSAGES/django.po b/apps/main/locale/en/LC_MESSAGES/django.po
index cbf37a080d..ad9034e619 100644
--- a/apps/main/locale/en/LC_MESSAGES/django.po
+++ b/apps/main/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: 2011-09-29 18:46-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -75,58 +75,58 @@ msgstr ""
 msgid "(DEBUG)"
 msgstr ""
 
-#: templates/base.html:117
+#: templates/base.html:183
 msgid "User"
 msgstr ""
 
-#: templates/base.html:119
+#: templates/base.html:185
 msgid "Anonymous"
 msgstr ""
 
-#: templates/base.html:122
+#: templates/base.html:188
 msgid "User details"
 msgstr ""
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Login"
 msgstr ""
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Logout"
 msgstr ""
 
-#: templates/base.html:219
+#: templates/base.html:285
 msgid "Secondary menu"
 msgstr ""
 
-#: templates/base.html:236
+#: templates/base.html:302
 #, python-format
 msgid "Actions for %(name)s: %(navigation_object)s"
 msgstr ""
 
-#: templates/base.html:238 templates/base.html.py:270
+#: templates/base.html:304 templates/base.html.py:336
 #, python-format
 msgid "Actions for: %(navigation_object)s"
 msgstr ""
 
-#: templates/base.html:241
+#: templates/base.html:307
 msgid "Available actions"
 msgstr ""
 
-#: templates/base.html:253 templates/base.html.py:285
+#: templates/base.html:319 templates/base.html.py:351
 msgid "Related actions"
 msgstr ""
 
-#: templates/base.html:268
+#: templates/base.html:334
 #, python-format
 msgid "Actions for %(object_name)s: %(navigation_object)s"
 msgstr ""
 
-#: templates/base.html:273
+#: templates/base.html:339
 msgid "Actions"
 msgstr ""
 
-#: templates/base.html:298
+#: templates/base.html:364
 msgid "Other available actions"
 msgstr ""
 
diff --git a/apps/main/locale/es/LC_MESSAGES/django.po b/apps/main/locale/es/LC_MESSAGES/django.po
index 4463185f53..c530cc4628 100644
--- a/apps/main/locale/es/LC_MESSAGES/django.po
+++ b/apps/main/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 00:56+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:15
@@ -60,8 +61,8 @@ msgstr "Diagnósticos"
 
 #: conf/settings.py:12
 msgid ""
-"Controls whether the search functionality is provided by a sidebar widget or"
-" by a menu entry."
+"Controls whether the search functionality is provided by a sidebar widget or "
+"by a menu entry."
 msgstr ""
 "Controla si la funcionalidad de búsqueda es proporcionada por una barra "
 "lateral o por una entrada de menú."
@@ -78,58 +79,58 @@ msgstr "Versión"
 msgid "(DEBUG)"
 msgstr "(DEBUG)"
 
-#: templates/base.html:117
+#: templates/base.html:183
 msgid "User"
 msgstr "Usuario"
 
-#: templates/base.html:119
+#: templates/base.html:185
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: templates/base.html:122
+#: templates/base.html:188
 msgid "User details"
 msgstr "Detalles de usuario"
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Logout"
 msgstr "Desconectarse"
 
-#: templates/base.html:219
+#: templates/base.html:285
 msgid "Secondary menu"
 msgstr "Menú secundario"
 
-#: templates/base.html:236
+#: templates/base.html:302
 #, python-format
 msgid "Actions for %(name)s: %(navigation_object)s"
 msgstr "Acciones para %(name)s: %(navigation_object)s "
 
-#: templates/base.html:238 templates/base.html.py:270
+#: templates/base.html:304 templates/base.html.py:336
 #, python-format
 msgid "Actions for: %(navigation_object)s"
 msgstr "Acciones para: %(navigation_object)s "
 
-#: templates/base.html:241
+#: templates/base.html:307
 msgid "Available actions"
 msgstr "Acciones disponibles"
 
-#: templates/base.html:253 templates/base.html.py:285
+#: templates/base.html:319 templates/base.html.py:351
 msgid "Related actions"
 msgstr "Acciones relacionadas"
 
-#: templates/base.html:268
+#: templates/base.html:334
 #, python-format
 msgid "Actions for %(object_name)s: %(navigation_object)s"
 msgstr "Acciones para %(object_name)s: %(navigation_object)s "
 
-#: templates/base.html:273
+#: templates/base.html:339
 msgid "Actions"
 msgstr "Acciones"
 
-#: templates/base.html:298
+#: templates/base.html:364
 msgid "Other available actions"
 msgstr "Otras acciones disponibles"
 
@@ -145,5 +146,3 @@ msgstr ""
 #: templates/project_description.html:15
 msgid "Released under the GPL V3 License"
 msgstr "Publicado bajo la licencia GPL v3"
-
-
diff --git a/apps/main/locale/pt/LC_MESSAGES/django.po b/apps/main/locale/pt/LC_MESSAGES/django.po
index f70e86b2b9..02ed418063 100644
--- a/apps/main/locale/pt/LC_MESSAGES/django.po
+++ b/apps/main/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 21:55+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:15
@@ -60,8 +61,8 @@ msgstr "Diagnósticos"
 
 #: conf/settings.py:12
 msgid ""
-"Controls whether the search functionality is provided by a sidebar widget or"
-" by a menu entry."
+"Controls whether the search functionality is provided by a sidebar widget or "
+"by a menu entry."
 msgstr ""
 "Controla-se a funcionalidade de pesquisa é fornecido por um widget da barra "
 "lateral ou por uma entrada de menu."
@@ -78,58 +79,58 @@ msgstr "Versão"
 msgid "(DEBUG)"
 msgstr "(DEBUG)"
 
-#: templates/base.html:117
+#: templates/base.html:183
 msgid "User"
 msgstr "Usuário"
 
-#: templates/base.html:119
+#: templates/base.html:185
 msgid "Anonymous"
 msgstr "Anônimo"
 
-#: templates/base.html:122
+#: templates/base.html:188
 msgid "User details"
 msgstr "Detalhes do usuário"
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Login"
 msgstr "Login"
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Logout"
 msgstr "Sair"
 
-#: templates/base.html:219
+#: templates/base.html:285
 msgid "Secondary menu"
 msgstr "Menu secundário"
 
-#: templates/base.html:236
+#: templates/base.html:302
 #, python-format
 msgid "Actions for %(name)s: %(navigation_object)s"
 msgstr "Ações para %(name)s: %(navigation_object)s "
 
-#: templates/base.html:238 templates/base.html.py:270
+#: templates/base.html:304 templates/base.html.py:336
 #, python-format
 msgid "Actions for: %(navigation_object)s"
 msgstr "Ações para: %(navigation_object)s "
 
-#: templates/base.html:241
+#: templates/base.html:307
 msgid "Available actions"
 msgstr "Ações disponíveis"
 
-#: templates/base.html:253 templates/base.html.py:285
+#: templates/base.html:319 templates/base.html.py:351
 msgid "Related actions"
 msgstr "Ações relacionadas"
 
-#: templates/base.html:268
+#: templates/base.html:334
 #, python-format
 msgid "Actions for %(object_name)s: %(navigation_object)s"
 msgstr "Ações para %(object_name)s : %(navigation_object)s "
 
-#: templates/base.html:273
+#: templates/base.html:339
 msgid "Actions"
 msgstr "Ações"
 
-#: templates/base.html:298
+#: templates/base.html:364
 msgid "Other available actions"
 msgstr "Outras ações disponíveis"
 
@@ -145,5 +146,3 @@ msgstr ""
 #: templates/project_description.html:15
 msgid "Released under the GPL V3 License"
 msgstr "Liberado sob a licença GPL V3"
-
-
diff --git a/apps/main/locale/ru/LC_MESSAGES/django.mo b/apps/main/locale/ru/LC_MESSAGES/django.mo
index 84589cf8e2..ea406179a2 100644
Binary files a/apps/main/locale/ru/LC_MESSAGES/django.mo and b/apps/main/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/main/locale/ru/LC_MESSAGES/django.po b/apps/main/locale/ru/LC_MESSAGES/django.po
index cf5fa7682b..068fcbe6a4 100644
--- a/apps/main/locale/ru/LC_MESSAGES/django.po
+++ b/apps/main/locale/ru/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
-"PO-Revision-Date: 2011-11-04 15:53+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-19 21:04+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:15
 msgid "maintenance"
@@ -36,7 +38,7 @@ msgstr "sentry"
 
 #: __init__.py:19
 msgid "admin site"
-msgstr "admin site"
+msgstr "админка"
 
 #: __init__.py:30
 msgid "home"
@@ -60,8 +62,8 @@ msgstr "Диагностика"
 
 #: conf/settings.py:12
 msgid ""
-"Controls whether the search functionality is provided by a sidebar widget or"
-" by a menu entry."
+"Controls whether the search functionality is provided by a sidebar widget or "
+"by a menu entry."
 msgstr ""
 "Определяет, будет ли функция поиска  обеспечивается виджетом боковой панели "
 "или пунктом меню."
@@ -78,58 +80,58 @@ msgstr "Версия"
 msgid "(DEBUG)"
 msgstr "(DEBUG)"
 
-#: templates/base.html:117
+#: templates/base.html:183
 msgid "User"
 msgstr "Пользователь"
 
-#: templates/base.html:119
+#: templates/base.html:185
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: templates/base.html:122
+#: templates/base.html:188
 msgid "User details"
 msgstr "сведения о пользователе"
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Login"
 msgstr "Войти"
 
-#: templates/base.html:139
+#: templates/base.html:205
 msgid "Logout"
 msgstr "Выход"
 
-#: templates/base.html:219
+#: templates/base.html:285
 msgid "Secondary menu"
 msgstr "Вторичное меню"
 
-#: templates/base.html:236
+#: templates/base.html:302
 #, python-format
 msgid "Actions for %(name)s: %(navigation_object)s"
 msgstr "Действия для %(name)s: %(navigation_object)s"
 
-#: templates/base.html:238 templates/base.html.py:270
+#: templates/base.html:304 templates/base.html.py:336
 #, python-format
 msgid "Actions for: %(navigation_object)s"
 msgstr "Действия для: %(navigation_object)s"
 
-#: templates/base.html:241
+#: templates/base.html:307
 msgid "Available actions"
 msgstr "Доступные действия"
 
-#: templates/base.html:253 templates/base.html.py:285
+#: templates/base.html:319 templates/base.html.py:351
 msgid "Related actions"
 msgstr "Связанные действия"
 
-#: templates/base.html:268
+#: templates/base.html:334
 #, python-format
 msgid "Actions for %(object_name)s: %(navigation_object)s"
 msgstr "Действия для %(object_name)s: %(navigation_object)s"
 
-#: templates/base.html:273
+#: templates/base.html:339
 msgid "Actions"
 msgstr "Действия"
 
-#: templates/base.html:298
+#: templates/base.html:364
 msgid "Other available actions"
 msgstr "Другие возможные действия"
 
@@ -145,5 +147,3 @@ msgstr ""
 #: templates/project_description.html:15
 msgid "Released under the GPL V3 License"
 msgstr "Выпущено под лицензией GPL V3"
-
-
diff --git a/apps/main/static/packages/JqueryAsynchImageLoader-0.9.7.min.js b/apps/main/static/packages/JqueryAsynchImageLoader-0.9.7.min.js
new file mode 100644
index 0000000000..248aa4b264
--- /dev/null
+++ b/apps/main/static/packages/JqueryAsynchImageLoader-0.9.7.min.js
@@ -0,0 +1,9 @@
+/*
+*  JqueryAsynchImageLoader (JAIL) : plugin for jQuery
+*
+* Developed by
+* Sebastiano Armeli-Battana (@sebarmeli) - http://www.sebastianoarmelibattana.com
+* Dual licensed under the MIT or GPL Version 3 licenses.
+* @version 0.9.7
+*/
+;(function(a){var b=a(window);a.fn.asynchImageLoader=a.fn.jail=function(d){d=a.extend({timeout:10,effect:false,speed:400,selector:null,offset:0,event:"load+scroll",callback:jQuery.noop,callbackAfterEachImage:jQuery.noop,placeholder:false,ignoreHiddenImages:false},d);var c=this;a.jail.initialStack=this;this.data("triggerEl",(d.selector)?a(d.selector):b);if(d.placeholder!==false){c.each(function(){a(this).attr("src",d.placeholder);});}if(/^load/.test(d.event)){a.asynchImageLoader.later.call(this,d);}else{a.asynchImageLoader.onEvent.call(this,d,c);}return this;};a.asynchImageLoader=a.jail={_purgeStack:function(c){var d=0;while(true){if(d===c.length){break;}else{if(c[d].getAttribute("data-href")){d++;}else{c.splice(d,1);}}}},_loadOnEvent:function(g){var f=a(this),d=g.data.options,c=g.data.images;a.asynchImageLoader._loadImageIfVisible(d,f);f.unbind(d.event,a.asynchImageLoader._loadOnEvent);a.asynchImageLoader._purgeStack(c);if(!!d.callback){a.asynchImageLoader._purgeStack(a.jail.initialStack);a.asynchImageLoader._launchCallback(a.jail.initialStack,d);}},_bufferedEventListener:function(g){var c=g.data.images,d=g.data.options,f=c.data("triggerEl");clearTimeout(c.data("poller"));c.data("poller",setTimeout(function(){c.each(function e(){a.asynchImageLoader._loadImageIfVisible(d,this,f);});a.asynchImageLoader._purgeStack(c);if(!!d.callback){a.asynchImageLoader._purgeStack(a.jail.initialStack);a.asynchImageLoader._launchCallback(a.jail.initialStack,d);}},d.timeout));},onEvent:function(d,c){c=c||this;if(d.event==="scroll"||d.selector){var e=c.data("triggerEl");if(c.length>0){e.bind(d.event,{images:c,options:d},a.asynchImageLoader._bufferedEventListener);if(d.event==="scroll"||!d.selector){b.resize({images:c,options:d},a.asynchImageLoader._bufferedEventListener);}return;}else{if(!!e){e.unbind(d.event,a.asynchImageLoader._bufferedEventListener);}}}else{c.bind(d.event,{options:d,images:c},a.asynchImageLoader._loadOnEvent);}},later:function(d){var c=this;if(d.event==="load"){c.each(function(){a.asynchImageLoader._loadImageIfVisible(d,this,c.data("triggerEl"));});}a.asynchImageLoader._purgeStack(c);a.asynchImageLoader._launchCallback(c,d);setTimeout(function(){if(d.event==="load"){c.each(function(){a.asynchImageLoader._loadImage(d,a(this));});}else{c.each(function(){a.asynchImageLoader._loadImageIfVisible(d,this,c.data("triggerEl"));});}a.asynchImageLoader._purgeStack(c);a.asynchImageLoader._launchCallback(c,d);if(d.event==="load+scroll"){d.event="scroll";a.asynchImageLoader.onEvent(d,c);}},d.timeout);},_launchCallback:function(c,d){if(c.length===0&&!a.jail.isCallback){d.callback.call(this,d);a.jail.isCallback=true;}},_loadImageIfVisible:function(e,h,g){var f=a(h),d=(/scroll/i.test(e.event))?g:b,c=true;if(e.ignoreHiddenImages){c=a.jail._isVisibleInOverflownContainer(f,e)&&f.is(":visible");}if(c&&a.asynchImageLoader._isInTheScreen(d,f,e.offset)){a.asynchImageLoader._loadImage(e,f);}},_isInTheScreen:function(j,c,h){var f=j[0]===window,n=(f?{top:0,left:0}:j.offset()),g=n.top+(f?j.scrollTop():0),i=n.left+(f?j.scrollLeft():0),e=i+j.width(),k=g+j.height(),m=c.offset(),l=c.width(),d=c.height();return(g-h)<=(m.top+d)&&(k+h)>=m.top&&(i-h)<=(m.left+l)&&(e+h)>=m.left;},_loadImage:function(c,d){d.hide();d.attr("src",d.attr("data-href"));d.removeAttr("data-href");if(c.effect){if(c.speed){d[c.effect](c.speed);}else{d[c.effect]();}}else{d.show();}c.callbackAfterEachImage.call(this,d,c);},_isVisibleInOverflownContainer:function(e,d){var f=e.parent(),c=true;while(f.get(0).tagName!=="BODY"){if(f.css("overflow")==="hidden"){if(!a.jail._isInTheScreen(f,e,d.offset)){c=false;break;}}if(f.css("visibility")==="hidden"||e.css("visibility")==="hidden"){c=false;break;}f=f.parent();}return c;}};}(jQuery));
\ No newline at end of file
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 1a656df0d7..c1fcedd0cb 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -102,13 +102,17 @@
             -webkit-box-shadow: -1px -1px 2px #004977;
             box-shadow: -1px -1px 2px #004977;
         }		
+        
+        .thin_border {
+            border: 1px solid black;
+        }
     </style> 
     {% block stylesheets %}{% endblock %}
 {% endblock %}
 
 {% block web_theme_javascript %}
     <script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.scrollview.js"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}packages/JqueryAsynchImageLoader-0.8.min.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}packages/JqueryAsynchImageLoader-0.9.7.min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.fancybox-1.3.4/fancybox/jquery.easing-1.3.pack.js"></script>
 
@@ -135,6 +139,7 @@
             'type'          : 'image',
             'autoScale'     : true
             });
+            
             $("a.fancybox-noscaling").fancybox({
             'titleShow'     : false,
             'transitionIn'  : 'elastic',
@@ -144,6 +149,7 @@
             'type'          : 'image',
             'autoScale'     : false
             });
+            
             $("a.fancybox-iframe").fancybox({
                 'titleShow'     : false,
                 'transitionIn'  : 'elastic',
@@ -166,7 +172,7 @@
             $('img.lazy-load').jail({
                 event: 'load',
                 timeout: 10,
-                placeholder: '{{ STATIC_URL }}/images/ajax-loader.gif'
+                placeholder: '{{ STATIC_URL }}images/ajax-loader.gif'
             });
         });
     </script>
diff --git a/apps/main/views.py b/apps/main/views.py
index 6a8bd805d3..f4ff678e46 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -24,14 +24,14 @@ def home(request):
 def maintenance_menu(request):
     user_tools = {}
     for namespace, values in tools.items():
+        user_tools[namespace] = {
+            'title': values['title']
+            }
+        user_tools[namespace].setdefault('links', [])
         for link in values['links']:
             try:
                 permissions = link.get('permissions', [])
                 check_permissions(request.user, permissions)
-                user_tools[namespace] = {
-                    'title': values['title']
-                    }
-                user_tools[namespace].setdefault('links', [])
                 user_tools[namespace]['links'].append(link)
             except PermissionDenied:
                 pass
diff --git a/apps/metadata/locale/en/LC_MESSAGES/django.po b/apps/metadata/locale/en/LC_MESSAGES/django.po
index 2322266259..6f75f44ea8 100644
--- a/apps/metadata/locale/en/LC_MESSAGES/django.po
+++ b/apps/metadata/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: 2011-09-29 18:46-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/metadata/locale/es/LC_MESSAGES/django.po b/apps/metadata/locale/es/LC_MESSAGES/django.po
index b0d5a08f59..03f08e5442 100644
--- a/apps/metadata/locale/es/LC_MESSAGES/django.po
+++ b/apps/metadata/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 05:09+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:12
@@ -191,8 +192,8 @@ msgid ""
 "Enter a string to be evaluated.  Example: [user.get_full_name() for user in "
 "User.objects.all()].%s"
 msgstr ""
-"Introduzca una cadena para ser evaluada.  Ejemplo: [user.get_full_name() for"
-" user in User.objects.all ()].%s"
+"Introduzca una cadena para ser evaluada.  Ejemplo: [user.get_full_name() for "
+"user in User.objects.all ()].%s"
 
 #: models.py:32 models.py:57 views.py:331 views.py:376
 msgid "metadata type"
@@ -287,8 +288,7 @@ msgstr "Editar metadatos para documentos: %s"
 #: views.py:148
 #, python-format
 msgid ""
-"Metadata type: %(metadata_type)s successfully added to document "
-"%(document)s."
+"Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 "Typo de metadatos: %(metadata_type)s agregado exitosamente al documento "
 "%(document)s."
@@ -453,15 +453,15 @@ msgstr "¿Cuáles son los tipos de metadatos?"
 
 #: templates/metadata_type_help.html:4
 msgid ""
-"A metadata type defines the characteristics of a value of some kind that can"
-" be attached to a document.  Examples of metadata types are: a client name, "
-"a date, or a project to which several documents belong.  A metadata type's "
+"A metadata type defines the characteristics of a value of some kind that can "
+"be attached to a document.  Examples of metadata types are: a client name, a "
+"date, or a project to which several documents belong.  A metadata type's "
 "name is the internal identifier with which it can be referenced to by other "
-"modules such as the indexing module, the title is the value that is shown to"
-" the users, the default value is the value an instance of this metadata type"
-" will have initially, and the lookup value turns an instance of a metadata "
-"of this type into a choice list which options are the result of the lookup's"
-" code execution."
+"modules such as the indexing module, the title is the value that is shown to "
+"the users, the default value is the value an instance of this metadata type "
+"will have initially, and the lookup value turns an instance of a metadata of "
+"this type into a choice list which options are the result of the lookup's "
+"code execution."
 msgstr ""
 "Un tipo de metadatos define las características de un valor de algún tipo "
 "que se puede conectar a un documento.  Ejemplos de tipos de metadatos son: "
@@ -471,7 +471,5 @@ msgstr ""
 "indexación, el título es el valor que se muestra a los usuarios, el valor "
 "por defecto es el valor que una instancia de este tipo de metadatos tendrá "
 "inicialmente, y el valor de búsqueda vuelve a una instancia de metadatos de "
-"este tipo en una lista de opciones donde las opciones son el resultado de la"
-" ejecución del valor de búsqueda."
-
-
+"este tipo en una lista de opciones donde las opciones son el resultado de la "
+"ejecución del valor de búsqueda."
diff --git a/apps/metadata/locale/pt/LC_MESSAGES/django.po b/apps/metadata/locale/pt/LC_MESSAGES/django.po
index 5d17befb78..4d7805cb79 100644
--- a/apps/metadata/locale/pt/LC_MESSAGES/django.po
+++ b/apps/metadata/locale/pt/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 # Renata Oliveira <renatabels@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 00:42+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:12
@@ -289,8 +290,7 @@ msgstr "Editar os metadados do documentos: %s"
 #: views.py:148
 #, python-format
 msgid ""
-"Metadata type: %(metadata_type)s successfully added to document "
-"%(document)s."
+"Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
 "Tipo de metadados: %(metadata_type)s  adicionado com sucesso para documento "
 "%(document)s."
@@ -300,8 +300,7 @@ msgstr ""
 msgid ""
 "Metadata type: %(metadata_type)s already present in document %(document)s."
 msgstr ""
-"Tipo de metadados: %(metadata_type)s  já presente no documento %(document)s "
-"."
+"Tipo de metadados: %(metadata_type)s  já presente no documento %(document)s ."
 
 #: views.py:175
 #, python-format
@@ -454,24 +453,22 @@ msgstr "Quais são os tipos de metadados?"
 
 #: templates/metadata_type_help.html:4
 msgid ""
-"A metadata type defines the characteristics of a value of some kind that can"
-" be attached to a document.  Examples of metadata types are: a client name, "
-"a date, or a project to which several documents belong.  A metadata type's "
+"A metadata type defines the characteristics of a value of some kind that can "
+"be attached to a document.  Examples of metadata types are: a client name, a "
+"date, or a project to which several documents belong.  A metadata type's "
 "name is the internal identifier with which it can be referenced to by other "
-"modules such as the indexing module, the title is the value that is shown to"
-" the users, the default value is the value an instance of this metadata type"
-" will have initially, and the lookup value turns an instance of a metadata "
-"of this type into a choice list which options are the result of the lookup's"
-" code execution."
+"modules such as the indexing module, the title is the value that is shown to "
+"the users, the default value is the value an instance of this metadata type "
+"will have initially, and the lookup value turns an instance of a metadata of "
+"this type into a choice list which options are the result of the lookup's "
+"code execution."
 msgstr ""
-"Um tipo de metadados define as características de um valor de algum tipo que"
-" pode ser anexado a um documento. Exemplos de tipos de metadados são: um "
-"nome de cliente, uma data ou um projeto ao qual pertencem vários documentos."
-" O nome de um tipo de metadados é o identificador interno com o qual ele "
-"pode ser referenciado pelos outros módulos, como o módulo de indexação, o "
-"título é o valor que é mostrado para os usuários, o valor padrão é o valor "
-"de uma instância desse tipo de metadados terá inicialmente, o valor de "
-"pesquisa e vira um exemplo de um metadados deste tipo em uma lista de "
-"escolha de quais opções são o resultado da execução a pesquisa de código."
-
-
+"Um tipo de metadados define as características de um valor de algum tipo que "
+"pode ser anexado a um documento. Exemplos de tipos de metadados são: um nome "
+"de cliente, uma data ou um projeto ao qual pertencem vários documentos. O "
+"nome de um tipo de metadados é o identificador interno com o qual ele pode "
+"ser referenciado pelos outros módulos, como o módulo de indexação, o título "
+"é o valor que é mostrado para os usuários, o valor padrão é o valor de uma "
+"instância desse tipo de metadados terá inicialmente, o valor de pesquisa e "
+"vira um exemplo de um metadados deste tipo em uma lista de escolha de quais "
+"opções são o resultado da execução a pesquisa de código."
diff --git a/apps/metadata/locale/ru/LC_MESSAGES/django.po b/apps/metadata/locale/ru/LC_MESSAGES/django.po
index d814f239dc..bb28056cda 100644
--- a/apps/metadata/locale/ru/LC_MESSAGES/django.po
+++ b/apps/metadata/locale/ru/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 10:20+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:12
 msgid "Edit a document's metadata"
@@ -289,11 +291,9 @@ msgstr "Редактирование метаданных для докумен
 #: views.py:148
 #, python-format
 msgid ""
-"Metadata type: %(metadata_type)s successfully added to document "
-"%(document)s."
+"Metadata type: %(metadata_type)s successfully added to document %(document)s."
 msgstr ""
-"Тип метаданных: %(metadata_type)s успешно добавлены к документу "
-"%(document)s."
+"Тип метаданных: %(metadata_type)s успешно добавлены к документу %(document)s."
 
 #: views.py:151
 #, python-format
@@ -442,8 +442,8 @@ msgid ""
 "attaches it's member metadata types to said document."
 msgstr ""
 "Набор метаданных это группа из одного или более типов метаданных. Наборы "
-"метаданных полезны при создании новых документов; указание набора метаданных"
-"  автоматически добавляет метаданные набора к документу."
+"метаданных полезны при создании новых документов; указание набора "
+"метаданных  автоматически добавляет метаданные набора к документу."
 
 #: templates/metadata_type_help.html:3
 msgid "What are metadata types?"
@@ -451,22 +451,25 @@ msgstr "Что такое типы метаданных?"
 
 #: templates/metadata_type_help.html:4
 msgid ""
-"A metadata type defines the characteristics of a value of some kind that can"
-" be attached to a document.  Examples of metadata types are: a client name, "
-"a date, or a project to which several documents belong.  A metadata type's "
+"A metadata type defines the characteristics of a value of some kind that can "
+"be attached to a document.  Examples of metadata types are: a client name, a "
+"date, or a project to which several documents belong.  A metadata type's "
 "name is the internal identifier with which it can be referenced to by other "
-"modules such as the indexing module, the title is the value that is shown to"
-" the users, the default value is the value an instance of this metadata type"
-" will have initially, and the lookup value turns an instance of a metadata "
-"of this type into a choice list which options are the result of the lookup's"
-" code execution."
+"modules such as the indexing module, the title is the value that is shown to "
+"the users, the default value is the value an instance of this metadata type "
+"will have initially, and the lookup value turns an instance of a metadata of "
+"this type into a choice list which options are the result of the lookup's "
+"code execution."
 msgstr ""
-"Тип метаданных определяет характеристики информации которая может быть присоединена к документу. Примеры типов метаданных : имя клиента, дата или проект, к которому принадлежат несколько документов. Имя типа метаданных является внутренним идентификатором, на который могут ссылаться другие модули, такие как модуль индексирования\n"
+"Тип метаданных определяет характеристики информации которая может быть "
+"присоединена к документу. Примеры типов метаданных : имя клиента, дата или "
+"проект, к которому принадлежат несколько документов. Имя типа метаданных "
+"является внутренним идентификатором, на который могут ссылаться другие "
+"модули, такие как модуль индексирования\n"
 "\n"
 "Имя это значение, которое показано пользователям\n"
 "\n"
-"Значение по умолчанию - значение экземпляра этого типа метаданных будет на начальном этапе,\n"
+"Значение по умолчанию - значение экземпляра этого типа метаданных будет на "
+"начальном этапе,\n"
 "\n"
 "Краткое имя служит для выбора из списка значений в результатах поиска."
-
-
diff --git a/apps/metadata/views.py b/apps/metadata/views.py
index f112cda428..9d34c0cd4f 100644
--- a/apps/metadata/views.py
+++ b/apps/metadata/views.py
@@ -117,7 +117,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
 
 
 def metadata_multiple_edit(request):
-    return metadata_edit(request, document_id_list=request.GET.get('id_list', []))
+    return metadata_edit(request, document_id_list=request.GET.get('id_list', ''))
 
 
 def metadata_add(request, document_id=None, document_id_list=None):
diff --git a/apps/mimetype/api.py b/apps/mimetype/api.py
index 3390e5995f..5790bce8a2 100644
--- a/apps/mimetype/api.py
+++ b/apps/mimetype/api.py
@@ -83,8 +83,11 @@ def get_error_icon_file_path():
     else:
         return os.path.join(settings.STATIC_ROOT, MIMETYPE_ICONS_DIRECTORY_NAME, ERROR_FILE_NAME)
 
+def get_error_icon_url():
+    return os.path.join(MIMETYPE_ICONS_DIRECTORY_NAME, ERROR_FILE_NAME)
+
    
-def get_mimetype(file_description, filepath):
+def get_mimetype(file_description, filepath, mimetype_only=False):
     """
     Determine a file's mimetype by calling the system's libmagic
     library via python-magic or fallback to use python's mimetypes
@@ -95,9 +98,10 @@ def get_mimetype(file_description, filepath):
     if USE_PYTHON_MAGIC:
         mime = magic.Magic(mime=True)
         file_mimetype = mime.from_buffer(file_description.read())
-        file_description.seek(0)
-        mime_encoding = magic.Magic(mime_encoding=True)
-        file_mime_encoding = mime_encoding.from_buffer(file_description.read())
+        if not mimetype_only:
+            file_description.seek(0)
+            mime_encoding = magic.Magic(mime_encoding=True)
+            file_mime_encoding = mime_encoding.from_buffer(file_description.read())
     else:
         path, filename = os.path.split(filepath)
         file_mimetype, file_mime_encoding = mimetypes.guess_type(filename)
diff --git a/apps/navigation/locale/en/LC_MESSAGES/django.po b/apps/navigation/locale/en/LC_MESSAGES/django.po
index a78e1f4d21..073df2fae0 100644
--- a/apps/navigation/locale/en/LC_MESSAGES/django.po
+++ b/apps/navigation/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: 2011-09-29 18:46-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/navigation/locale/es/LC_MESSAGES/django.po b/apps/navigation/locale/es/LC_MESSAGES/django.po
index 4586fe7562..4fa778b876 100644
--- a/apps/navigation/locale/es/LC_MESSAGES/django.po
+++ b/apps/navigation/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 16:58+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: forms.py:14
@@ -29,5 +30,3 @@ msgstr "emblema"
 #: templatetags/navigation_tags.py:275
 msgid "Selected item actions:"
 msgstr "Acciones para el artículo seleccionado:"
-
-
diff --git a/apps/navigation/locale/pt/LC_MESSAGES/django.po b/apps/navigation/locale/pt/LC_MESSAGES/django.po
index 969427872c..7f003b944a 100644
--- a/apps/navigation/locale/pt/LC_MESSAGES/django.po
+++ b/apps/navigation/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 01:24+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: forms.py:14
@@ -29,5 +30,3 @@ msgstr "ícone"
 #: templatetags/navigation_tags.py:275
 msgid "Selected item actions:"
 msgstr "Ações de item selecionadas:"
-
-
diff --git a/apps/navigation/locale/ru/LC_MESSAGES/django.mo b/apps/navigation/locale/ru/LC_MESSAGES/django.mo
index 918115e5f5..61a3328f93 100644
Binary files a/apps/navigation/locale/ru/LC_MESSAGES/django.mo and b/apps/navigation/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/navigation/locale/ru/LC_MESSAGES/django.po b/apps/navigation/locale/ru/LC_MESSAGES/django.po
index 7397fc9bcf..ac633acf3c 100644
--- a/apps/navigation/locale/ru/LC_MESSAGES/django.po
+++ b/apps/navigation/locale/ru/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:46-0400\n"
-"PO-Revision-Date: 2011-11-03 17:21+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-19 21:05+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: forms.py:14
 msgid "Multi item action"
@@ -24,10 +26,8 @@ msgstr "Массовое действие"
 
 #: widgets.py:28
 msgid "icon"
-msgstr "значек"
+msgstr "значок"
 
 #: templatetags/navigation_tags.py:275
 msgid "Selected item actions:"
 msgstr "Действия с выбранными пунктами: "
-
-
diff --git a/apps/ocr/__init__.py b/apps/ocr/__init__.py
index 5430224cdd..cb60eadc57 100644
--- a/apps/ocr/__init__.py
+++ b/apps/ocr/__init__.py
@@ -4,26 +4,31 @@ except ImportError:
     class OperationalError(Exception):
         pass
         
+import logging
+        
 from django.core.exceptions import ImproperlyConfigured
 from django.db import transaction
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from django.db.utils import DatabaseError
 from django.db.models.signals import post_save
+from django.dispatch import receiver
 
 from navigation.api import register_links, register_top_menu, register_multi_item_links
 from permissions.api import register_permission, set_namespace_title
 from documents.models import Document
-from main.api import register_maintenance
+from main.api import register_maintenance_links
 from project_tools.api import register_tool
 
 from scheduler.api import register_interval_job
 
 from ocr.conf.settings import AUTOMATIC_OCR
 from ocr.conf.settings import QUEUE_PROCESSING_INTERVAL
-from ocr.models import DocumentQueue, QueueTransformation
+from ocr.models import DocumentQueue, QueueTransformation, QueueDocument
 from ocr.tasks import task_process_document_queues
 
+logger = logging.getLogger(__name__)
+
 #Permissions
 PERMISSION_OCR_DOCUMENT = {'namespace': 'ocr', 'name': 'ocr_document', 'label': _(u'Submit document for OCR')}
 PERMISSION_OCR_DOCUMENT_DELETE = {'namespace': 'ocr', 'name': 'ocr_document_delete', 'label': _(u'Delete document for OCR queue')}
@@ -42,6 +47,7 @@ register_permission(PERMISSION_OCR_QUEUE_EDIT)
 
 #Links
 submit_document = {'text': _('submit to OCR queue'), 'view': 'submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]}
+submit_document_multiple = {'text': _('submit to OCR queue'), 'view': 'submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]}
 re_queue_document = {'text': _('re-queue'), 'view': 're_queue_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]}
 re_queue_multiple_document = {'text': _('re-queue'), 'view': 're_queue_multiple_document', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]}
 queue_document_delete = {'text': _(u'delete'), 'view': 'queue_document_delete', 'args': 'object.id', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]}
@@ -63,6 +69,8 @@ setup_queue_transformation_edit = {'text': _(u'edit'), 'view': 'setup_queue_tran
 setup_queue_transformation_delete = {'text': _(u'delete'), 'view': 'setup_queue_transformation_delete', 'args': 'transformation.pk', 'famfam': 'shape_square_delete'}
 
 register_links(Document, [submit_document])
+register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_list', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent'], [submit_document_multiple])
+
 register_links(DocumentQueue, [document_queue_disable, document_queue_enable, setup_queue_transformation_list])
 register_links(QueueTransformation, [setup_queue_transformation_edit, setup_queue_transformation_delete])
 
@@ -71,7 +79,7 @@ register_multi_item_links(['queue_document_list'], [re_queue_multiple_document,
 register_links(['setup_queue_transformation_create', 'setup_queue_transformation_edit', 'setup_queue_transformation_delete', 'document_queue_disable', 'document_queue_enable', 'queue_document_list', 'node_active_list', 'setup_queue_transformation_list'], [queue_document_list, node_active_list], menu_name='secondary_menu')
 register_links(['setup_queue_transformation_edit', 'setup_queue_transformation_delete', 'setup_queue_transformation_list', 'setup_queue_transformation_create'], [setup_queue_transformation_create], menu_name='sidebar')
 
-register_maintenance(all_document_ocr_cleanup, namespace='ocr', title=_(u'OCR'))
+register_maintenance_links([all_document_ocr_cleanup], namespace='ocr', title=_(u'OCR'))
 
 
 @transaction.commit_manually
@@ -99,6 +107,13 @@ def document_post_save(sender, instance, **kwargs):
 
 post_save.connect(document_post_save, sender=Document)
 
+
+@receiver(post_save, dispatch_uid='call_queue', sender=QueueDocument)
+def call_queue(sender, **kwargs):
+    logger.debug('got call_queue signal')
+    task_process_document_queues()
+
+
 create_default_queue()
 
 register_interval_job('task_process_document_queues', _(u'Checks the OCR queue for pending documents.'), task_process_document_queues, seconds=QUEUE_PROCESSING_INTERVAL)
diff --git a/apps/ocr/api.py b/apps/ocr/api.py
index d9d7782b1d..4d70443f92 100644
--- a/apps/ocr/api.py
+++ b/apps/ocr/api.py
@@ -57,9 +57,8 @@ def run_tesseract(input_filename, lang=None):
     ocr_output = os.extsep.join([filepath, u'txt'])
     command = [unicode(TESSERACT_PATH), unicode(input_filename), unicode(filepath)]
 
-    # TODO: Tesseract 3.0 segfaults
-    #if lang is not None:
-    #    command.extend([u'-l', lang])
+    if lang is not None:
+        command.extend([u'-l', lang])
 
     proc = subprocess.Popen(command, close_fds=True, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
     return_code = proc.wait()
@@ -67,7 +66,12 @@ def run_tesseract(input_filename, lang=None):
         error_text = proc.stderr.read()
         cleanup(filepath)
         cleanup(ocr_output)
-        raise TesseractError(error_text)
+        if lang:
+            # If tesseract gives an error with a language parameter
+            # re-run it with no parameter again
+            return run_tesseract(input_filename, lang=None)
+        else:
+            raise TesseractError(error_text)
 
     fd = codecs.open(ocr_output, 'r', 'utf-8')
     text = fd.read().strip()
diff --git a/apps/ocr/locale/en/LC_MESSAGES/django.po b/apps/ocr/locale/en/LC_MESSAGES/django.po
index c24615c055..8aa482cb75 100644
--- a/apps/ocr/locale/en/LC_MESSAGES/django.po
+++ b/apps/ocr/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: 2011-09-29 18:47-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/ocr/locale/es/LC_MESSAGES/django.po b/apps/ocr/locale/es/LC_MESSAGES/django.po
index bfc258d045..6905387d1e 100644
--- a/apps/ocr/locale/es/LC_MESSAGES/django.po
+++ b/apps/ocr/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-07 04:17+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:28
@@ -291,8 +292,7 @@ msgstr "Documento: %(document)s ya está en cola."
 #, python-format
 msgid "Document: %s is already being processed and can't be re-queded."
 msgstr ""
-"El documento: %s ya está en proceso y no se puede volver a agregar a la "
-"cola."
+"El documento: %s ya está en proceso y no se puede volver a agregar a la cola."
 
 #: views.py:173
 #, python-format
@@ -414,8 +414,8 @@ msgstr "Error al tratar de borrar la transformación de cola; %(error)s "
 msgid ""
 "Are you sure you wish to delete queue transformation \"%(transformation)s\""
 msgstr ""
-"¿Está seguro que desea borrar la transformación de cola "
-"\"%(transformation)s\""
+"¿Está seguro que desea borrar la transformación de cola \"%(transformation)s"
+"\""
 
 #: views.py:434
 msgid "Queue transformation created successfully"
@@ -451,9 +451,8 @@ msgstr "Agregar automáticamente la cola de OCR los documentos creados."
 
 #: conf/settings.py:17
 msgid ""
-"URI in the form: \"memcached://127.0.0.1:11211/\" to specify a cache backend"
-" to use for locking. Multiple hosts can be specified separated by a "
-"semicolon."
+"URI in the form: \"memcached://127.0.0.1:11211/\" to specify a cache backend "
+"to use for locking. Multiple hosts can be specified separated by a semicolon."
 msgstr ""
 "URI de la forma: \"memcached:/ /127.0.0.1:11211/\" para especificar un "
 "servidor de caché para usar de bloqueo.  Multiple servidores se pueden "
@@ -466,5 +465,3 @@ msgstr "La ruta de archivo del programa unpaper."
 #: parsers/__init__.py:23
 msgid "Text extracted from PDF"
 msgstr "Texto extraído de PDF"
-
-
diff --git a/apps/ocr/locale/pt/LC_MESSAGES/django.po b/apps/ocr/locale/pt/LC_MESSAGES/django.po
index ae9be2eb84..a7d598736f 100644
--- a/apps/ocr/locale/pt/LC_MESSAGES/django.po
+++ b/apps/ocr/locale/pt/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 # Renata Oliveira <renatabels@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 05:10+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:28
@@ -347,8 +348,7 @@ msgstr "Tem certeza de que deseja limpar todo o conteúdo das páginas?"
 #: views.py:266
 msgid "On large databases this operation may take some time to execute."
 msgstr ""
-"Em grandes bases de dados esta operação pode levar algum tempo para "
-"executar."
+"Em grandes bases de dados esta operação pode levar algum tempo para executar."
 
 #: views.py:272
 msgid "Document pages content clean up complete."
@@ -408,8 +408,8 @@ msgstr "Erro ao deletar transformação de lista; %(error)s "
 msgid ""
 "Are you sure you wish to delete queue transformation \"%(transformation)s\""
 msgstr ""
-"Tem certeza que deseja deletar a transformação de lista "
-"\"%(transformation)s\""
+"Tem certeza que deseja deletar a transformação de lista \"%(transformation)s"
+"\""
 
 #: views.py:434
 msgid "Queue transformation created successfully"
@@ -444,9 +444,8 @@ msgstr "Listar automaticamente os novos documentos criados para OCR "
 
 #: conf/settings.py:17
 msgid ""
-"URI in the form: \"memcached://127.0.0.1:11211/\" to specify a cache backend"
-" to use for locking. Multiple hosts can be specified separated by a "
-"semicolon."
+"URI in the form: \"memcached://127.0.0.1:11211/\" to specify a cache backend "
+"to use for locking. Multiple hosts can be specified separated by a semicolon."
 msgstr ""
 "URI na forma: \"memcached: / / 127.0.0.1:11211 /\" para especificar um "
 "backend de cache para usar para o bloqueio. Hosts múltiplos podem ser "
@@ -459,5 +458,3 @@ msgstr "Caminho do arquivo para o programa unpaper."
 #: parsers/__init__.py:23
 msgid "Text extracted from PDF"
 msgstr "Texto extraído de PDF"
-
-
diff --git a/apps/ocr/locale/ru/LC_MESSAGES/django.po b/apps/ocr/locale/ru/LC_MESSAGES/django.po
index 1b94794188..e4dd103e6d 100644
--- a/apps/ocr/locale/ru/LC_MESSAGES/django.po
+++ b/apps/ocr/locale/ru/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 10:48+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:28
 msgid "Submit document for OCR"
@@ -408,8 +410,7 @@ msgstr "Ошибка при удалении преобразования оче
 msgid ""
 "Are you sure you wish to delete queue transformation \"%(transformation)s\""
 msgstr ""
-"Вы действительно хотите удалить преобразование очереди "
-"\"%(transformation)s\""
+"Вы действительно хотите удалить преобразование очереди \"%(transformation)s\""
 
 #: views.py:434
 msgid "Queue transformation created successfully"
@@ -445,9 +446,8 @@ msgstr ""
 
 #: conf/settings.py:17
 msgid ""
-"URI in the form: \"memcached://127.0.0.1:11211/\" to specify a cache backend"
-" to use for locking. Multiple hosts can be specified separated by a "
-"semicolon."
+"URI in the form: \"memcached://127.0.0.1:11211/\" to specify a cache backend "
+"to use for locking. Multiple hosts can be specified separated by a semicolon."
 msgstr ""
 "URI в виде: \"memcached://127.0.0.1:11211/\", для определения обработчика, "
 "используемого для блокирования. Несколько хостов могут быть указаны через "
@@ -460,5 +460,3 @@ msgstr "Путь к программе unpaper."
 #: parsers/__init__.py:23
 msgid "Text extracted from PDF"
 msgstr "Текст, извлеченный из PDF"
-
-
diff --git a/apps/ocr/tasks.py b/apps/ocr/tasks.py
index dee3d64da9..06f55bd69d 100644
--- a/apps/ocr/tasks.py
+++ b/apps/ocr/tasks.py
@@ -4,9 +4,9 @@ from time import sleep
 from random import random
 
 from django.db.models import Q
-from django.core.cache import get_cache
 
 from job_processor.api import process_job
+from lock_manager import Lock, LockError
 
 from ocr.api import do_document_ocr
 from ocr.literals import QUEUEDOCUMENT_STATE_PENDING, \
@@ -21,36 +21,13 @@ from ocr.conf.settings import QUEUE_PROCESSING_INTERVAL
 LOCK_EXPIRE = 60 * 10  # Lock expires in 10 minutes
 # TODO: Tie LOCK_EXPIRATION with hard task timeout
 
-if CACHE_URI:
-    try:
-        cache_backend = get_cache(CACHE_URI)
-    except ImportError:
-        # TODO: display or log error
-        cache_backend = None
-else:
-    cache_backend = None
-
-
-def random_delay():
-    sleep(random() * (QUEUE_PROCESSING_INTERVAL - 1))
-    return True
-
-
-if cache_backend:
-    acquire_lock = lambda lock_id: cache_backend.add(lock_id, u'true', LOCK_EXPIRE)
-    release_lock = lambda lock_id: cache_backend.delete(lock_id)
-else:
-    acquire_lock = lambda lock_id: True
-    release_lock = lambda lock_id: True
-
-
 def task_process_queue_document(queue_document_id):
-    lock_id = u'%s-lock-%d' % (u'task_process_queue_document', queue_document_id)
-    if acquire_lock(lock_id):
+    lock_id = u'task_proc_queue_doc-%d' % queue_document_id
+    try:
+        lock = Lock.acquire_lock(lock_id, LOCK_EXPIRE)
         queue_document = QueueDocument.objects.get(pk=queue_document_id)
         queue_document.state = QUEUEDOCUMENT_STATE_PROCESSING
         queue_document.node_name = platform.node()
-        #queue_document.result = task_process_queue_document.request.id
         queue_document.save()
         try:
             do_document_ocr(queue_document)
@@ -59,7 +36,10 @@ def task_process_queue_document(queue_document_id):
             queue_document.state = QUEUEDOCUMENT_STATE_ERROR
             queue_document.result = e
             queue_document.save()
-        release_lock(lock_id)
+        
+        lock.release()
+    except LockError:
+        pass
 
 
 def reset_orphans():
@@ -86,11 +66,9 @@ def reset_orphans():
         orphan.node_name = None
         orphan.save()
     '''
-    
+
 
 def task_process_document_queues():
-    if not cache_backend:
-        random_delay()
     # reset_orphans()
     # Causes problems with big clusters increased latency
     # Disabled until better solution
@@ -108,8 +86,7 @@ def task_process_document_queues():
 
                 if oldest_queued_document_qs:
                     oldest_queued_document = oldest_queued_document_qs.order_by('datetime_submitted')[0]
-                    #task_process_queue_document.delay(oldest_queued_document.pk)
-                    #task_process_queue_document(oldest_queued_document.pk)
                     process_job(task_process_queue_document, oldest_queued_document.pk)
             except Exception, e:
-                print 'DocumentQueueWatcher exception: %s' % e
+                pass
+                #print 'DocumentQueueWatcher exception: %s' % e
diff --git a/apps/ocr/urls.py b/apps/ocr/urls.py
index 2db0a0db0b..dd8529119b 100644
--- a/apps/ocr/urls.py
+++ b/apps/ocr/urls.py
@@ -2,6 +2,7 @@ from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('ocr.views',
     url(r'^document/(?P<document_id>\d+)/submit/$', 'submit_document', (), 'submit_document'),
+    url(r'^document/multiple/submit/$', 'submit_document_multiple', (), 'submit_document_multiple'),
     url(r'^queue/document/list/$', 'queue_document_list', (), 'queue_document_list'),
     url(r'^queue/document/(?P<queue_document_id>\d+)/delete/$', 'queue_document_delete', (), 'queue_document_delete'),
     url(r'^queue/document/multiple/delete/$', 'queue_document_multiple_delete', (), 'queue_document_multiple_delete'),
diff --git a/apps/ocr/views.py b/apps/ocr/views.py
index 4c21381a9e..d6102f1200 100644
--- a/apps/ocr/views.py
+++ b/apps/ocr/views.py
@@ -115,9 +115,16 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis
 
 
 def queue_document_multiple_delete(request):
-    return queue_document_delete(request, queue_document_id_list=request.GET.get('id_list', []))
+    return queue_document_delete(request, queue_document_id_list=request.GET.get('id_list', ''))
 
 
+def submit_document_multiple(request):
+    for item_id in request.GET.get('id_list', '').split(','):
+        submit_document(request, item_id)
+        
+    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    
+
 def submit_document(request, document_id):
     check_permissions(request.user, [PERMISSION_OCR_DOCUMENT])
 
diff --git a/apps/permissions/locale/en/LC_MESSAGES/django.po b/apps/permissions/locale/en/LC_MESSAGES/django.po
index 49538bc2d8..a2354e2728 100644
--- a/apps/permissions/locale/en/LC_MESSAGES/django.po
+++ b/apps/permissions/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: 2011-09-29 18:47-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -41,30 +41,38 @@ msgstr ""
 msgid "Revoke permissions"
 msgstr ""
 
-#: __init__.py:20 models.py:75 views.py:33
+#: __init__.py:19 models.py:87 views.py:38
 msgid "roles"
 msgstr ""
 
-#: __init__.py:21
+#: __init__.py:20
 msgid "create new role"
 msgstr ""
 
-#: __init__.py:22
+#: __init__.py:21
 msgid "edit"
 msgstr ""
 
-#: __init__.py:23
+#: __init__.py:22
 msgid "members"
 msgstr ""
 
-#: __init__.py:24
+#: __init__.py:23
 msgid "role permissions"
 msgstr ""
 
-#: __init__.py:25
+#: __init__.py:24
 msgid "delete"
 msgstr ""
 
+#: __init__.py:26
+msgid "grant"
+msgstr ""
+
+#: __init__.py:27
+msgid "revoke"
+msgstr ""
+
 #: api.py:22
 msgid "Permissions"
 msgstr ""
@@ -73,93 +81,98 @@ msgstr ""
 msgid "Insufficient permissions."
 msgstr ""
 
-#: models.py:11 views.py:53
+#: models.py:11 views.py:58
 msgid "namespace"
 msgstr ""
 
-#: models.py:12 views.py:54
+#: models.py:12 views.py:59
 msgid "name"
 msgstr ""
 
-#: models.py:13 models.py:70
+#: models.py:13 models.py:82
 msgid "label"
 msgstr ""
 
-#: models.py:20 models.py:53
+#: models.py:20 models.py:65 views.py:145 views.py:204
 msgid "permission"
 msgstr ""
 
-#: models.py:21 views.py:50
+#: models.py:21 views.py:55 views.py:147 views.py:206
 msgid "permissions"
 msgstr ""
 
-#: models.py:61
+#: models.py:73
 msgid "permission holder"
 msgstr ""
 
-#: models.py:62
+#: models.py:74
 msgid "permission holders"
 msgstr ""
 
-#: models.py:74 models.py:92 views.py:69 views.py:79 views.py:103 views.py:203
+#: models.py:86 models.py:104 views.py:74 views.py:91 views.py:115
+#: views.py:282
 msgid "role"
 msgstr ""
 
-#: models.py:103
+#: models.py:115
 msgid "role member"
 msgstr ""
 
-#: models.py:104
+#: models.py:116
 msgid "role members"
 msgstr ""
 
-#: views.py:56
-msgid "state"
+#: views.py:61
+msgid "has permission"
 msgstr ""
 
-#: views.py:116
+#: views.py:142 views.py:201
+msgid " and "
+msgstr ""
+
+#: views.py:142 views.py:201
+#, python-format
+msgid "%(permissions)s to %(requester)s"
+msgstr ""
+
+#: views.py:152
+#, python-format
+msgid "Permission \"%(permission)s\" granted to: %(requester)s."
+msgstr ""
+
+#: views.py:155
+#, python-format
+msgid "%(requester)s, already had the permission \"%(permission)s\" granted."
+msgstr ""
+
+#: views.py:167
 #, python-format
 msgid ""
-"Are you sure you wish to grant the permission \"%(permission)s\" to "
-"%(ct_name)s: %(requester)s"
+"Are you sure you wish to grant the %(permissions_label)s %(title_suffix)s?"
 msgstr ""
 
-#: views.py:121
+#: views.py:211
+#, python-format
+msgid "Permission \"%(permission)s\" revoked from: %(requester)s."
+msgstr ""
+
+#: views.py:214
+#, python-format
+msgid "%(requester)s, doesn't have the permission \"%(permission)s\" granted."
+msgstr ""
+
+#: views.py:226
 #, python-format
 msgid ""
-"Are you sure you wish to revoke the permission \"%(permission)s\" from "
-"%(ct_name)s: %(requester)s"
+"Are you sure you wish to revoke the %(permissions_label)s %(title_suffix)s?"
 msgstr ""
 
-#: views.py:134
-#, python-format
-msgid "Permission \"%(permission)s\" granted to %(ct_name)s: %(requester)s."
-msgstr ""
-
-#: views.py:137
-#, python-format
-msgid ""
-"%(ct_name)s: %(requester)s, already had the permission \"%(permission)s\" "
-"granted."
-msgstr ""
-
-#: views.py:143
-#, python-format
-msgid "Permission \"%(permission)s\" revoked from %(ct_name)s: %(requester)s."
-msgstr ""
-
-#: views.py:146
-#, python-format
-msgid ""
-"%(ct_name)s: %(requester)s doesn't have the permission \"%(permission)s\"."
-msgstr ""
-
-#: views.py:199
+#: views.py:278
 #, python-format
 msgid "non members of role: %s"
 msgstr ""
 
-#: views.py:200
+#: views.py:279
 #, python-format
 msgid "members of role: %s"
 msgstr ""
diff --git a/apps/permissions/locale/es/LC_MESSAGES/django.mo b/apps/permissions/locale/es/LC_MESSAGES/django.mo
index f6bd89e5c2..ddd24a555b 100644
Binary files a/apps/permissions/locale/es/LC_MESSAGES/django.mo and b/apps/permissions/locale/es/LC_MESSAGES/django.mo differ
diff --git a/apps/permissions/locale/es/LC_MESSAGES/django.po b/apps/permissions/locale/es/LC_MESSAGES/django.po
index a24d3a6387..2ae5d18ed6 100644
--- a/apps/permissions/locale/es/LC_MESSAGES/django.po
+++ b/apps/permissions/locale/es/LC_MESSAGES/django.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Roberto Rosario <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
-"PO-Revision-Date: 2011-09-30 05:09+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 15:37+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -41,30 +42,38 @@ msgstr "Conceder permisos"
 msgid "Revoke permissions"
 msgstr "Revocar permisos"
 
-#: __init__.py:20 models.py:75 views.py:33
+#: __init__.py:19 models.py:87 views.py:38
 msgid "roles"
 msgstr "funciones"
 
-#: __init__.py:21
+#: __init__.py:20
 msgid "create new role"
 msgstr "crear nueva función"
 
-#: __init__.py:22
+#: __init__.py:21
 msgid "edit"
 msgstr "editar"
 
-#: __init__.py:23
+#: __init__.py:22
 msgid "members"
 msgstr "miembros"
 
-#: __init__.py:24
+#: __init__.py:23
 msgid "role permissions"
 msgstr "permisos de la funcion"
 
-#: __init__.py:25
+#: __init__.py:24
 msgid "delete"
 msgstr "eliminar"
 
+#: __init__.py:26
+msgid "grant"
+msgstr "otorgar"
+
+#: __init__.py:27
+msgid "revoke"
+msgstr "revocar"
+
 #: api.py:22
 msgid "Permissions"
 msgstr "Permisos"
@@ -73,98 +82,100 @@ msgstr "Permisos"
 msgid "Insufficient permissions."
 msgstr "Permisos insuficientes."
 
-#: models.py:11 views.py:53
+#: models.py:11 views.py:58
 msgid "namespace"
 msgstr "espacio de nombres"
 
-#: models.py:12 views.py:54
+#: models.py:12 views.py:59
 msgid "name"
 msgstr "nombre"
 
-#: models.py:13 models.py:70
+#: models.py:13 models.py:82
 msgid "label"
 msgstr "etiqueta"
 
-#: models.py:20 models.py:53
+#: models.py:20 models.py:65 views.py:145 views.py:204
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:21 views.py:50
+#: models.py:21 views.py:55 views.py:147 views.py:206
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:61
+#: models.py:73
 msgid "permission holder"
 msgstr "titular de la autorización"
 
-#: models.py:62
+#: models.py:74
 msgid "permission holders"
 msgstr "titulares de autorización"
 
-#: models.py:74 models.py:92 views.py:69 views.py:79 views.py:103 views.py:203
+#: models.py:86 models.py:104 views.py:74 views.py:91 views.py:115
+#: views.py:282
 msgid "role"
 msgstr "función"
 
-#: models.py:103
+#: models.py:115
 msgid "role member"
 msgstr "miembro de la función"
 
-#: models.py:104
+#: models.py:116
 msgid "role members"
 msgstr "miembros de las functiones"
 
-#: views.py:56
-msgid "state"
-msgstr "estado"
+#: views.py:61
+msgid "has permission"
+msgstr "tiene permiso"
 
-#: views.py:116
+#: views.py:142 views.py:201
+msgid " and "
+msgstr "y"
+
+#: views.py:142 views.py:201
+#, python-format
+msgid "%(permissions)s to %(requester)s"
+msgstr "%(permissions)s a %(requester)s"
+
+#: views.py:152
+#, python-format
+msgid "Permission \"%(permission)s\" granted to: %(requester)s."
+msgstr "Permiso \"%(permission)s\" otorgado a: %(requester)s."
+
+#: views.py:155
+#, python-format
+msgid "%(requester)s, already had the permission \"%(permission)s\" granted."
+msgstr "%(requester)s, ya tenía el permiso \"%(permission)s\" concedido."
+
+#: views.py:167
 #, python-format
 msgid ""
-"Are you sure you wish to grant the permission \"%(permission)s\" to "
-"%(ct_name)s: %(requester)s"
+"Are you sure you wish to grant the %(permissions_label)s %(title_suffix)s?"
 msgstr ""
-"¿Está seguro que desea conceder el permiso \"%(permission)s\" a %(ct_name)s:"
-" %(requester)s?"
+"¿Está seguro que desea otorgar el %(permissions_label)s %(title_suffix)s?"
 
-#: views.py:121
+#: views.py:211
+#, python-format
+msgid "Permission \"%(permission)s\" revoked from: %(requester)s."
+msgstr "Permiso \"%(permission)s\" revocado de: %(requester)s."
+
+#: views.py:214
+#, python-format
+msgid "%(requester)s, doesn't have the permission \"%(permission)s\" granted."
+msgstr "%(requester)s, no tiene el permiso \"%(permission)s\" concedido."
+
+#: views.py:226
 #, python-format
 msgid ""
-"Are you sure you wish to revoke the permission \"%(permission)s\" from "
-"%(ct_name)s: %(requester)s"
+"Are you sure you wish to revoke the %(permissions_label)s %(title_suffix)s?"
 msgstr ""
-"¿Está seguro que desea revocar el permiso \"%(permission)s\" de %(ct_name)s:"
-" %(requester)s?"
+"¿Estás seguro que quiere revocar el %(permissions_label)s %(title_suffix)s?"
 
-#: views.py:134
-#, python-format
-msgid "Permission \"%(permission)s\" granted to %(ct_name)s: %(requester)s."
-msgstr "Permiso \"%(permission)s\" otorgado a %(ct_name)s: %(requester)s"
-
-#: views.py:137
-#, python-format
-msgid ""
-"%(ct_name)s: %(requester)s, already had the permission \"%(permission)s\" "
-"granted."
-msgstr ""
-" %(ct_name)s: %(requester)s, ya tenía el permiso \"%(permission)s\" "
-"otorgado."
-
-#: views.py:143
-#, python-format
-msgid "Permission \"%(permission)s\" revoked from %(ct_name)s: %(requester)s."
-msgstr "Permiso \"%(permission)s\" revocado de %(ct_name)s: %(requester)s"
-
-#: views.py:146
-#, python-format
-msgid "%(ct_name)s: %(requester)s doesn't have the permission \"%(permission)s\"."
-msgstr " %(ct_name)s: %(requester)s, no tiene el permiso \"%(permission)s\"."
-
-#: views.py:199
+#: views.py:278
 #, python-format
 msgid "non members of role: %s"
 msgstr "no miembros de la función: %s"
 
-#: views.py:200
+#: views.py:279
 #, python-format
 msgid "members of role: %s"
 msgstr "miembros de la función: %s"
diff --git a/apps/permissions/locale/pt/LC_MESSAGES/django.po b/apps/permissions/locale/pt/LC_MESSAGES/django.po
index 3385a71985..dd93d53119 100644
--- a/apps/permissions/locale/pt/LC_MESSAGES/django.po
+++ b/apps/permissions/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 04:52+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:12
@@ -42,30 +43,40 @@ msgstr "Conceder permissões"
 msgid "Revoke permissions"
 msgstr "Revogar as permissões"
 
-#: __init__.py:20 models.py:75 views.py:33
+#: __init__.py:19 models.py:87 views.py:38
 msgid "roles"
 msgstr "funções"
 
-#: __init__.py:21
+#: __init__.py:20
 msgid "create new role"
 msgstr "criar nova função"
 
-#: __init__.py:22
+#: __init__.py:21
 msgid "edit"
 msgstr "editar"
 
-#: __init__.py:23
+#: __init__.py:22
 msgid "members"
 msgstr "membros"
 
-#: __init__.py:24
+#: __init__.py:23
 msgid "role permissions"
 msgstr "permissões de função"
 
-#: __init__.py:25
+#: __init__.py:24
 msgid "delete"
 msgstr "excluir"
 
+#: __init__.py:26
+#, fuzzy
+msgid "grant"
+msgstr "Conceder"
+
+#: __init__.py:27
+#, fuzzy
+msgid "revoke"
+msgstr "Revogar"
+
 #: api.py:22
 msgid "Permissions"
 msgstr "Permissões"
@@ -74,97 +85,106 @@ msgstr "Permissões"
 msgid "Insufficient permissions."
 msgstr "Permissões insuficientes."
 
-#: models.py:11 views.py:53
+#: models.py:11 views.py:58
 msgid "namespace"
 msgstr "namespace"
 
-#: models.py:12 views.py:54
+#: models.py:12 views.py:59
 msgid "name"
 msgstr "nome"
 
-#: models.py:13 models.py:70
+#: models.py:13 models.py:82
 msgid "label"
 msgstr "rótulo"
 
-#: models.py:20 models.py:53
+#: models.py:20 models.py:65 views.py:145 views.py:204
 msgid "permission"
 msgstr "permissão"
 
-#: models.py:21 views.py:50
+#: models.py:21 views.py:55 views.py:147 views.py:206
 msgid "permissions"
 msgstr "permissões"
 
-#: models.py:61
+#: models.py:73
 msgid "permission holder"
 msgstr "titular de permissão"
 
-#: models.py:62
+#: models.py:74
 msgid "permission holders"
 msgstr "titulares de permissões"
 
-#: models.py:74 models.py:92 views.py:69 views.py:79 views.py:103 views.py:203
+#: models.py:86 models.py:104 views.py:74 views.py:91 views.py:115
+#: views.py:282
 msgid "role"
 msgstr "função"
 
-#: models.py:103
+#: models.py:115
 msgid "role member"
 msgstr "membro da função"
 
-#: models.py:104
+#: models.py:116
 msgid "role members"
 msgstr "membros da função"
 
-#: views.py:56
-msgid "state"
-msgstr "estado"
+#: views.py:61
+#, fuzzy
+msgid "has permission"
+msgstr "permissão"
 
-#: views.py:116
-#, python-format
+#: views.py:142 views.py:201
+msgid " and "
+msgstr ""
+
+#: views.py:142 views.py:201
+#, fuzzy, python-format
+msgid "%(permissions)s to %(requester)s"
+msgstr ""
+"Permissão \"%(permission)s\" concedida para %(ct_name)s: %(requester)s."
+
+#: views.py:152
+#, fuzzy, python-format
+msgid "Permission \"%(permission)s\" granted to: %(requester)s."
+msgstr ""
+"Permissão \"%(permission)s\" concedida para %(ct_name)s: %(requester)s."
+
+#: views.py:155
+#, fuzzy, python-format
+msgid "%(requester)s, already had the permission \"%(permission)s\" granted."
+msgstr ""
+"%(ct_name)s: %(requester)s, já tem permissão \"%(permission)s\" concedida."
+
+#: views.py:167
+#, fuzzy, python-format
 msgid ""
-"Are you sure you wish to grant the permission \"%(permission)s\" to "
-"%(ct_name)s: %(requester)s"
+"Are you sure you wish to grant the %(permissions_label)s %(title_suffix)s?"
 msgstr ""
 "Tem certeza que deseja conceder permissão \"%(permission)s\" para "
 "%(ct_name)s: %(requester)s"
 
-#: views.py:121
-#, python-format
+#: views.py:211
+#, fuzzy, python-format
+msgid "Permission \"%(permission)s\" revoked from: %(requester)s."
+msgstr "Permissão \"%(permission)s\"  revogada de %(ct_name)s: %(requester)s."
+
+#: views.py:214
+#, fuzzy, python-format
+msgid "%(requester)s, doesn't have the permission \"%(permission)s\" granted."
+msgstr "%(ct_name)s: %(requester)s não tem a permissão \"%(permission)s\"."
+
+#: views.py:226
+#, fuzzy, python-format
 msgid ""
-"Are you sure you wish to revoke the permission \"%(permission)s\" from "
-"%(ct_name)s: %(requester)s"
+"Are you sure you wish to revoke the %(permissions_label)s %(title_suffix)s?"
 msgstr ""
 "Tem certeza que deseja revogar a permissão \"%(permission)s\" de "
 "%(ct_name)s: %(requester)s"
 
-#: views.py:134
-#, python-format
-msgid "Permission \"%(permission)s\" granted to %(ct_name)s: %(requester)s."
-msgstr "Permissão \"%(permission)s\" concedida para %(ct_name)s: %(requester)s."
-
-#: views.py:137
-#, python-format
-msgid ""
-"%(ct_name)s: %(requester)s, already had the permission \"%(permission)s\" "
-"granted."
-msgstr ""
-"%(ct_name)s: %(requester)s, já tem permissão \"%(permission)s\" concedida."
-
-#: views.py:143
-#, python-format
-msgid "Permission \"%(permission)s\" revoked from %(ct_name)s: %(requester)s."
-msgstr "Permissão \"%(permission)s\"  revogada de %(ct_name)s: %(requester)s."
-
-#: views.py:146
-#, python-format
-msgid "%(ct_name)s: %(requester)s doesn't have the permission \"%(permission)s\"."
-msgstr "%(ct_name)s: %(requester)s não tem a permissão \"%(permission)s\"."
-
-#: views.py:199
+#: views.py:278
 #, python-format
 msgid "non members of role: %s"
 msgstr "não membros da função: %s"
 
-#: views.py:200
+#: views.py:279
 #, python-format
 msgid "members of role: %s"
 msgstr "membros da função: %s"
@@ -185,4 +205,5 @@ msgstr ""
 "A lista de funções existentes que são automaticamente designados para "
 "usuários recém-criados"
 
-
+#~ msgid "state"
+#~ msgstr "estado"
diff --git a/apps/permissions/locale/ru/LC_MESSAGES/django.mo b/apps/permissions/locale/ru/LC_MESSAGES/django.mo
index 9b5dff6734..8f8ad487ab 100644
Binary files a/apps/permissions/locale/ru/LC_MESSAGES/django.mo and b/apps/permissions/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/permissions/locale/ru/LC_MESSAGES/django.po b/apps/permissions/locale/ru/LC_MESSAGES/django.po
index 245f700d54..b30891a80f 100644
--- a/apps/permissions/locale/ru/LC_MESSAGES/django.po
+++ b/apps/permissions/locale/ru/LC_MESSAGES/django.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
-"PO-Revision-Date: 2011-11-04 12:02+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 18:57+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -41,30 +42,38 @@ msgstr "Предоставление разрешений"
 msgid "Revoke permissions"
 msgstr "Отмена разрешений"
 
-#: __init__.py:20 models.py:75 views.py:33
+#: __init__.py:19 models.py:87 views.py:38
 msgid "roles"
-msgstr "ролей"
+msgstr "роли"
 
-#: __init__.py:21
+#: __init__.py:20
 msgid "create new role"
 msgstr "создать новую роль"
 
-#: __init__.py:22
+#: __init__.py:21
 msgid "edit"
 msgstr "редактировать"
 
-#: __init__.py:23
+#: __init__.py:22
 msgid "members"
-msgstr "элементы"
+msgstr "участники"
 
-#: __init__.py:24
+#: __init__.py:23
 msgid "role permissions"
 msgstr "разрешения роли"
 
-#: __init__.py:25
+#: __init__.py:24
 msgid "delete"
 msgstr "удалить"
 
+#: __init__.py:26
+msgid "grant"
+msgstr "предоставить"
+
+#: __init__.py:27
+msgid "revoke"
+msgstr "отозвать"
+
 #: api.py:22
 msgid "Permissions"
 msgstr "Разрешения"
@@ -73,99 +82,101 @@ msgstr "Разрешения"
 msgid "Insufficient permissions."
 msgstr "Недостаточно разрешений."
 
-#: models.py:11 views.py:53
+#: models.py:11 views.py:58
 msgid "namespace"
 msgstr "пространство имен"
 
-#: models.py:12 views.py:54
+#: models.py:12 views.py:59
 msgid "name"
 msgstr "имя"
 
-#: models.py:13 models.py:70
+#: models.py:13 models.py:82
 msgid "label"
-msgstr "этикетка"
+msgstr "надпись"
 
-#: models.py:20 models.py:53
+#: models.py:20 models.py:65 views.py:145 views.py:204
 msgid "permission"
 msgstr "разрешение"
 
-#: models.py:21 views.py:50
+#: models.py:21 views.py:55 views.py:147 views.py:206
 msgid "permissions"
 msgstr "разрешения"
 
-#: models.py:61
+#: models.py:73
 msgid "permission holder"
-msgstr "держатель разрешения"
+msgstr "владелец разрешения"
 
-#: models.py:62
+#: models.py:74
 msgid "permission holders"
-msgstr "разрешения владельцев"
+msgstr "владельцы разрешения "
 
-#: models.py:74 models.py:92 views.py:69 views.py:79 views.py:103 views.py:203
+#: models.py:86 models.py:104 views.py:74 views.py:91 views.py:115
+#: views.py:282
 msgid "role"
 msgstr "роль"
 
-#: models.py:103
+#: models.py:115
 msgid "role member"
-msgstr "Роль члена"
+msgstr "участник"
 
-#: models.py:104
+#: models.py:116
 msgid "role members"
-msgstr "Роль членов"
+msgstr "участники"
 
-#: views.py:56
-msgid "state"
-msgstr "состояние"
+#: views.py:61
+msgid "has permission"
+msgstr "имеет право"
 
-#: views.py:116
+#: views.py:142 views.py:201
+msgid " and "
+msgstr "и"
+
+#: views.py:142 views.py:201
+#, python-format
+msgid "%(permissions)s to %(requester)s"
+msgstr "%(permissions)s для %(requester)s"
+
+#: views.py:152
+#, python-format
+msgid "Permission \"%(permission)s\" granted to: %(requester)s."
+msgstr "Право \"%(permission)s\" предоставлено %(requester)s."
+
+#: views.py:155
+#, python-format
+msgid "%(requester)s, already had the permission \"%(permission)s\" granted."
+msgstr "%(requester)s уже имеет право \"%(permission)s\"."
+
+#: views.py:167
 #, python-format
 msgid ""
-"Are you sure you wish to grant the permission \"%(permission)s\" to "
-"%(ct_name)s: %(requester)s"
-msgstr ""
-"Вы действительно хотите предоставить разрешение  \"%(permission)s\" для "
-"%(ct_name)s: %(requester)s"
+"Are you sure you wish to grant the %(permissions_label)s %(title_suffix)s?"
+msgstr "Вы хотите разрешить %(permissions_label)s %(title_suffix)s?"
 
-#: views.py:121
+#: views.py:211
+#, python-format
+msgid "Permission \"%(permission)s\" revoked from: %(requester)s."
+msgstr "Право \"%(permission)s\" отозвано у %(requester)s."
+
+#: views.py:214
+#, python-format
+msgid "%(requester)s, doesn't have the permission \"%(permission)s\" granted."
+msgstr "%(requester)s не имеет права \"%(permission)s\"."
+
+#: views.py:226
 #, python-format
 msgid ""
-"Are you sure you wish to revoke the permission \"%(permission)s\" from "
-"%(ct_name)s: %(requester)s"
-msgstr ""
-"Вы уверены, что хотите отозвать разрешение \"%(permission)s\" у %(ct_name)s:"
-" %(requester)s"
+"Are you sure you wish to revoke the %(permissions_label)s %(title_suffix)s?"
+msgstr "Вы хотите отозвать %(permissions_label)s %(title_suffix)s?"
 
-#: views.py:134
-#, python-format
-msgid "Permission \"%(permission)s\" granted to %(ct_name)s: %(requester)s."
-msgstr "Разрешение \"%(permission)s\" предоставлено %(ct_name)s: %(requester)s."
-
-#: views.py:137
-#, python-format
-msgid ""
-"%(ct_name)s: %(requester)s, already had the permission \"%(permission)s\" "
-"granted."
-msgstr "%(ct_name)s: %(requester)s,  уже имеет разрешение \"%(permission)s\"."
-
-#: views.py:143
-#, python-format
-msgid "Permission \"%(permission)s\" revoked from %(ct_name)s: %(requester)s."
-msgstr "Разрешение \"%(permission)s\" отозвано у %(ct_name)s: %(requester)s."
-
-#: views.py:146
-#, python-format
-msgid "%(ct_name)s: %(requester)s doesn't have the permission \"%(permission)s\"."
-msgstr "%(ct_name)s: %(requester)s не имеет разрешения \"%(permission)s\"."
-
-#: views.py:199
+#: views.py:278
 #, python-format
 msgid "non members of role: %s"
-msgstr "не участвует в %s"
+msgstr "не входит в %s"
 
-#: views.py:200
+#: views.py:279
 #, python-format
 msgid "members of role: %s"
-msgstr "участвует в %s"
+msgstr "входит в %s"
 
 #: widgets.py:16
 msgid "Revoke"
diff --git a/apps/permissions/views.py b/apps/permissions/views.py
index 65bd30ec56..3f58846eb9 100644
--- a/apps/permissions/views.py
+++ b/apps/permissions/views.py
@@ -102,8 +102,8 @@ def role_create(request):
 def role_delete(request, role_id):
     check_permissions(request.user, [PERMISSION_ROLE_DELETE])
 
-    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
-    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
+    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
+    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
 
     return delete_object(request, model=Role, object_id=role_id,
         template_name='generic_confirm.html',
@@ -122,8 +122,8 @@ def permission_grant(request):
     items_property_list = loads(request.GET.get('items_property_list', []))
     post_action_redirect = None
 
-    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
-    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
+    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
+    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
 
     items = []
     for item_properties in items_property_list:
diff --git a/apps/project_setup/__init__.py b/apps/project_setup/__init__.py
index 93a570a912..7f160810a2 100644
--- a/apps/project_setup/__init__.py
+++ b/apps/project_setup/__init__.py
@@ -3,4 +3,4 @@ from django.utils.translation import ugettext_lazy as _
 from navigation.api import register_top_menu
 
 #TODO: FIXME dynamic children_path_regext on api register_setup
-register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setup_list', 'famfam': 'cog'}, children_path_regex=[r'^settings/', r'^user_management/', r'^permissions', r'^documents/type', r'^metadata/setup', r'sources/setup'], position=-2)
+register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setup_list', 'famfam': 'cog'}, children_path_regex=[r'^settings/', r'^user_management/', r'^permissions', r'^documents/type', r'^metadata/setup', r'sources/setup', r'grouping/setup'], position=-2)
diff --git a/apps/project_setup/locale/en/LC_MESSAGES/django.po b/apps/project_setup/locale/en/LC_MESSAGES/django.po
index 3029cad76b..2a81c4bb2a 100644
--- a/apps/project_setup/locale/en/LC_MESSAGES/django.po
+++ b/apps/project_setup/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: 2011-09-29 18:47-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/project_setup/locale/es/LC_MESSAGES/django.po b/apps/project_setup/locale/es/LC_MESSAGES/django.po
index 26860d2aa8..022627b88d 100644
--- a/apps/project_setup/locale/es/LC_MESSAGES/django.po
+++ b/apps/project_setup/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 01:03+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:6
@@ -25,5 +26,3 @@ msgstr "configuración"
 #: views.py:13
 msgid "setup items"
 msgstr "elementos de configuración"
-
-
diff --git a/apps/project_setup/locale/pt/LC_MESSAGES/django.po b/apps/project_setup/locale/pt/LC_MESSAGES/django.po
index 40f68014fb..7ffd621c32 100644
--- a/apps/project_setup/locale/pt/LC_MESSAGES/django.po
+++ b/apps/project_setup/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 01:26+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:6
@@ -25,5 +26,3 @@ msgstr "instalação"
 #: views.py:13
 msgid "setup items"
 msgstr "itens de configuração"
-
-
diff --git a/apps/project_setup/locale/ru/LC_MESSAGES/django.mo b/apps/project_setup/locale/ru/LC_MESSAGES/django.mo
index 7acccb67ee..8bc36db741 100644
Binary files a/apps/project_setup/locale/ru/LC_MESSAGES/django.mo and b/apps/project_setup/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/project_setup/locale/ru/LC_MESSAGES/django.po b/apps/project_setup/locale/ru/LC_MESSAGES/django.po
index df049be7b8..e6069f5616 100644
--- a/apps/project_setup/locale/ru/LC_MESSAGES/django.po
+++ b/apps/project_setup/locale/ru/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:47-0400\n"
-"PO-Revision-Date: 2011-11-03 17:26+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-19 20:30+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:6
 msgid "setup"
@@ -24,6 +26,4 @@ msgstr "настройки"
 
 #: views.py:13
 msgid "setup items"
-msgstr "пункты настроек"
-
-
+msgstr "настроек"
diff --git a/apps/project_tools/locale/en/LC_MESSAGES/django.po b/apps/project_tools/locale/en/LC_MESSAGES/django.po
index 507f6ee047..255cb9e18c 100644
--- a/apps/project_tools/locale/en/LC_MESSAGES/django.po
+++ b/apps/project_tools/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: 2011-09-29 18:48-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/project_tools/locale/es/LC_MESSAGES/django.po b/apps/project_tools/locale/es/LC_MESSAGES/django.po
index 64ab3db4cd..9db820eb03 100644
--- a/apps/project_tools/locale/es/LC_MESSAGES/django.po
+++ b/apps/project_tools/locale/es/LC_MESSAGES/django.po
@@ -1,25 +1,24 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:48-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 05:22+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:7 views.py:13
 msgid "tools"
 msgstr "herramientas"
-
-
diff --git a/apps/project_tools/locale/pt/LC_MESSAGES/django.po b/apps/project_tools/locale/pt/LC_MESSAGES/django.po
index 8cc4da4a38..da0f490f89 100644
--- a/apps/project_tools/locale/pt/LC_MESSAGES/django.po
+++ b/apps/project_tools/locale/pt/LC_MESSAGES/django.po
@@ -1,25 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:48-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 01:25+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:7 views.py:13
 msgid "tools"
 msgstr "ferramentas"
-
-
diff --git a/apps/project_tools/locale/ru/LC_MESSAGES/django.po b/apps/project_tools/locale/ru/LC_MESSAGES/django.po
index 476a9f6ce9..b4158a9108 100644
--- a/apps/project_tools/locale/ru/LC_MESSAGES/django.po
+++ b/apps/project_tools/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-03 16:38-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 
 #: __init__.py:7 views.py:13
 msgid "tools"
diff --git a/apps/rest_api/__init__.py b/apps/rest_api/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/rest_api/models.py b/apps/rest_api/models.py
new file mode 100644
index 0000000000..71a8362390
--- /dev/null
+++ b/apps/rest_api/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/apps/rest_api/resources.py b/apps/rest_api/resources.py
new file mode 100644
index 0000000000..99a5c26613
--- /dev/null
+++ b/apps/rest_api/resources.py
@@ -0,0 +1,38 @@
+from django.core.urlresolvers import reverse
+
+from djangorestframework.resources import ModelResource
+
+from documents.models import Document
+from converter.exceptions import UnknownFileFormat, UnkownConvertError
+
+
+class DocumentResourceSimple(ModelResource):
+    model = Document
+    fields = ('url', 'pk', 'document_type', 'uuid', 'date_added', 'description', 'tags', 'comments', 'expensive_methods', 'files')
+   
+    def files(self, instance):
+        return [
+            {
+                'version': 1,
+                'mimetype': instance.file_mimetype,
+                'encoding': instance.file_mime_encoding,
+                'filename': instance.get_fullname(),
+                'date_updated': instance.date_updated,
+                'checksum': instance.checksum,
+                'size': instance.size,
+                'exists': instance.exists(),
+                'pages': [
+                    {
+                        'page_numer': page.page_number,
+                        'page_label': page.page_label,
+                        'is_zoomable': reverse('documents-expensive-is_zoomable', args=[instance.pk, page.page_number]),
+                        
+                        #'content':
+                    }
+                    for page in instance.documentpage_set.all()
+                ]
+            }
+        ]
+    
+    def expensive_methods(self, instance):
+        return []
diff --git a/apps/rest_api/tests.py b/apps/rest_api/tests.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/apps/rest_api/tests.py
@@ -0,0 +1 @@
+
diff --git a/apps/rest_api/urls.py b/apps/rest_api/urls.py
new file mode 100644
index 0000000000..3265dd7574
--- /dev/null
+++ b/apps/rest_api/urls.py
@@ -0,0 +1,16 @@
+from django.conf.urls.defaults import patterns, url
+
+from djangorestframework.views import ListModelView
+from djangorestframework.views import ListOrCreateModelView, InstanceModelView
+
+from rest_api.views import APIBase, Version_0, ReadOnlyInstanceModelView, IsZoomable
+from rest_api.resources import DocumentResourceSimple
+
+urlpatterns = patterns('',
+    url(r'^$', APIBase.as_view(), name='api-root'),
+    url(r'^v0/$', Version_0.as_view(), name='api-version-0'),
+    
+    # Version 0 alpha API calls    
+    url(r'^v0/document/(?P<pk>[0-9]+)/$', ReadOnlyInstanceModelView.as_view(resource=DocumentResourceSimple), name='documents-simple'),
+    url(r'^v0/document/(?P<pk>[0-9]+)/page/(?P<page_number>[0-9]+)/expensive/is_zoomable/$', IsZoomable.as_view(), name='documents-expensive-is_zoomable'),
+)
diff --git a/apps/rest_api/views.py b/apps/rest_api/views.py
new file mode 100644
index 0000000000..6a1b5dfc14
--- /dev/null
+++ b/apps/rest_api/views.py
@@ -0,0 +1,55 @@
+'''Views file for the rest_api app'''
+
+import logging
+
+from django.utils.translation import ugettext_lazy as _
+from django.shortcuts import get_object_or_404
+from django.core.urlresolvers import reverse
+
+from documents.models import Document
+from converter.exceptions import UnknownFileFormat, UnkownConvertError
+
+from djangorestframework.views import View, ModelView, ListModelView, InstanceModelView
+from djangorestframework.mixins import InstanceMixin, ReadModelMixin
+from djangorestframework.response import Response
+from djangorestframework import status
+
+logger = logging.getLogger(__name__)
+
+
+class ReadOnlyInstanceModelView(InstanceModelView):
+    allowed_methods = ['GET']
+
+
+class APIBase(View):
+    """This is the REST API for Mayan EDMS (https://github.com/rosarior/mayan/).
+
+    All the API calls can be navigated either through the browser or from the command line...
+
+        bash: curl -X GET http://127.0.0.1:8000/api/                           # (Use default renderer)
+        bash: curl -X GET http://127.0.0.1:8000/api/ -H 'Accept: text/plain'   # (Use plaintext documentation renderer)
+
+    """
+
+    def get(self, request):
+        return [
+            {'name': 'Version 0 Alpha', 'url': reverse('api-version-0')}
+        ]
+
+
+class Version_0(View):
+    def get(self, request):
+        return [
+            {'name': 'Resources', 'resources': ['document/<pk>']}
+        ]
+
+
+class IsZoomable(View):
+    def get(self, request, pk, page_number):
+        logger.info('received is_zoomable call from: %s' % (request.META['REMOTE_ADDR']))
+        document = get_object_or_404(Document, pk=pk)
+        try:
+            document.get_image_cache_name(int(page_number))
+            return {'result': True}
+        except (UnknownFileFormat, UnkownConvertError):
+            return {'result': False}
diff --git a/apps/scheduler/__init__.py b/apps/scheduler/__init__.py
index a9440e946b..8b13789179 100644
--- a/apps/scheduler/__init__.py
+++ b/apps/scheduler/__init__.py
@@ -1,4 +1 @@
-from apscheduler.scheduler import Scheduler
 
-scheduler = Scheduler()
-scheduler.start()
diff --git a/apps/scheduler/api.py b/apps/scheduler/api.py
index 59162e10d0..5f79d2433b 100644
--- a/apps/scheduler/api.py
+++ b/apps/scheduler/api.py
@@ -1,4 +1,4 @@
-from scheduler import scheduler
+from scheduler.runtime import scheduler
 from scheduler.exceptions import AlreadyScheduled
 
 registered_jobs = {}
diff --git a/apps/scheduler/runtime.py b/apps/scheduler/runtime.py
new file mode 100644
index 0000000000..a9440e946b
--- /dev/null
+++ b/apps/scheduler/runtime.py
@@ -0,0 +1,4 @@
+from apscheduler.scheduler import Scheduler
+
+scheduler = Scheduler()
+scheduler.start()
diff --git a/apps/smart_settings/locale/en/LC_MESSAGES/django.po b/apps/smart_settings/locale/en/LC_MESSAGES/django.po
index 10f224d23d..d0e511720a 100644
--- a/apps/smart_settings/locale/en/LC_MESSAGES/django.po
+++ b/apps/smart_settings/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: 2011-09-29 18:49-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/smart_settings/locale/es/LC_MESSAGES/django.po b/apps/smart_settings/locale/es/LC_MESSAGES/django.po
index 6808f0ad56..2188ccd324 100644
--- a/apps/smart_settings/locale/es/LC_MESSAGES/django.po
+++ b/apps/smart_settings/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 05:09+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:8 views.py:26
@@ -32,5 +33,3 @@ msgstr "por defecto"
 #: views.py:33
 msgid "value"
 msgstr "valor"
-
-
diff --git a/apps/smart_settings/locale/pt/LC_MESSAGES/django.po b/apps/smart_settings/locale/pt/LC_MESSAGES/django.po
index 156cdd2e6b..9e0ed5e9ea 100644
--- a/apps/smart_settings/locale/pt/LC_MESSAGES/django.po
+++ b/apps/smart_settings/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 01:22+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:8 views.py:26
@@ -33,5 +34,3 @@ msgstr "padrão"
 #: views.py:33
 msgid "value"
 msgstr "valor"
-
-
diff --git a/apps/smart_settings/locale/ru/LC_MESSAGES/django.po b/apps/smart_settings/locale/ru/LC_MESSAGES/django.po
index 0b4138ae4b..be3705264a 100644
--- a/apps/smart_settings/locale/ru/LC_MESSAGES/django.po
+++ b/apps/smart_settings/locale/ru/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 17:15+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:8 views.py:26
 msgid "settings"
@@ -33,5 +35,3 @@ msgstr "по умолчанию"
 #: views.py:33
 msgid "value"
 msgstr "значение"
-
-
diff --git a/apps/sources/locale/en/LC_MESSAGES/django.po b/apps/sources/locale/en/LC_MESSAGES/django.po
index 86bb6480e9..609adf9151 100644
--- a/apps/sources/locale/en/LC_MESSAGES/django.po
+++ b/apps/sources/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: 2011-09-29 18:49-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Document sources"
 msgstr ""
 
-#: __init__.py:69 widgets.py:33
+#: __init__.py:69 widgets.py:39
 msgid "thumbnail"
 msgstr ""
 
@@ -279,17 +279,17 @@ msgstr ""
 msgid "document source transformations"
 msgstr ""
 
-#: staging.py:40
+#: staging.py:42
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr ""
 
-#: staging.py:125
+#: staging.py:127
 #, python-format
 msgid "Unable to upload staging file: %s"
 msgstr ""
 
-#: staging.py:135
+#: staging.py:137
 #, python-format
 msgid "Unable to delete staging file: %s"
 msgstr ""
diff --git a/apps/sources/locale/es/LC_MESSAGES/django.mo b/apps/sources/locale/es/LC_MESSAGES/django.mo
index 541dd3a020..4395893c48 100644
Binary files a/apps/sources/locale/es/LC_MESSAGES/django.mo and b/apps/sources/locale/es/LC_MESSAGES/django.mo differ
diff --git a/apps/sources/locale/es/LC_MESSAGES/django.po b/apps/sources/locale/es/LC_MESSAGES/django.po
index 1f28401850..b71b65dc33 100644
--- a/apps/sources/locale/es/LC_MESSAGES/django.po
+++ b/apps/sources/locale/es/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
-"PO-Revision-Date: 2011-11-07 04:28+0000\n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-22 21:02+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,7 @@ msgstr "añadir transformación"
 msgid "Document sources"
 msgstr "Fuentes de documentos"
 
-#: __init__.py:69 widgets.py:33
+#: __init__.py:69 widgets.py:39
 msgid "thumbnail"
 msgstr "muestra"
 
@@ -161,7 +161,7 @@ msgstr "carpeta de archivos provisionales de servidor"
 
 #: literals.py:49
 msgid "server watch folder"
-msgstr ""
+msgstr "carpeta observada de servidor"
 
 #: literals.py:54
 msgid "server staging folders"
@@ -169,7 +169,7 @@ msgstr "carpetas de archivos provisionales de servidor"
 
 #: literals.py:55
 msgid "server watch folders"
-msgstr ""
+msgstr "carpetas observadas de servidor"
 
 #: models.py:29
 msgid "title"
@@ -248,10 +248,12 @@ msgid ""
 "Inverval in seconds where the watch folder path is checked for new "
 "documents."
 msgstr ""
+"Inverval es segundos, donde se comprueba la ruta de la carpeta para detectar"
+" nuevos documentos."
 
 #: models.py:193
 msgid "watch folder"
-msgstr ""
+msgstr "carpeta observada"
 
 #: models.py:198
 msgid "Enter a valid value."
@@ -282,24 +284,24 @@ msgstr "transformación de fuente de documentos"
 msgid "document source transformations"
 msgstr "transformaciones de fuentes de documentos"
 
-#: staging.py:40
+#: staging.py:42
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "No es posible obtener la lista de los archivos provisionales: %s"
 
-#: staging.py:125
+#: staging.py:127
 #, python-format
 msgid "Unable to upload staging file: %s"
 msgstr "No se puede cargar archivo provisional: %s"
 
-#: staging.py:135
+#: staging.py:137
 #, python-format
 msgid "Unable to delete staging file: %s"
 msgstr "No se puede eliminar archivo provisional: %s"
 
 #: utils.py:40
 msgid "Whitelist Blacklist validation error."
-msgstr ""
+msgstr "Error de validación de Lista Negra Lista Blanca"
 
 #: views.py:80
 msgid "here"
diff --git a/apps/sources/locale/pt/LC_MESSAGES/django.po b/apps/sources/locale/pt/LC_MESSAGES/django.po
index 95fd82b41c..0e71ddee4e 100644
--- a/apps/sources/locale/pt/LC_MESSAGES/django.po
+++ b/apps/sources/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 01:21+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:14
@@ -82,7 +83,7 @@ msgstr "adicionar transformação"
 msgid "Document sources"
 msgstr "Fontes de documentos"
 
-#: __init__.py:69 widgets.py:33
+#: __init__.py:69 widgets.py:39
 msgid "thumbnail"
 msgstr "miniaturas"
 
@@ -93,8 +94,7 @@ msgstr "Expandir arquivos compactados"
 #: forms.py:33 forms.py:56
 msgid "Upload a compressed file's contained files as individual documents"
 msgstr ""
-"Upload de um arquivo compactado contendo arquivos como documentos "
-"individuais"
+"Upload de um arquivo compactado contendo arquivos como documentos individuais"
 
 #: forms.py:41
 msgid "Staging file"
@@ -246,8 +246,7 @@ msgstr "intervalo"
 
 #: models.py:169
 msgid ""
-"Inverval in seconds where the watch folder path is checked for new "
-"documents."
+"Inverval in seconds where the watch folder path is checked for new documents."
 msgstr ""
 "Invervalo em segundos, onde o caminho da pasta assistida está marcada para "
 "novos documentos."
@@ -285,17 +284,17 @@ msgstr "transformação do documento de origem"
 msgid "document source transformations"
 msgstr "fonte de transformações de documentos"
 
-#: staging.py:40
+#: staging.py:42
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Unable get list of staging files: %s"
 
-#: staging.py:125
+#: staging.py:127
 #, python-format
 msgid "Unable to upload staging file: %s"
 msgstr "Unable to upload staging file: %s"
 
-#: staging.py:135
+#: staging.py:137
 #, python-format
 msgid "Unable to delete staging file: %s"
 msgstr "Unable to delete staging file: %s"
@@ -469,5 +468,3 @@ msgstr "Erro ao criar a transformação de fonte; %s"
 #, python-format
 msgid "Create new transformation for source: %s"
 msgstr "Criar nova transformação de fonte: %s"
-
-
diff --git a/apps/sources/locale/ru/LC_MESSAGES/django.po b/apps/sources/locale/ru/LC_MESSAGES/django.po
index 26927ae79c..86c34d5294 100644
--- a/apps/sources/locale/ru/LC_MESSAGES/django.po
+++ b/apps/sources/locale/ru/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Sergey Glita <gsv70@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 15:25+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:14
 msgid "View existing document sources"
@@ -82,7 +84,7 @@ msgstr "добавить преобразование"
 msgid "Document sources"
 msgstr "Источники документов"
 
-#: __init__.py:69 widgets.py:33
+#: __init__.py:69 widgets.py:39
 msgid "thumbnail"
 msgstr "миниатюра"
 
@@ -92,8 +94,7 @@ msgstr "Извлекать из архивов?"
 
 #: forms.py:33 forms.py:56
 msgid "Upload a compressed file's contained files as individual documents"
-msgstr ""
-"Загрузить файлы, содержащиеся в архиве в качестве отдельных документов"
+msgstr "Загрузить файлы, содержащиеся в архиве в качестве отдельных документов"
 
 #: forms.py:41
 msgid "Staging file"
@@ -245,8 +246,7 @@ msgstr "интервал"
 
 #: models.py:169
 msgid ""
-"Inverval in seconds where the watch folder path is checked for new "
-"documents."
+"Inverval in seconds where the watch folder path is checked for new documents."
 msgstr ""
 "Интервал в секундах, между проверками папки на появление новых документов."
 
@@ -283,17 +283,17 @@ msgstr "преобразования источника документов"
 msgid "document source transformations"
 msgstr "преобразования источника документов"
 
-#: staging.py:40
+#: staging.py:42
 #, python-format
 msgid "Unable get list of staging files: %s"
 msgstr "Не удалось получить список промежуточных файлов: %s"
 
-#: staging.py:125
+#: staging.py:127
 #, python-format
 msgid "Unable to upload staging file: %s"
 msgstr "Невозможно загрузить промежуточный файл: %s"
 
-#: staging.py:135
+#: staging.py:137
 #, python-format
 msgid "Unable to delete staging file: %s"
 msgstr "Не удается удалить промежуточный файл: %s"
@@ -449,8 +449,7 @@ msgstr "Ошибка при удалении преобразования ист
 msgid ""
 "Are you sure you wish to delete source transformation \"%(transformation)s\""
 msgstr ""
-"Вы действительно хотите удалить источник трансформации "
-"\"%(transformation)s\""
+"Вы действительно хотите удалить источник трансформации \"%(transformation)s\""
 
 #: views.py:587
 msgid "Source transformation created successfully"
@@ -465,5 +464,3 @@ msgstr "Ошибка создания преобразования источн
 #, python-format
 msgid "Create new transformation for source: %s"
 msgstr "Создать новое преобразование для источника: %s"
-
-
diff --git a/apps/tags/locale/en/LC_MESSAGES/django.po b/apps/tags/locale/en/LC_MESSAGES/django.po
index 09e03dfcc8..3a71fb37af 100644
--- a/apps/tags/locale/en/LC_MESSAGES/django.po
+++ b/apps/tags/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: 2011-09-29 18:49-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -41,7 +41,7 @@ msgstr ""
 msgid "View a document's tags"
 msgstr ""
 
-#: __init__.py:20 widgets.py:15
+#: __init__.py:20
 msgid "Tags"
 msgstr ""
 
diff --git a/apps/tags/locale/es/LC_MESSAGES/django.po b/apps/tags/locale/es/LC_MESSAGES/django.po
index fcac5d2358..1bd56cabd7 100644
--- a/apps/tags/locale/es/LC_MESSAGES/django.po
+++ b/apps/tags/locale/es/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # 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 <roberto.rosario.gonzalez@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 01:05+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:13
@@ -42,7 +43,7 @@ msgstr "Editar etiquetas globales"
 msgid "View a document's tags"
 msgstr "Ver etiquetas de un documento"
 
-#: __init__.py:20 widgets.py:15
+#: __init__.py:20
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -264,5 +265,3 @@ msgstr "¿Está seguro que desea eliminar de las etiquetas: %s?"
 #: templatetags/tags_tags.py:17
 msgid "Add tag to document"
 msgstr "Agregar etiqueta al documento"
-
-
diff --git a/apps/tags/locale/pt/LC_MESSAGES/django.po b/apps/tags/locale/pt/LC_MESSAGES/django.po
index 833d520d2c..bbc0936a4d 100644
--- a/apps/tags/locale/pt/LC_MESSAGES/django.po
+++ b/apps/tags/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-02 01:45+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:13
@@ -42,7 +43,7 @@ msgstr "Editar etiquetas globais"
 msgid "View a document's tags"
 msgstr "Ver etiquetas de um documento"
 
-#: __init__.py:20 widgets.py:15
+#: __init__.py:20
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -264,5 +265,3 @@ msgstr "Tem certeza de que deseja remover as etiquetas: %s?"
 #: templatetags/tags_tags.py:17
 msgid "Add tag to document"
 msgstr "Adicionar etiquetas para o documento"
-
-
diff --git a/apps/tags/locale/ru/LC_MESSAGES/django.po b/apps/tags/locale/ru/LC_MESSAGES/django.po
index 81fcf82963..1e057efbd3 100644
--- a/apps/tags/locale/ru/LC_MESSAGES/django.po
+++ b/apps/tags/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 15:20+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:13
 msgid "Create new tags"
@@ -41,7 +43,7 @@ msgstr "Изменить общие метки"
 msgid "View a document's tags"
 msgstr "Просмотр тегов документа"
 
-#: __init__.py:20 widgets.py:15
+#: __init__.py:20
 msgid "Tags"
 msgstr "Метки"
 
@@ -263,5 +265,3 @@ msgstr "Вы действительно хотите снять метку: %s?"
 #: templatetags/tags_tags.py:17
 msgid "Add tag to document"
 msgstr "Добавить тег к документу"
-
-
diff --git a/apps/user_management/locale/en/LC_MESSAGES/django.po b/apps/user_management/locale/en/LC_MESSAGES/django.po
index 62a2dc80f1..2c85ff5f68 100644
--- a/apps/user_management/locale/en/LC_MESSAGES/django.po
+++ b/apps/user_management/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: 2011-09-29 18:49-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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/apps/user_management/locale/es/LC_MESSAGES/django.po b/apps/user_management/locale/es/LC_MESSAGES/django.po
index 10345979ce..11f2ee564d 100644
--- a/apps/user_management/locale/es/LC_MESSAGES/django.po
+++ b/apps/user_management/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-09-30 05:10+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: __init__.py:8
@@ -118,8 +119,8 @@ msgid ""
 "Super user and staff user editing is not allowed, use the admin interface "
 "for these cases."
 msgstr ""
-"No se permite editar el super usuario y usuario de personal, use la interfaz"
-" de administración para estos casos."
+"No se permite editar el super usuario y usuario de personal, use la interfaz "
+"de administración para estos casos."
 
 #: views.py:65
 #, python-format
@@ -257,5 +258,3 @@ msgstr "no miembros del grupo: %s"
 #, python-format
 msgid "members of group: %s"
 msgstr "miembros del grupo: %s"
-
-
diff --git a/apps/user_management/locale/pt/LC_MESSAGES/django.po b/apps/user_management/locale/pt/LC_MESSAGES/django.po
index c5701552fa..45dc3f91b4 100644
--- a/apps/user_management/locale/pt/LC_MESSAGES/django.po
+++ b/apps/user_management/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Renata Oliveira <renatabels@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 03:18+0000\n"
 "Last-Translator: renataoliveira <renatabels@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: __init__.py:8
@@ -257,5 +258,3 @@ msgstr "não-membros do grupo: %s"
 #, python-format
 msgid "members of group: %s"
 msgstr "membros do grupo: %s"
-
-
diff --git a/apps/user_management/locale/ru/LC_MESSAGES/django.mo b/apps/user_management/locale/ru/LC_MESSAGES/django.mo
index 6fa4c43523..31694dab69 100644
Binary files a/apps/user_management/locale/ru/LC_MESSAGES/django.mo and b/apps/user_management/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/apps/user_management/locale/ru/LC_MESSAGES/django.po b/apps/user_management/locale/ru/LC_MESSAGES/django.po
index 50a517d59f..552793cf5e 100644
--- a/apps/user_management/locale/ru/LC_MESSAGES/django.po
+++ b/apps/user_management/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
-"PO-Revision-Date: 2011-11-04 15:20+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
+"PO-Revision-Date: 2011-11-19 21:07+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: __init__.py:8
 msgid "Create new users"
@@ -91,7 +93,7 @@ msgstr "создать новую группу"
 
 #: __init__.py:43 views.py:226
 msgid "members"
-msgstr "элементы"
+msgstr "Участники"
 
 #: forms.py:13
 msgid "New password"
@@ -118,8 +120,8 @@ msgid ""
 "Super user and staff user editing is not allowed, use the admin interface "
 "for these cases."
 msgstr ""
-"Редактирование суперпользователя и персонала не допускается, используйте для"
-" этого интерфейс администратора."
+"Редактирование суперпользователя и персонала не допускается, используйте для "
+"этого интерфейс администратора."
 
 #: views.py:65
 #, python-format
@@ -256,5 +258,3 @@ msgstr "не входят в группу: %s"
 #, python-format
 msgid "members of group: %s"
 msgstr "входят в группу: %s"
-
-
diff --git a/apps/web_theme/locale/en/LC_MESSAGES/django.po b/apps/web_theme/locale/en/LC_MESSAGES/django.po
index 73d09aa397..230b0e0867 100644
--- a/apps/web_theme/locale/en/LC_MESSAGES/django.po
+++ b/apps/web_theme/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: 2011-09-29 18:49-0400\n"
+"POT-Creation-Date: 2011-11-22 11:26-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"
@@ -28,19 +28,19 @@ msgstr ""
 msgid "Display extra information in the login screen."
 msgstr ""
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "dismiss all notifications"
 msgstr ""
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "close all"
 msgstr ""
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "dismiss this notification"
 msgstr ""
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "close"
 msgstr ""
 
diff --git a/apps/web_theme/locale/es/LC_MESSAGES/django.po b/apps/web_theme/locale/es/LC_MESSAGES/django.po
index 519141f557..6048de518a 100644
--- a/apps/web_theme/locale/es/LC_MESSAGES/django.po
+++ b/apps/web_theme/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-03 21:44+0000\n"
 "Last-Translator: rosarior <roberto.rosario.gonzalez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"mayan-edms/team/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"
 
 #: conf/settings.py:10
@@ -31,19 +32,19 @@ msgstr ""
 msgid "Display extra information in the login screen."
 msgstr "Mostrar información adicional en la pantalla de inicio de sesión."
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "dismiss all notifications"
 msgstr "cerrar todas las notificaciones"
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "close all"
 msgstr "cerrar todos"
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "dismiss this notification"
 msgstr "cerrar esta notificación"
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "close"
 msgstr "cerrar"
 
@@ -65,8 +66,8 @@ msgid ""
 "Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
 "work."
 msgstr ""
-"O haga clic <a href=\"%(LOGIN_REDIRECT_URL)s\">aquí</a> si la redirección no"
-" funciona."
+"O haga clic <a href=\"%(LOGIN_REDIRECT_URL)s\">aquí</a> si la redirección no "
+"funciona."
 
 #: templates/pagination/pagination.html:6
 #: templates/pagination/pagination.html:8
@@ -77,5 +78,3 @@ msgstr "Anterior"
 #: templates/pagination/pagination.html:28
 msgid "Next"
 msgstr "Siguiente"
-
-
diff --git a/apps/web_theme/locale/pt/LC_MESSAGES/django.po b/apps/web_theme/locale/pt/LC_MESSAGES/django.po
index 006f4e97aa..44231ccd0b 100644
--- a/apps/web_theme/locale/pt/LC_MESSAGES/django.po
+++ b/apps/web_theme/locale/pt/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <dev.emerson@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 00:46+0000\n"
 "Last-Translator: emersonsoares <dev.emerson@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
+"team/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"
 
 #: conf/settings.py:10
@@ -24,27 +25,27 @@ msgid ""
 "cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
 "warehouse."
 msgstr ""
-"Tema CSS a ser aplicado, as opções são: amro, bec, bec-green, blue, default,"
-" djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish"
-" and warehouse."
+"Tema CSS a ser aplicado, as opções são: amro, bec, bec-green, blue, default, "
+"djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish "
+"and warehouse."
 
 #: conf/settings.py:12
 msgid "Display extra information in the login screen."
 msgstr "Exibir informações extras na tela de login."
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "dismiss all notifications"
 msgstr "rejeitar todas as notificações"
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "close all"
 msgstr "fechar todos"
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "dismiss this notification"
 msgstr "descartar essa notificação"
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "close"
 msgstr "fechar"
 
@@ -78,5 +79,3 @@ msgstr "Anterior"
 #: templates/pagination/pagination.html:28
 msgid "Next"
 msgstr "Próximo"
-
-
diff --git a/apps/web_theme/locale/ru/LC_MESSAGES/django.po b/apps/web_theme/locale/ru/LC_MESSAGES/django.po
index 8fb93a847d..4f4ba45d35 100644
--- a/apps/web_theme/locale/ru/LC_MESSAGES/django.po
+++ b/apps/web_theme/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
-"POT-Creation-Date: 2011-09-29 18:49-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-22 11:26-0400\n"
 "PO-Revision-Date: 2011-11-04 15:22+0000\n"
 "Last-Translator: gsv70 <gsv70@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
+"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=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"
 
 #: conf/settings.py:10
 msgid ""
@@ -31,19 +33,19 @@ msgstr ""
 msgid "Display extra information in the login screen."
 msgstr "Показать дополнительную информацию в при входе."
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "dismiss all notifications"
 msgstr "убрать все уведомления"
 
-#: templates/web_theme_base.html:94
+#: templates/web_theme_base.html:101
 msgid "close all"
 msgstr "закрыть все"
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "dismiss this notification"
 msgstr "убрать это уведомление"
 
-#: templates/web_theme_base.html:95
+#: templates/web_theme_base.html:102
 msgid "close"
 msgstr "закрыть"
 
@@ -77,5 +79,3 @@ msgstr "Предыдущий"
 #: templates/pagination/pagination.html:28
 msgid "Next"
 msgstr "Следующий"
-
-
diff --git a/apps/web_theme/static/web_theme_media/javascripts/jquery-1.7.min.js b/apps/web_theme/static/web_theme_media/javascripts/jquery-1.7.min.js
new file mode 100644
index 0000000000..3ca5e0f5de
--- /dev/null
+++ b/apps/web_theme/static/web_theme_media/javascripts/jquery-1.7.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7 jquery.com | jquery.org/license */
+(function(a,b){function cA(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cx(a){if(!cm[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cn||(cn=c.createElement("iframe"),cn.frameBorder=cn.width=cn.height=0),b.appendChild(cn);if(!co||!cn.createElement)co=(cn.contentWindow||cn.contentDocument).document,co.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),co.close();d=co.createElement(a),co.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cn)}cm[a]=e}return cm[a]}function cw(a,b){var c={};f.each(cs.concat.apply([],cs.slice(0,b)),function(){c[this]=a});return c}function cv(){ct=b}function cu(){setTimeout(cv,0);return ct=f.now()}function cl(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ck(){try{return new a.XMLHttpRequest}catch(b){}}function ce(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cd(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function cc(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bG.test(a)?d(a,e):cc(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)cc(a+"["+e+"]",b[e],c,d);else d(a,b)}function cb(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function ca(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bV,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=ca(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=ca(a,c,d,e,"*",g));return l}function b_(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bR),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bE(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bz:bA;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bB(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function br(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bi,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bq(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bp(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bp)}function bp(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bo(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bn(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bm(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bl(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function X(a){var b=Y.split(" "),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(){return!0}function M(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.add(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;B.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return a!=null&&m.test(a)&&!isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:H?function(a){return a==null?"":H.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?F.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(I)return I.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=G.call(arguments,2),g=function(){return a.apply(c,f.concat(G.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){J["[object "+b+"]"]=b.toLowerCase()}),A=e.uaMatch(z),A.browser&&(e.browser[A.browser]=!0,e.browser.version=A.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?C=function(){c.removeEventListener("DOMContentLoaded",C,!1),e.ready()}:c.attachEvent&&(C=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",C),e.ready())}),typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return e});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){return i.done.apply(i,arguments).fail.apply(i,arguments)},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/><nav></nav>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,unknownElems:!!a.getElementsByTagName("nav").length,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",enctype:!!c.createElement("form").enctype,submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.lastChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-999px",top:"-999px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;f(function(){var a,b,d,e,g,h,i=1,j="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",l="visibility:hidden;border:0;",n="style='"+j+"border:5px solid #000;padding:0;'",p="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>";m=c.getElementsByTagName("body")[0];!m||(a=c.createElement("div"),a.style.cssText=l+"width:0;height:0;position:static;top:0;margin-top:"+i+"px",m.insertBefore(a,m.firstChild),o=c.createElement("div"),o.style.cssText=j+l,o.innerHTML=p,a.appendChild(o),b=o.firstChild,d=b.firstChild,g=b.nextSibling.firstChild.firstChild,h={doesNotAddBorder:d.offsetTop!==5,doesAddBorderForTableAndCells:g.offsetTop===5},d.style.position="fixed",d.style.top="20px",h.fixedPosition=d.offsetTop===20||d.offsetTop===15,d.style.position=d.style.top="",b.style.overflow="hidden",b.style.position="relative",h.subtractsBorderForOverflowNotVisible=d.offsetTop===-5,h.doesNotIncludeMarginInBodyOffset=m.offsetTop!==i,m.removeChild(a),o=a=null,f.extend(k,h))}),o.innerHTML="",n.removeChild(o),o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[f.expando]:a[f.expando]&&f.expando,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[f.expando]=n=++f.uuid:n=f.expando),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[f.expando]:f.expando;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)?b=b:b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" "));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];if(!arguments.length){if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}return b}e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!a||j===3||j===8||j===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g},removeAttr:function(a,b){var c,d,e,g,h=0;if(a.nodeType===1){d=(b||"").split(p),g=d.length;for(;h<g;h++)e=d[h].toLowerCase(),c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1)}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return b;h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/\.(.*)$/,A=/^(?:textarea|input|select)$/i,B=/\./g,C=/ /g,D=/[^\w\s.|`]/g,E=/^([^\.]*)?(?:\.(.+))?$/,F=/\bhover(\.\S+)?/,G=/^key/,H=/^(?:mouse|contextmenu)|click/,I=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,J=function(a){var b=I.exec(a);b&&
+(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},K=function(a,b){return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||a.id===b[2])&&(!b[3]||b[3].test(a.className))},L=function(a){return f.event.special.hover?a:a.replace(F,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=L(c).split(" ");for(k=0;k<c.length;k++){l=E.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,namespace:n.join(".")},p),g&&(o.quick=J(g),!o.quick&&f.expr.match.POS.test(g)&&(o.isPositional=!0)),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d){var e=f.hasData(a)&&f._data(a),g,h,i,j,k,l,m,n,o,p,q;if(!!e&&!!(m=e.events)){b=L(b||"").split(" ");for(g=0;g<b.length;g++){h=E.exec(b[g])||[],i=h[1],j=h[2];if(!i){j=j?"."+j:"";for(l in m)f.event.remove(a,l+j,c,d);return}n=f.event.special[i]||{},i=(d?n.delegateType:n.bindType)||i,p=m[i]||[],k=p.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;if(c||j||d||n.remove)for(l=0;l<p.length;l++){q=p[l];if(!c||c.guid===q.guid)if(!j||j.test(q.namespace))if(!d||d===q.selector||d==="**"&&q.selector)p.splice(l--,1),q.selector&&p.delegateCount--,n.remove&&n.remove.call(a,q)}else p.length=0;p.length===0&&k!==p.length&&((!n.teardown||n.teardown.call(a,j)===!1)&&f.removeEvent(a,i,e.handle),delete m[i])}f.isEmptyObject(m)&&(o=e.handle,o&&(o.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"",(g||!e)&&c.preventDefault();if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,n=null;for(m=e.parentNode;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length;l++){m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d);if(c.isPropagationStopped())break}c.type=h,c.isDefaultPrevented()||(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=(f.event.special[c.type]||{}).handle,j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click"))for(m=c.target;m!=this;m=m.parentNode||this){o={},q=[];for(k=0;k<e;k++)r=d[k],s=r.selector,t=o[s],r.isPositional?t=(t||(o[s]=f(s))).index(m)>=0:t===b&&(t=o[s]=r.quick?K(m,r.quick):f(m).is(s)),t&&q.push(r);q.length&&j.push({elem:m,matches:q})}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){p=j[k],c.currentTarget=p.elem;for(l=0;l<p.matches.length&&!c.isImmediatePropagationStopped();l++){r=p.matches[l];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=(i||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement wheelDelta".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},focus:{delegateType:"focusin",noBubble:!0},blur:{delegateType:"focusout",noBubble:!0},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?N:M):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=N;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=N;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=N,this.stopPropagation()},isDefaultPrevented:M,isPropagationStopped:M,isImmediatePropagationStopped:M},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]=f.event.special[b]={delegateType:b,bindType:b,handle:function(a){var b=this,c=a.relatedTarget,d=a.handleObj,e=d.selector,g,h;if(!c||d.origType===a.type||c!==b&&!f.contains(b,c))g=a.type,a.type=d.origType,h=d.handler.apply(this,arguments),a.type=g;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(A.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;A.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return A.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=M;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=M);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),G.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),H.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw"Syntax error, unrecognized expression: "+a};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?T.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y="abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",Z=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,_=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,ba=/<([\w:]+)/,bb=/<tbody/i,bc=/<|&#?\w+;/,bd=/<(?:script|style)/i,be=/<(?:script|object|embed|option|style)/i,bf=new RegExp("<(?:"+Y.replace(" ","|")+")","i"),bg=/checked\s*(?:[^=]|=\s*.checked.)/i,bh=/\/(java|ecma)script/i,bi=/^\s*<!(?:\[CDATA\[|\-\-)/,bj={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bk=X(c);bj.optgroup=bj.option,bj.tbody=bj.tfoot=bj.colgroup=bj.caption=bj.thead,bj.th=bj.td,f.support.htmlSerialize||(bj._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after"
+,arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Z,""):null;if(typeof a=="string"&&!bd.test(a)&&(f.support.leadingWhitespace||!$.test(a))&&!bj[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(_,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bg.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bl(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,br)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!be.test(j)&&(f.support.checkClone||!bg.test(j))&&!f.support.unknownElems&&bf.test(j)&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bn(a,d),e=bo(a),g=bo(d);for(h=0;e[h];++h)g[h]&&bn(e[h],g[h])}if(b){bm(a,d);if(c){e=bo(a),g=bo(d);for(h=0;e[h];++h)bm(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bc.test(k))k=b.createTextNode(k);else{k=k.replace(_,"<$1></$2>");var l=(ba.exec(k)||["",""])[1].toLowerCase(),m=bj[l]||bj._default,n=m[0],o=b.createElement("div");b===c?bk.appendChild(o):X(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=bb.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&$.test(k)&&o.insertBefore(b.createTextNode($.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bq(k[i]);else bq(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bh.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bs=/alpha\([^)]*\)/i,bt=/opacity=([^)]*)/,bu=/([A-Z]|^ms)/g,bv=/^-?\d+(?:px)?$/i,bw=/^-?\d/,bx=/^([\-+])=([\-+.\de]+)/,by={position:"absolute",visibility:"hidden",display:"block"},bz=["Left","Right"],bA=["Top","Bottom"],bB,bC,bD;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bB(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bx.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bB)return bB(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bE(a,b,d);f.swap(a,by,function(){e=bE(a,b,d)});return e}},set:function(a,b){if(!bv.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bt.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bs,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bs.test(g)?g.replace(bs,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bB(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bC=function(a,c){var d,e,g;c=c.replace(bu,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bD=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bv.test(f)&&bw.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bB=bC||bD,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bF=/%20/g,bG=/\[\]$/,bH=/\r?\n/g,bI=/#.*$/,bJ=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bK=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bL=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bM=/^(?:GET|HEAD)$/,bN=/^\/\//,bO=/\?/,bP=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bQ=/^(?:select|textarea)/i,bR=/\s+/,bS=/([?&])_=[^&]*/,bT=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bU=f.fn.load,bV={},bW={},bX,bY,bZ=["*/"]+["*"];try{bX=e.href}catch(b$){bX=c.createElement("a"),bX.href="",bX=bX.href}bY=bT.exec(bX.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bU)return bU.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bP,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bQ.test(this.nodeName)||bK.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bH,"\r\n")}}):{name:b.name,value:c.replace(bH,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?cb(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),cb(a,b);return a},ajaxSettings:{url:bX,isLocal:bL.test(bY[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bZ},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:b_(bV),ajaxTransport:b_(bW),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cd(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=ce(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bJ.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bI,"").replace(bN,bY[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bR),d.crossDomain==null&&(r=bT.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bY[1]&&r[2]==bY[2]&&(r[3]||(r[1]==="http:"?80:443))==(bY[3]||(bY[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),ca(bV,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bM.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bO.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bS,"$1_="+x);d.url=y+(y===d.url?(bO.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bZ+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=ca(bW,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)cc(g,a[g],c,e);return d.join("&").replace(bF,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cf=f.now(),cg=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cf++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cg.test(b.url)||e&&cg.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cg,l),b.url===j&&(e&&(k=k.replace(cg,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ch=a.ActiveXObject?function(){for(var a in cj)cj[a](0,1)}:!1,ci=0,cj;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ck()||cl()}:ck,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ch&&delete cj[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++ci,ch&&(cj||(cj={},f(a).unload(ch)),cj[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cm={},cn,co,cp=/^(?:toggle|show|hide)$/,cq=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cr,cs=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],ct;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cw("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cx(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cw("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cw("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cx(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cp.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=cq.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cw("show",1),slideUp:cw("hide",1),slideToggle:cw("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=ct||cu(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cr&&(cr=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=ct||cu(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cr),cr=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now))}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cy=/^t(?:able|d|h)$/i,cz=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cA(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cy.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cz.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cz.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cA(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cA(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/apps/web_theme/templates/web_theme_base.html b/apps/web_theme/templates/web_theme_base.html
index 28288591a8..c55015fb83 100644
--- a/apps/web_theme/templates/web_theme_base.html
+++ b/apps/web_theme/templates/web_theme_base.html
@@ -39,7 +39,7 @@
 		{% endcompress %}
 
 		{% compress js %}
-        <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery-1.5.2.min.js"></script>
+        <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery-1.7.min.js"></script>
 
         {% if enable_scroll_js %}
             <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery.scrollTo.js"></script>#}
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3102f87c95..ca07319a67 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,3 +1,55 @@
+Version 0.10
+------------
+* Added a proper setup views for the document grouping functionality.
+* Document grouping is now called smart linking as it relates better to
+  how it actually works.  The data base schema was changed and users must
+  do the required::
+
+    $ ./manager syncdb
+
+  for the new tables to be created.
+* Grappelli is no longer required as can be uninstalled.
+* New smarter document preview widget that doesn't allow zooming or viewing
+  unknown or invalid documents.
+* New office document converter, requires:
+
+    * LibreOffice (https://www.libreoffice.org/)
+    * unoconv [version 0.5] (https://github.com/dagwieers/unoconv)
+
+* The new office documents converter won't convert files with the extension 
+  .docx because these files are recognized as zip files instead.  This 
+  is an issue of the libmagic library.
+
+* New configuration option added ``CONVERTER_UNOCONV_USE_PIPE`` that controls 
+  how unoconv handles the communication with LibreOffice.  The default of 
+  ``True`` causes unoconv to use **pipes**, this approach is slower than using 
+  **TCP/IP** ports but it is more stable.
+  
+* Initial `REST` `API` that exposes documents properties and one method, this 
+  new `API` is used by the new smart document widget and requires the 
+  package ``djangorestframework``, users must issue a::
+  
+  $ pip install -r requirements/production.txt
+  
+  to install this new requirement.
+  
+* MIME type detection and caching performance updates.
+* Updated the included version of ``jQuery`` to 1.7
+* Updated the included version of ``JqueryAsynchImageLoader`` to 0.9.7
+* Document image serving response now specifies a MIME type for increased 
+  browser compatibility.
+* Small change in the scheduler that increases stability.
+* Russian translation updates (Сергей Глита [Sergey Glita])
+* Improved and generalized the OCR queue locking mechanism, this should 
+  eliminate any posibility of race conditions between Mayan EDMS OCR nodes.
+* Added support for signals to the OCR queue, this results in instant OCR
+  processing upon submittal of a document to the OCR queue, this works in
+  addition to the current polling processing which eliminates the
+  posibility of stale documents in the OCR queue.
+* Added multiple document OCR submit link
+* Re enabled tesseract language specific OCR processing and added a one
+  (1) time language neutral retry for failed language specific OCR
+
 Version 0.9.1
 -------------
 * Added handling percent encoded unicode query strings in search URL,
@@ -8,44 +60,44 @@ Version 0.9.1
 
 Version 0.9.0
 -------------
-* Simplified getting mimetypes from files by merging 2 implementations
+* Simplified getting mimetypes from files by merging 2 implementations 
   (document based and file based)
-* Updated python converter backend, document model and staging module
+* Updated python converter backend, document model and staging module 
   to use the new get_mimetype API
-* Only allow clickable thumbnails for document and staging files with a
+* Only allow clickable thumbnails for document and staging files with a 
   valid image
-* Removed tag count from the group document list widget to conserve
+* Removed tag count from the group document list widget to conserve 
   vertical space
 * Updated required Django version to 1.3.1
-* Removed the included 3rd party module django-sendfile, now added to
+* Removed the included 3rd party module django-sendfile, now added to 
   the requirement files.
 
-    * User should do a pip install -r requirements/production.txt to update
+  * User should do a pip install -r requirements/production.txt to update
 
-* Changed to Semantic Versioning (http://semver.org/), with
+* Changed to Semantic Versioning (http://semver.org/), with 
   recommendations 7, 8 and 9 causing the most effect in the versioning number.
 * Added Russian locale post OCR cleanup backend (Сергей Глита [Sergei Glita])
-* Reduced severity of the messages displayed when no OCR cleanup backend
+* Reduced severity of the messages displayed when no OCR cleanup backend 
   is found for a language
 * Complete Portuguese translation (Emerson Soares and Renata Oliveira)
 * Complete Russian translation (Сергей Глита [Sergei Glita])
-* Added animate.css to use CSS to animate flash messages with better
+* Added animate.css to use CSS to animate flash messages with better 
   fallback on non JS browsers
 * The admin and sentry links are no longer hard-coded (Meurig Freeman)
-* Improved appearance of the document tag widget
+* Improved appearance of the document tag widget 
   (https://p.twimg.com/Ac0Q0b-CAAE1lfA.png:large)
-* Added django_compress and cssmin to the requirements files and enabled
+* Added django_compress and cssmin to the requirements files and enabled 
   django_compress for CSS and JS files
 * Added granting and revoking permission methods to the permission model
 * Correctly calculate the mimetype icons paths when on development mode
-* Added a new more comprehensive method of passing multiple variables
+* Added a new more comprehensive method of passing multiple variables 
   per item in multi item selection views
-* Used new multi parameter passing method to improve the usability of
+* Used new multi parameter passing method to improve the usability of 
   the grant/revoke permission view, thanks to Cezar Jenkins
   (https://twitter.com/#!/emperorcezar) for the suggestion
-* Added step to the documentation explaining how to install Mayan EDMS
+* Added step to the documentation explaining how to install Mayan EDMS 
   on Webfaction
-* Added an entry in the documentation to the screencast explaining how
+* Added an entry in the documentation to the screencast explaining how 
   to install Mayan EDMS on DjangoZoom
 * Added required changes to add Mayan EDMS to Transifex.com
 * Fixed the apache contrib file static file directory name
@@ -53,7 +105,6 @@ Version 0.9.0
 
 Version 0.8.3
 -------------
-
 * Added a Contributors file under the docs directory
 * Moved the document grouping subtemplate windows into a document
   information tab
diff --git a/docs/conf.py b/docs/conf.py
index e4e4c5067c..45126bf88f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,10 +48,10 @@ copyright = u'2011, Roberto Rosario'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.0'
+version = '0.10'
 
 # The full version, including alpha/beta/rc tags.
-release = '0.9.0'
+release = '0.10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/contributors.rst b/docs/contributors.rst
index 40d36c8007..f6179efb07 100644
--- a/docs/contributors.rst
+++ b/docs/contributors.rst
@@ -25,10 +25,12 @@ Bug reports
 Patches
 -------
 * Meurig Freeman (https://github.com/meurig)
+* Сергей Глита [Sergey Glita] (s.v.glita@gmail.com)
 
 Suggestions
 -----------
 * Cezar Jenkins (https://twitter.com/#!/emperorcezar)
+* Сергей Глита [Sergey Glita] (s.v.glita@gmail.com)
 
 Translations
 ------------
diff --git a/docs/faq.rst b/docs/faq.rst
index e017c806b1..241e76b4a2 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -119,3 +119,13 @@ How to enable x-sendile support for ``Apache``
   
       XSendFile on
       XSendFileAllowAbove on
+      
+
+The included version of ``unoconv`` in my distribution is too old
+-------------------------------------------------------------
+      
+  * Only the file 'unoconv' file from https://github.com/dagwieers/unoconv is needed.  
+    Put it in a user designated directory for binaries such as /usr/local/bin and 
+    setup Mayan's configuration option in your settings_local.py file like this::
+    
+      CONVERTER_UNOCONV_PATH = '/usr/local/bin/unoconv'
diff --git a/misc/compilemessages_all.sh b/misc/compilemessages_all.sh
index 2061c78616..4ad10e85ae 100755
--- a/misc/compilemessages_all.sh
+++ b/misc/compilemessages_all.sh
@@ -43,7 +43,7 @@ $COMPILEMESSAGES -l pt
 $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
 
-cd $BASE/apps/grouping
+cd $BASE/apps/linking
 $COMPILEMESSAGES -l pt
 $COMPILEMESSAGES -l ru
 $COMPILEMESSAGES -l es
diff --git a/misc/makemessages_all.sh b/misc/makemessages_all.sh
index da30063c2c..79a1354cee 100755
--- a/misc/makemessages_all.sh
+++ b/misc/makemessages_all.sh
@@ -4,106 +4,127 @@ PWD=`pwd`
 BASE=$PWD
 
 cd $BASE/apps/common
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/converter
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/documents
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/document_comments
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/document_indexing
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/dynamic_search
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/folders
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/history
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
-cd $BASE/apps/grouping
+cd $BASE/apps/linking
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/main
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/metadata
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/navigation
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/ocr
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/permissions
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/project_setup
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/project_tools
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/smart_settings
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/sources
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/tags
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/user_management
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
 
 cd $BASE/apps/web_theme
+$MAKEMESSAGES -l en
 $MAKEMESSAGES -l pt
 $MAKEMESSAGES -l ru
 $MAKEMESSAGES -l es
diff --git a/requirements/development.txt b/requirements/development.txt
index fe228d3604..d363fd07d9 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -14,8 +14,8 @@ slate==0.3
 ghostscript==0.4.1
 pdfminer==20110227
 APScheduler==2.0.2
-django-grappelli==2.3.3
 Pillow==1.7.4
 cssmin==0.1.4
 django-compressor==1.1
 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
+djangorestframework==0.2.3
diff --git a/requirements/production.txt b/requirements/production.txt
index 39948f87ba..e2654a82b1 100644
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -11,8 +11,8 @@ slate==0.3
 ghostscript==0.4.1
 pdfminer==20110227
 APScheduler==2.0.2
-django-grappelli==2.3.3
 Pillow==1.7.4
 cssmin==0.1.4
 django-compressor==1.1
 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
+djangorestframework==0.2.3
diff --git a/settings.py b/settings.py
index 4322e12875..27ef8c818f 100644
--- a/settings.py
+++ b/settings.py
@@ -81,7 +81,7 @@ STATIC_URL = '/%s-static/' % PROJECT_NAME
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = STATIC_URL + 'grappelli/'
+ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'om^a(i8^6&h+umbd2%pt91cj!qu_@oztw117rgxmn(n2lp^*c!'
@@ -117,7 +117,6 @@ TEMPLATE_DIRS = (
 )
 
 INSTALLED_APPS = (
-    'grappelli',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -153,7 +152,7 @@ INSTALLED_APPS = (
     'document_comments',
     'user_management',
     'documents',
-    'grouping',
+    'linking',
     'mptt',
     'document_indexing',
     'ocr',
@@ -164,6 +163,8 @@ INSTALLED_APPS = (
     'history',
     'main',
     'compressor',
+    'djangorestframework',
+    'rest_api',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -285,8 +286,6 @@ CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
 CELERY_DISABLE_RATE_LIMITS = True
 #--------- Web theme ---------------
 WEB_THEME_ENABLE_SCROLL_JS = False
-#--------- Grappelli ----------------
-GRAPPELLI_ADMIN_TITLE = PROJECT_TITLE
 #--------- Django -------------------
 LOGIN_URL = '/login/'
 LOGIN_REDIRECT_URL = '/'
diff --git a/urls.py b/urls.py
index 6127fe570e..38ab8788b2 100644
--- a/urls.py
+++ b/urls.py
@@ -15,19 +15,19 @@ urlpatterns = patterns('',
     (r'^tags/', include('tags.urls')),
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
-    (r'^grappelli/', include('grappelli.urls')),
     (r'^sentry/', include('sentry.urls')),
     (r'^comments/', include('document_comments.urls')),
     (r'^user_management/', include('user_management.urls')),
     (r'^settings/', include('smart_settings.urls')),
     (r'^metadata/', include('metadata.urls')),
-    (r'^grouping/', include('grouping.urls')),
+    (r'^linking/', include('linking.urls')),
     (r'^document_indexing/', include('document_indexing.urls')),
     (r'^history/', include('history.urls')),
     (r'^converter/', include('converter.urls')),
     (r'^sources/', include('sources.urls')),
     (r'^project_setup/', include('project_setup.urls')),
     (r'^project_tools/', include('project_tools.urls')),
+    (r'^api/', include('rest_api.urls')),
 )