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

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

Binary file not shown.

936
apps/converter/locale/de_DE/LC_MESSAGES/django.po Normal file
View File

File diff suppressed because it is too large Load Diff

6
apps/converter/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:02-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"
@@ -919,6 +919,10 @@ msgid ""
"but less prone to segmentation faults."
msgstr ""
#: conf/settings.py:18
msgid "Path to the libreoffice program."
msgstr ""
#: templates/converter_file_formats_help.html:3
msgid "Help"
msgstr ""

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

Binary file not shown.

54
apps/converter/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.
# 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"
"PO-Revision-Date: 2011-12-14 14:37+0000\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-06-17 18:08-0400\n"
"PO-Revision-Date: 2012-06-17 22:21+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:15
@@ -474,8 +473,7 @@ msgstr "Magick Image File Format"
#: 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)"
msgstr "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
#: literals.py:178
msgid "Raw Bi-level bitmap in least-significant-byte first order"
@@ -636,24 +634,19 @@ 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)"
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)"
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)"
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:230
msgid "Portable anymap"
@@ -913,11 +906,10 @@ msgstr "Ruta de archivo al programa imagemagick."
#: conf/settings.py:15
msgid ""
"Graphics conversion backend to use. Options are: converter.backends."
"imagemagick, converter.backends.graphicsmagick and converter.backends.python."
msgstr ""
"Manejador de conversión a usarse. Opciones son: converter.backends."
"imagemagick, converter.backends.graphicsmagick y converter.backends.python."
"Graphics conversion backend to use. Options are: "
"converter.backends.imagemagick, converter.backends.graphicsmagick and "
"converter.backends.python."
msgstr "Manejador de conversión a usarse. Opciones son: converter.backends.imagemagick, converter.backends.graphicsmagick y converter.backends.python."
#: conf/settings.py:16
msgid "Path to the unoconv program."
@@ -925,11 +917,13 @@ 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."
"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."
#: conf/settings.py:18
msgid "Path to the libreoffice program."
msgstr "Ruta de acceso al programa LibreOffice."
#: templates/converter_file_formats_help.html:3
msgid "Help"
@@ -940,6 +934,4 @@ msgstr "Ayuda"
msgid ""
"These are the file formats supported by the currently selected converter "
"backend. In this case: '%(backend)s'"
msgstr ""
"Estos son los formatos de archivo apoyados por el servidor del convertidor "
"seleccionado. En este caso: '%(backend)s'"
msgstr "Estos son los formatos de archivo apoyados por el servidor del convertidor seleccionado. En este caso: '%(backend)s'"

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

Binary file not shown.

10
apps/converter/locale/it/LC_MESSAGES/django.po
View File

@@ -8,9 +8,9 @@ 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"
"PO-Revision-Date: 2011-12-09 14:53+0000\n"
"Last-Translator: Pierpaolo Baldan <pierpaolo.baldan@gmail.com>\n"
"POT-Creation-Date: 2012-06-17 18:08-0400\n"
"PO-Revision-Date: 2012-06-17 22:11+0000\n"
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/mayan-edms/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -921,6 +921,10 @@ msgid ""
" but less prone to segmentation faults."
msgstr "Utilizzare il metodo alternativo di collegamento a LibreOffice utilizzando questo collegamento, è più lento ma meno soggetto a errori di segmentazione."
#: conf/settings.py:18
msgid "Path to the libreoffice program."
msgstr ""
#: templates/converter_file_formats_help.html:3
msgid "Help"
msgstr "Aiuto"

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

Binary file not shown.

10
apps/converter/locale/pl/LC_MESSAGES/django.po
View File

@@ -8,9 +8,9 @@ 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"
"PO-Revision-Date: 2012-02-20 17:09+0000\n"
"Last-Translator: mic <winterfall24@gmail.com>\n"
"POT-Creation-Date: 2012-06-17 18:08-0400\n"
"PO-Revision-Date: 2012-06-17 22:11+0000\n"
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/mayan-edms/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -921,6 +921,10 @@ msgid ""
" but less prone to segmentation faults."
msgstr ""
#: conf/settings.py:18
msgid "Path to the libreoffice program."
msgstr ""
#: templates/converter_file_formats_help.html:3
msgid "Help"
msgstr ""

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

