matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hotfix/v0.12.2' into development

Browse Source 
Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py
This commit is contained in:
Roberto Rosario
2012-06-30 04:00:01 -04:00
parent 90c411f554 04de24ea51
commit 080d68c169
438 changed files with 12762 additions and 4473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/permissions/exceptions.py Normal file
View File

@@ -0,0 +1,5 @@
from django.core.exceptions import PermissionDenied as DjangoPermissionDenied
class PermissionDenied(DjangoPermissionDenied):
pass

BIN
apps/permissions/locale/de_DE/LC_MESSAGES/django.mo Normal file
View File

Binary file not shown.

205
apps/permissions/locale/de_DE/LC_MESSAGES/django.po Normal file
View File

@@ -0,0 +1,205 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# <tetja.rediske@googlemail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Mayan EDMS\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
"PO-Revision-Date: 2012-04-20 11:13+0000\n"
"Last-Translator: tetjarediske <tetja.rediske@googlemail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.net/projects/p/mayan-edms/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: __init__.py:17 models.py:209 views.py:40
msgid "roles"
msgstr "Rollen"
#: __init__.py:18
msgid "create new role"
msgstr "Erstelle neue Rolle"
#: __init__.py:19
msgid "edit"
msgstr "Bearbeiten"
#: __init__.py:20
msgid "members"
msgstr "Mitglieder"
#: __init__.py:21
msgid "role permissions"
msgstr "Rollen Rechte"
#: __init__.py:22
msgid "delete"
msgstr "Lösche"
#: __init__.py:24
msgid "grant"
msgstr "gewähre"
#: __init__.py:25
msgid "revoke"
msgstr "widerrufen"
#: models.py:51
msgid "Insufficient permissions."
msgstr "Unzureichende Rechte"
#: models.py:123 views.py:60
msgid "namespace"
msgstr "Namensraum"
#: models.py:124 views.py:61
msgid "name"
msgstr "Name"
#: models.py:131 models.py:187 views.py:152 views.py:215
msgid "permission"
msgstr "Recht"
#: models.py:132 views.py:57 views.py:154 views.py:217
msgid "permissions"
msgstr "Rechte"
#: models.py:195
msgid "permission holder"
msgstr "Rechte Inhaber"
#: models.py:196
msgid "permission holders"
msgstr "Rechte Inhaber"
#: models.py:204
msgid "label"
msgstr "Bezeichner"
#: models.py:208 models.py:239 views.py:76 views.py:93 views.py:117
#: views.py:334
msgid "role"
msgstr "Rolle"
#: models.py:255
msgid "role member"
msgstr "Rollen-Mitglied"
#: models.py:256
msgid "role members"
msgstr "Rollen-Mitglieder"
#: permissions.py:7
msgid "Permissions"
msgstr "Rechte"
#: permissions.py:9
msgid "View roles"
msgstr "Zeige Rolen"
#: permissions.py:10
msgid "Edit roles"
msgstr "Bearbeite Rolen"
#: permissions.py:11
msgid "Create roles"
msgstr "Erstelle Rollen"
#: permissions.py:12
msgid "Delete roles"
msgstr "Lösche Rollen"
#: permissions.py:13
msgid "Grant permissions"
msgstr "Gewähre Rechte"
#: permissions.py:14
msgid "Revoke permissions"
msgstr "Entziehe Rechte"
#: views.py:63
msgid "has permission"
msgstr "hat Recht"
#: views.py:149 views.py:212
msgid " and "
msgstr " und "
#: views.py:149 views.py:212
#, python-format
msgid "%(permissions)s to %(requester)s"
msgstr "%(permissions)s zu %(requester)s"
#: views.py:159
#, python-format
msgid "Permission \"%(permission)s\" granted to: %(requester)s."
msgstr "Recht \"%(permission)s\" gewährt zu: %(requester)s."
#: views.py:162
#, python-format
msgid "%(requester)s, already had the permission \"%(permission)s\" granted."
msgstr "%(requester)s hat das Recht \"%(permission)s bereits."
#: views.py:173
#, python-format
msgid ""
"Are you sure you wish to grant the %(permissions_label)s %(title_suffix)s?"
msgstr "Sind Sie sicher, dass Sie folgende Rechte gewähren wollen: %(permissions_label)s %(title_suffix)s"
#: views.py:222
#, python-format
msgid "Permission \"%(permission)s\" revoked from: %(requester)s."
msgstr "Recht \"%(permission)s\" widerrufen von: %(requester)s."
#: views.py:225
#, python-format
msgid "%(requester)s, doesn't have the permission \"%(permission)s\" granted."
msgstr "%(requester)s hat nicht das Recht \"%(permission)s\" zugeteilt."
#: views.py:236
#, python-format
msgid ""
"Are you sure you wish to revoke the %(permissions_label)s %(title_suffix)s?"
msgstr "Sind Sie sicher, dass Sie folgende Rechte widerrufen wollen: %(permissions_label)s %(title_suffix)s"
#: views.py:271 views.py:295
msgid "Users"
msgstr "Benutzer"
#: views.py:274 views.py:298
msgid "Groups"
msgstr "Gruppen"
#: views.py:277 views.py:301
msgid "Special"
msgstr "Spezial"
#: views.py:330
#, python-format
msgid "non members of role: %s"
msgstr "Nicht Mitglieder der Rolle: %s"
#: views.py:331
#, python-format
msgid "members of role: %s"
msgstr "Mitglieder der Rolle: %s"
#: widgets.py:16
msgid "Revoke"
msgstr "Widerrufen"
#: widgets.py:21
msgid "Grant"
msgstr "Gewähre"
#: conf/settings.py:10
msgid ""
"A list of existing roles that are automatically assigned to newly created "
"users"
msgstr "Eine Liste der existierenden Rollen, welche automatisch neuen Benutzern zugewiesen werden"

