Merge branch 'development' into feature/ACL_support

Conflicts:
	requirements/development.txt
	requirements/production.txt
	urls.py
This commit is contained in:
Roberto Rosario
2011-12-05 16:01:21 -04:00
300 changed files with 19574 additions and 3132 deletions
+29 -35
View File
@@ -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 ""
Binary file not shown.
+49 -48
View File
@@ -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"
"PO-Revision-Date: 2011-09-30 05:17+0000\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
@@ -32,11 +33,11 @@ msgstr "editar detalles"
#: __init__.py:23 __init__.py:29
msgid "about"
msgstr ""
msgstr "sobre"
#: __init__.py:24
msgid "changelog"
msgstr ""
msgstr "cambios"
#: __init__.py:25
msgid "license"
@@ -48,17 +49,20 @@ msgstr "Selección"
#: forms.py:131
msgid "Email"
msgstr ""
msgstr "E-mail"
#: forms.py:142
msgid ""
"Please enter a correct email and password. Note that the password fields is "
"case-sensitive."
msgstr ""
"Por favor entre la dirección de correo electrónico y la contraseña "
"correctas. Tenga en cuenta que los campos de contraseña distingue entre "
"mayúsculas y minúsculas."
#: forms.py:144
msgid "This account is inactive."
msgstr ""
msgstr "Esta cuenta está inactiva."
#: literals.py:24
msgid "A5"
@@ -100,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 ""
msgstr "Cambios"
#: views.py:210
#: views.py:220
msgid "License"
msgstr "Licencia"
@@ -171,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 "
@@ -183,6 +187,8 @@ msgid ""
"Controls the mechanism used to authenticated user. Options are: username, "
"email"
msgstr ""
"Controla el mecanismo utilizado para el usuario autenticado. Las opciones "
"son: 'username' nombre de usuario, 'email' correo electrónico"
#: templates/403.html:3 templates/403.html.py:7
msgid "Insufficient permissions"
@@ -241,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"
@@ -272,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"
@@ -281,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 "
@@ -306,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 "
@@ -331,4 +331,5 @@ msgstr "Iniciar sesión"
msgid "Password change"
msgstr "Cambio de contraseña"
#~ msgid "Cancel"
#~ msgstr "Cancelar"
Binary file not shown.
+334
View File
@@ -0,0 +1,334 @@
# 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 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: 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:17
msgid "change password"
msgstr "alterar a senha"
#: __init__.py:18
msgid "user details"
msgstr "detalhes do usuário"
#: __init__.py:19
msgid "edit details"
msgstr "editar detalhes"
#: __init__.py:23 __init__.py:29
msgid "about"
msgstr "sobre"
#: __init__.py:24
msgid "changelog"
msgstr "log de alterações"
#: __init__.py:25
msgid "license"
msgstr "licença"
#: forms.py:99
msgid "Selection"
msgstr "Seleção"
#: forms.py:131
msgid "Email"
msgstr "E-mail"
#: forms.py:142
msgid ""
"Please enter a correct email and password. Note that the password fields is "
"case-sensitive."
msgstr ""
"Por favor insira o e-mail e senha corretos. Note que os campos de senha são "
"case-sensitive."
#: forms.py:144
msgid "This account is inactive."
msgstr "Esta conta está inativa."
#: literals.py:24
msgid "A5"
msgstr "A5"
#: literals.py:25
msgid "A4"
msgstr "A4"
#: literals.py:26
msgid "A3"
msgstr "A3"
#: literals.py:27
msgid "B5"
msgstr "B5"
#: literals.py:28
msgid "B4"
msgstr "B4"
#: literals.py:29
msgid "Letter"
msgstr "Carta"
#: literals.py:30
msgid "Legal"
msgstr "Legal"
#: literals.py:31
msgid "Ledger"
msgstr "Livro-razão"
#: literals.py:38
msgid "Portrait"
msgstr "Retrato"
#: literals.py:39
msgid "Landscape"
msgstr "Paisagem"
#: utils.py:291
msgid "function found"
msgstr "função encontrada"
#: utils.py:293 utils.py:295
#, python-format
msgid "class found: %s"
msgstr "classe encontrada: %s"
#: 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:41
msgid "No action selected."
msgstr "Nenhuma ação selecionada."
#: views.py:45
msgid "Must select at least one item."
msgstr "Deve selecionar pelo menos um item."
#: 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: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: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."
#: views.py:121
msgid "Add"
msgstr "Adicionar"
#: views.py:132
msgid "Remove"
msgstr "Remover"
#: views.py:155
msgid "current user details"
msgstr "detalhes atuais do usuário"
#: views.py:172
msgid "Current user's details updated."
msgstr "Detalhes do usuário atual atualizados."
#: views.py:181
msgid "edit current user details"
msgstr "editar os detalhes do usuário atual"
#: views.py:207
msgid "Changelog"
msgstr "Log de alterações"
#: views.py:220
msgid "License"
msgstr "Licença"
#: widgets.py:58
msgid "None"
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()"
msgstr ""
"Diretório temporário usado para armazenar miniaturas, previews e arquivos "
"temporários. Se nenhum for especificado, um será criado usando tempfile."
"mkdtemp()"
#: conf/settings.py:65
msgid ""
"Controls the mechanism used to authenticated user. Options are: username, "
"email"
msgstr ""
"Controla o mecanismo usado para usuário autenticado. As opções são: e-mail, "
"nome de usuário,"
#: templates/403.html:3 templates/403.html.py:7
msgid "Insufficient permissions"
msgstr "Permissões insuficientes"
#: templates/403.html:9
msgid "You don't have enough permissions for this operation."
msgstr "Você não tem permissões suficientes para esta operação."
#: templates/404.html:3 templates/404.html.py:7
msgid "Page not found"
msgstr "Página não encontrada"
#: templates/404.html:9
msgid "Sorry, but the requested page could not be found."
msgstr "Desculpe, mas a página solicitada não pôde ser encontrada."
#: templates/calculate_form_title.html:11
#, python-format
msgid "Details for %(object_name)s: %(object)s"
msgstr "Detalhes para %(object_name)s : %(object)s "
#: templates/calculate_form_title.html:13
#, python-format
msgid "Details for: %(object)s"
msgstr "Detalhes para: %(object)s "
#: templates/calculate_form_title.html:18
#, python-format
msgid "Edit %(object_name)s:"
msgstr "Editar %(object_name)s:"
#: templates/calculate_form_title.html:20
msgid "Edit"
msgstr "Editar"
#: templates/calculate_form_title.html:24
#, python-format
msgid "Create new %(object_name)s"
msgstr "Criar novas %(object_name)s "
#: templates/calculate_form_title.html:26
msgid "Create"
msgstr "Criar"
#: templates/generic_assign_remove.html:3
#, python-format
msgid "Assign %(title)s %(object)s"
msgstr "Atribuir %(title)s %(object)s "
#: templates/generic_confirm.html:3 templates/generic_confirm.html.py:18
msgid "Confirm"
msgstr "Confirmar"
#: templates/generic_confirm.html:16
msgid "Confirm delete"
msgstr "Confirmar exclusão"
#: templates/generic_confirm.html:32
msgid "form icon"
msgstr "ícone de formulário"
#: 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: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:50
msgid "Yes"
msgstr "Sim"
#: templates/generic_confirm.html:54
msgid "No"
msgstr "Não"
#: templates/generic_form_instance.html:37
#: templates/generic_form_subtemplate.html:52
msgid "required"
msgstr "exigido"
#: templates/generic_form_subtemplate.html:76
#: 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:52
#: templates/generic_list_subtemplate.html:178
msgid "Save"
msgstr "Salvar"
#: templates/generic_form_subtemplate.html:76
#: 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:52
#: templates/generic_list_subtemplate.html:178
msgid "Submit"
msgstr "Submeter"
#: 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:24
#, python-format
msgid ""
"List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page "
"%(page_number)s of %(total_pages)s)"
msgstr ""
"Lista de %(title)s (%(start)s - %(end)s de %(total)s) (Page %(page_number)s "
"of %(total_pages)s)"
#: templates/generic_list_horizontal_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_subtemplate.html:72
msgid "Identifier"
msgstr "Identificador"
#: templates/generic_list_subtemplate.html:152
#, python-format
msgid "There are no %(stripped_title)s"
msgstr "Não há %(stripped_title)s "
#: templates/login.html:5
msgid "Login"
msgstr "Login"
#: templates/password_change_done.html:3 templates/password_change_form.html:3
#: templates/password_change_form.html:5
msgid "Password change"
msgstr "Alterar a senha"
#~ msgid "Cancel"
#~ msgstr "Cancelar"
Binary file not shown.
+314 -15
View File
@@ -1,33 +1,332 @@
# 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"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-30 16:51+0300\n"
"PO-Revision-Date: 2011-01-30 13:08\n"
"Last-Translator: <garison2004@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"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 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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"X-Translated-Using: django-rosetta 0.5.5\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"
"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"
#: views.py:6 templates/password_change_done.html:5
#: __init__.py:17
msgid "change password"
msgstr "Изменение пароля"
#: __init__.py:18
msgid "user details"
msgstr "сведения о пользователе"
#: __init__.py:19
msgid "edit details"
msgstr "изменение сведений"
#: __init__.py:23 __init__.py:29
msgid "about"
msgstr "инфо"
#: __init__.py:24
msgid "changelog"
msgstr "изменения"
#: __init__.py:25
msgid "license"
msgstr "лицензия"
#: forms.py:99
msgid "Selection"
msgstr "Выбор"
#: forms.py:131
msgid "Email"
msgstr "Email"
#: forms.py:142
msgid ""
"Please enter a correct email and password. Note that the password fields is "
"case-sensitive."
msgstr ""
"Пожалуйста, введите правильный адрес электронной почты и пароль с учетом "
"регистра."
#: forms.py:144
msgid "This account is inactive."
msgstr "Эта учетная запись неактивна."
#: literals.py:24
msgid "A5"
msgstr "A5"
#: literals.py:25
msgid "A4"
msgstr "A4"
#: literals.py:26
msgid "A3"
msgstr "A3"
#: literals.py:27
msgid "B5"
msgstr "B5"
#: literals.py:28
msgid "B4"
msgstr "B4"
#: literals.py:29
msgid "Letter"
msgstr "Letter"
#: literals.py:30
msgid "Legal"
msgstr "Legal"
#: literals.py:31
msgid "Ledger"
msgstr "Ledger"
#: literals.py:38
msgid "Portrait"
msgstr "Портрет"
#: literals.py:39
msgid "Landscape"
msgstr "Пейзаж"
#: utils.py:291
msgid "function found"
msgstr "функция найдена"
#: utils.py:293 utils.py:295
#, python-format
msgid "class found: %s"
msgstr "класс найден: %s."
#: views.py:24 templates/password_change_done.html:5
msgid "Your password has been successfully changed."
msgstr "Ваш пароль был успешно изменен."
msgstr "Ваш пароль был изменен."
#: views.py:41
msgid "No action selected."
msgstr "Никаких действий не выбрано."
#: views.py:45
msgid "Must select at least one item."
msgstr "Необходимо выбрать хотя бы один элемент."
#: 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: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:103
#, python-format
msgid "%(selection)s added successfully removed from %(right_list_title)s."
msgstr "%(selection)s успешно удален из %(right_list_title)s ."
#: views.py:121
msgid "Add"
msgstr "Добавить"
#: views.py:132
msgid "Remove"
msgstr "Удалить"
#: views.py:155
msgid "current user details"
msgstr "данные пользователя"
#: views.py:172
msgid "Current user's details updated."
msgstr "Данные пользователя обновлены."
#: views.py:181
msgid "edit current user details"
msgstr "редактировать данные пользователя"
#: views.py:207
msgid "Changelog"
msgstr "Изменения"
#: views.py:220
msgid "License"
msgstr "Лицензия"
#: widgets.py:58
msgid "None"
msgstr "Ни один"
#: 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()"
msgstr ""
"Временный каталог, используемый сайтом для хранения миниатюр, превью и "
"временных файлов. Если он не указан, он будет создан с использованием "
"tempfile.mkdtemp ()"
#: conf/settings.py:65
msgid ""
"Controls the mechanism used to authenticated user. Options are: username, "
"email"
msgstr ""
"Управление механизмом, используемым для аутентификации пользователя. "
"Возможные варианты: имя пользователя, адрес электронной почты"
#: templates/403.html:3 templates/403.html.py:7
msgid "Insufficient permissions"
msgstr "Недостаточно прав"
#: templates/403.html:9
msgid "You don't have enough permissions for this operation."
msgstr "У вас недостаточно прав для этой операции."
#: templates/404.html:3 templates/404.html.py:7
msgid "Page not found"
msgstr "Страница не найдена"
#: templates/404.html:9
msgid "Sorry, but the requested page could not be found."
msgstr "Извините, но запрашиваемая страница не найдена."
#: templates/calculate_form_title.html:11
#, python-format
msgid "Details for %(object_name)s: %(object)s"
msgstr "Подробная информация для %(object_name)s : %(object)s"
#: templates/calculate_form_title.html:13
#, python-format
msgid "Details for: %(object)s"
msgstr "Подробности: %(object)s"
#: templates/calculate_form_title.html:18
#, python-format
msgid "Edit %(object_name)s:"
msgstr "Редактировать %(object_name)s :"
#: templates/calculate_form_title.html:20
msgid "Edit"
msgstr "Редактировать"
#: templates/calculate_form_title.html:24
#, python-format
msgid "Create new %(object_name)s"
msgstr "Создать %(object_name)s"
#: templates/calculate_form_title.html:26
msgid "Create"
msgstr "Создать"
#: templates/generic_assign_remove.html:3
#, python-format
msgid "Assign %(title)s %(object)s"
msgstr "Назначить %(title)s%(object)s"
#: templates/generic_confirm.html:3 templates/generic_confirm.html.py:18
msgid "Confirm"
msgstr "Подтверждать"
#: templates/generic_confirm.html:16
msgid "Confirm delete"
msgstr "Подтвердить удаление"
#: templates/generic_confirm.html:32
msgid "form icon"
msgstr "значок формы"
#: 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:42
#, python-format
msgid "Are you sure you wish to delete: %(object)s?"
msgstr "Вы действительно хотите удалить: %(object)s?"
#: templates/generic_confirm.html:50
msgid "Yes"
msgstr "Да"
#: templates/generic_confirm.html:54
msgid "No"
msgstr "Нет"
#: templates/generic_form_instance.html:37
#: templates/generic_form_subtemplate.html:52
msgid "required"
msgstr "требуется"
#: templates/generic_form_subtemplate.html:76
#: 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:52
#: templates/generic_list_subtemplate.html:178
msgid "Save"
msgstr "Сохранить"
#: templates/generic_form_subtemplate.html:76
#: 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:52
#: templates/generic_list_subtemplate.html:178
msgid "Submit"
msgstr "Выполнить"
#: templates/generic_list.html:6 templates/generic_list_horizontal.html:6
#, python-format
msgid "List of %(stripped_title)s"
msgstr "Список \"%(stripped_title)s\""
#: templates/generic_list_horizontal_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 "
"%(page_number)s of %(total_pages)s)"
msgstr ""
"Список %(title)s (%(start)s - %(end)s из %(total)s) (Page %(page_number)s из"
" %(total_pages)s)"
#: templates/generic_list_horizontal_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_subtemplate.html:72
msgid "Identifier"
msgstr "Идентификатор"
#: templates/generic_list_subtemplate.html:152
#, python-format
msgid "There are no %(stripped_title)s"
msgstr "Нет %(stripped_title)s"
#: templates/login.html:5
msgid "Login"
msgstr "Логин"
msgstr "Войти"
#: templates/password_change_done.html:3 templates/password_change_form.html:3
#: templates/password_change_form.html:5
msgid "Password change"
msgstr "Сменить пароль"
msgstr "Изменение пароля"
+5 -1
View File
@@ -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' %}" />
+7
View File
@@ -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))