Binary file not shown.

48
apps/converter/locale/pt/LC_MESSAGES/django.po
View File

@@ -1,23 +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.
# Renata Oliveira <renatabels@gmail.com>, 2011.
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: 2011-11-22 15:26+0000\n"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-06-17 18:08-0400\n"
"PO-Revision-Date: 2012-06-17 22:11+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:15
@@ -475,8 +474,7 @@ msgstr "Magick Image File Format"
#: 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)"
msgstr "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
#: literals.py:178
msgid "Raw Bi-level bitmap in least-significant-byte first order"
@@ -637,24 +635,19 @@ 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)"
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)"
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)"
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:230
msgid "Portable anymap"
@@ -914,11 +907,10 @@ msgstr "Caminho do arquivo para o programa graphicsmagick."
#: conf/settings.py:15
msgid ""
"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."
"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
msgid "Path to the unoconv program."
@@ -926,8 +918,12 @@ 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."
"Use alternate method of connection to LibreOffice using a pipe, it is slower"
" but less prone to segmentation faults."
msgstr ""
#: conf/settings.py:18
msgid "Path to the libreoffice program."
msgstr ""
#: templates/converter_file_formats_help.html:3
@@ -939,6 +935,4 @@ msgstr "Ajuda"
msgid ""
"These are the file formats supported by the currently selected converter "
"backend. In this case: '%(backend)s'"
msgstr ""
"Estes são os formatos de arquivos suportados pelo servidor conversor "
"selecionado. Neste caso: ' %(backend)s '"
msgstr "Estes são os formatos de arquivos suportados pelo servidor conversor selecionado. Neste caso: ' %(backend)s '"

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

Binary file not shown.

54
apps/converter/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.
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: 2011-11-22 19:01+0000\n"
"Last-Translator: Sergey Glita <gsv70@mail.ru>\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:08-0400\n"
"PO-Revision-Date: 2012-06-17 22:11+0000\n"
"Last-Translator: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>\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:15
msgid "file formats"
@@ -475,8 +473,7 @@ msgstr "Magick Image File Format"
#: 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)"
msgstr "Multiple-image Network Graphics (libpng 1.2.42,1.2.44, zlib 1.2.3.3,1.2.3.4)"
#: literals.py:178
msgid "Raw Bi-level bitmap in least-significant-byte first order"
@@ -637,24 +634,19 @@ 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)"
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)"
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)"
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:230
msgid "Portable anymap"
@@ -914,11 +906,10 @@ msgstr "Путь к файлу программs GraphicsMagick."
#: conf/settings.py:15
msgid ""
"Graphics conversion backend to use. Options are: converter.backends."
"imagemagick, converter.backends.graphicsmagick and converter.backends.python."
msgstr ""
"Конвертер графических файлов. Возможные варианты: converter.backends."
"imagemagick, converter.backends.graphicsmagick и converter.backends.python."
"Graphics conversion backend to use. Options are: "
"converter.backends.imagemagick, converter.backends.graphicsmagick and "
"converter.backends.python."
msgstr "Конвертер графических файлов. Возможные варианты: converter.backends.imagemagick, converter.backends.graphicsmagick и converter.backends.python."
#: conf/settings.py:16
msgid "Path to the unoconv program."
@@ -926,11 +917,13 @@ 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."
"Use alternate method of connection to LibreOffice using a pipe, it is slower"
" but less prone to segmentation faults."
msgstr "Использовать альтернативный способ подключения к LibreOffice использованием конвейера pipe, это медленнее, но менее опасно ошибкой сегментации."
#: conf/settings.py:18
msgid "Path to the libreoffice program."
msgstr ""
"Использовать альтернативный способ подключения к LibreOffice использованием "
"конвейера pipe, это медленнее, но менее опасно ошибкой сегментации."
#: templates/converter_file_formats_help.html:3
msgid "Help"
@@ -941,5 +934,4 @@ msgstr "Помощь"
msgid ""
"These are the file formats supported by the currently selected converter "
"backend. In this case: '%(backend)s'"
msgstr ""
"Эти форматы поддерживают выбранный конвертер. Сейчас это: '%(backend)s'"
msgstr "Эти форматы поддерживают выбранный конвертер. Сейчас это: '%(backend)s'"