2
apps/permissions/locale/en/LC_MESSAGES/django.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-12 15:20-0400\n"
"POT-Creation-Date: 2012-06-17 19:03-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"

BIN
apps/permissions/locale/es/LC_MESSAGES/django.mo
View File

Binary file not shown.

21
apps/permissions/locale/es/LC_MESSAGES/django.po
View File

@@ -1,22 +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:
# Roberto Rosario <roberto.rosario.gonzalez@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Mayan EDMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-12 15:20-0400\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
"PO-Revision-Date: 2012-02-12 00:25+0000\n"
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"mayan-edms/team/es/)\n"
"Language: es\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mayan-edms/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 models.py:209 views.py:40
@@ -151,8 +150,7 @@ msgstr "%(requester)s, ya tenía el permiso \"%(permission)s\" concedido."
#, python-format
msgid ""
"Are you sure you wish to grant the %(permissions_label)s %(title_suffix)s?"
msgstr ""
"¿Está seguro que desea otorgar el %(permissions_label)s %(title_suffix)s?"
msgstr "¿Está seguro que desea otorgar el %(permissions_label)s %(title_suffix)s?"
#: views.py:222
#, python-format
@@ -168,8 +166,7 @@ msgstr "%(requester)s, no tiene el permiso \"%(permission)s\" concedido."
#, python-format
msgid ""
"Are you sure you wish to revoke the %(permissions_label)s %(title_suffix)s?"
msgstr ""
"¿Estás seguro que quiere revocar el %(permissions_label)s %(title_suffix)s?"
msgstr "¿Estás seguro que quiere revocar el %(permissions_label)s %(title_suffix)s?"
#: views.py:271 views.py:295
msgid "Users"
@@ -205,6 +202,4 @@ msgstr "Otorgar"
msgid ""
"A list of existing roles that are automatically assigned to newly created "
"users"
msgstr ""
"Una lista de funciones existentes que se asignan automáticamente a los "
"usuarios nuevos"
msgstr "Una lista de funciones existentes que se asignan automáticamente a los usuarios nuevos"

BIN
apps/permissions/locale/it/LC_MESSAGES/django.mo
View File

Binary file not shown.

2
apps/permissions/locale/it/LC_MESSAGES/django.po
View File

@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mayan EDMS\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-02-12 15:20-0400\n"
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
"PO-Revision-Date: 2012-03-21 13:31+0000\n"
"Last-Translator: Pierpaolo Baldan <pierpaolo.baldan@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/mayan-edms/language/it/)\n"

BIN
apps/permissions/locale/pl/LC_MESSAGES/django.mo
View File

Binary file not shown.

2
apps/permissions/locale/pl/LC_MESSAGES/django.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mayan EDMS\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-02-12 15:20-0400\n"
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
"PO-Revision-Date: 2012-02-20 16:08+0000\n"
"Last-Translator: mic <winterfall24@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/mayan-edms/language/pl/)\n"

BIN
apps/permissions/locale/pt/LC_MESSAGES/django.mo
View File

Binary file not shown.

32
apps/permissions/locale/pt/LC_MESSAGES/django.po
View File

@@ -1,22 +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.
# Roberto Rosario <roberto.rosario.gonzalez@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Mayan EDMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-12 15:20-0400\n"
"PO-Revision-Date: 2012-02-02 18:18+0000\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
"PO-Revision-Date: 2012-03-12 06:04+0000\n"
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/"
"team/pt/)\n"
"Language: pt\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/mayan-edms/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 models.py:209 views.py:40
@@ -45,11 +45,11 @@ msgstr "excluir"
#: __init__.py:24
msgid "grant"
msgstr ""
msgstr "conceder"
#: __init__.py:25
msgid "revoke"
msgstr ""
msgstr "revogar"
#: models.py:51
msgid "Insufficient permissions."
@@ -126,11 +126,11 @@ msgstr "Revogar as permissões"
#: views.py:63
msgid "has permission"
msgstr ""
msgstr "tem permissão"
#: views.py:149 views.py:212
msgid " and "
msgstr ""
msgstr " e "
#: views.py:149 views.py:212
#, python-format
@@ -171,15 +171,15 @@ msgstr ""
#: views.py:271 views.py:295
msgid "Users"
msgstr ""
msgstr "Usuários"
#: views.py:274 views.py:298
msgid "Groups"
msgstr ""
msgstr "Grupos"
#: views.py:277 views.py:301
msgid "Special"
msgstr ""
msgstr "Especial"
#: views.py:330
#, python-format
@@ -203,6 +203,4 @@ msgstr "Conceder"
msgid ""
"A list of existing roles that are automatically assigned to newly created "
"users"
msgstr ""
"A lista de funções existentes que são automaticamente designados para "
"usuários recém-criados"
msgstr "A lista de funções existentes que são automaticamente designados para usuários recém-criados"

BIN
apps/permissions/locale/ru/LC_MESSAGES/django.mo
View File

Binary file not shown.

30
apps/permissions/locale/ru/LC_MESSAGES/django.po
View File

@@ -1,24 +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:
# Sergey Glita <gsv70@mail.ru>, 2011.
# Sergey Glita <gsv70@mail.ru>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Mayan EDMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-12 15:20-0400\n"
"PO-Revision-Date: 2012-02-02 18:18+0000\n"
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/team/"
"ru/)\n"
"Language: ru\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
"PO-Revision-Date: 2012-02-03 05:06+0000\n"
"Last-Translator: Sergey Glita <gsv70@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/mayan-edms/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"
"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:17 models.py:209 views.py:40
msgid "roles"
@@ -172,15 +170,15 @@ msgstr "Вы хотите отозвать %(permissions_label)s %(title_suffix)
#: views.py:271 views.py:295
msgid "Users"
msgstr ""
msgstr "Пользователи"
#: views.py:274 views.py:298
msgid "Groups"
msgstr ""
msgstr "Группы"
#: views.py:277 views.py:301
msgid "Special"
msgstr ""
msgstr "Особо"
#: views.py:330
#, python-format
@@ -204,6 +202,4 @@ msgstr "Предоставить"
msgid ""
"A list of existing roles that are automatically assigned to newly created "
"users"
msgstr ""
"Список существующих ролей, которые автоматически назначаются вновь "
"создаваемым пользователям"
msgstr "Список существующих ролей, которые автоматически назначаются вновь создаваемым пользователям"