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/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo Normal file
View File

Binary file not shown.

115
apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.po Normal file
View File

@@ -0,0 +1,115 @@
# 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:08-0400\n"
"PO-Revision-Date: 2012-04-20 18:24+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:5
msgid "search"
msgstr "suchen"
#: __init__.py:6 views.py:72
msgid "advanced search"
msgstr "Erweiterte Suche"
#: __init__.py:7
msgid "search again"
msgstr "Erneut suchen"
#: forms.py:8
msgid "Search terms"
msgstr "Suchbegriffe"
#: models.py:20
msgid "user"
msgstr "Benutzer"
#: models.py:21
msgid "query"
msgstr "Abfrage"
#: models.py:22
msgid "datetime created"
msgstr "Erstellungsdatum"
#: models.py:23
msgid "hits"
msgstr "Treffer"
#: models.py:61
msgid "recent search"
msgstr "letzte Suche"
#: models.py:62
msgid "recent searches"
msgstr "letzte Suchen"
#: views.py:33
#, python-format
msgid "results, (showing only %(shown_result_count)s out of %(result_count)s)"
msgstr "Erebnis: (Zeige nur %(shown_result_count)s von %(result_count)s) "
#: views.py:37
msgid "results"
msgstr "Ergebnis"
#: views.py:56
#, python-format
msgid "Search error: %s"
msgstr "Fehler bei Suche: %s"
#: views.py:60
msgid "type"
msgstr "Typ"
#: views.py:76 views.py:86 views.py:88 templatetags/search_tags.py:19
#: templatetags/search_tags.py:20
msgid "Search"
msgstr "Suche"
#: conf/settings.py:12
msgid "Maximum amount search hits to fetch and display."
msgstr "Maximale Anzahl von Treffern die gehohlt und angezeigt werden."
#: conf/settings.py:13
msgid "Maximum number of search queries to remember per user."
msgstr "Maximale Anzahl von Suchanfrage die pro Benutzer gespeichert werden."
#: templates/search_help.html:3
msgid "Help"
msgstr "Hilfe"
#: templates/search_help.html:4
#, python-format
msgid ""
"Enter the desired search keywords separated by space. Only the top "
"%(search_results_limit)s results will be available."
msgstr "Die gesuchten Wörter mit Leerzeichen getrennt eingeben. Nur die %(search_results_limit)s Ergebnisse werden angezeigt."
#: templates/search_results.html:3
msgid "Search results"
msgstr "Such-Ergebnisse"
#: templates/search_results.html:19
#, python-format
msgid "Elapsed time: %(time_delta)s seconds"
msgstr "Verstrichene Zeit: %(time_delta)s Sekunden"
#: templatetags/search_tags.py:33
#, python-format
msgid "recent searches (maximum of %d)"
msgstr "Letzte Suchvorgänge (Maximal %d)"

2
apps/dynamic_search/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"

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

Binary file not shown.

19
apps/dynamic_search/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.
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:08-0400\n"
"PO-Revision-Date: 2011-11-04 17:06+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:5
@@ -62,8 +61,7 @@ msgstr "búsquedas recientes"
#: views.py:33
#, python-format
msgid "results, (showing only %(shown_result_count)s out of %(result_count)s)"
msgstr ""
"resultados, (mostrando solamente %(shown_result_count)s de %(result_count)s)"
msgstr "resultados, (mostrando solamente %(shown_result_count)s de %(result_count)s)"
#: views.py:37
msgid "results"
@@ -100,10 +98,7 @@ msgstr "Ayuda"
msgid ""
"Enter the desired search keywords separated by space. Only the top "
"%(search_results_limit)s results will be available."
msgstr ""
"Introduzca las palabras clave de búsqueda que desee separadas por un "
"espacio. Sólo los primeros %(search_results_limit)s resultados estarán "
"disponibles."
msgstr "Introduzca las palabras clave de búsqueda que desee separadas por un espacio. Sólo los primeros %(search_results_limit)s resultados estarán disponibles."
#: templates/search_results.html:3
msgid "Search results"

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

Binary file not shown.

9
apps/dynamic_search/locale/it/LC_MESSAGES/django.po
View File

@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Carlo Zanatto <>, 2012.
# <pierpaolo.baldan@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: 2012-02-12 15:20-0400\n"
"PO-Revision-Date: 2011-12-09 15:32+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-08 07:42+0000\n"
"Last-Translator: Carlo Zanatto <>\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"
@@ -112,4 +113,4 @@ msgstr "Tempo trascorso: %(time_delta)s in secondi"
#: templatetags/search_tags.py:33
#, python-format
msgid "recent searches (maximum of %d)"
msgstr "ricerche recenti (maximum of %d)"
msgstr "ricerche recenti (un massimo di %d)"

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

Binary file not shown.

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

@@ -10,7 +10,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:08-0400\n"
"PO-Revision-Date: 2012-02-21 15:21+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/dynamic_search/locale/pt/LC_MESSAGES/django.mo
View File

Binary file not shown.

18
apps/dynamic_search/locale/pt/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:
# <dev.emerson@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"
"Report-Msgid-Bugs-To: http://github.com/rosarior/mayan/issues\n"
"POT-Creation-Date: 2012-06-17 18:08-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: 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:5
@@ -62,8 +61,7 @@ msgstr "pesquisas recentes"
#: views.py:33
#, python-format
msgid "results, (showing only %(shown_result_count)s out of %(result_count)s)"
msgstr ""
"resultados, (mostrando apenas %(shown_result_count)s de %(result_count)s )"
msgstr "resultados, (mostrando apenas %(shown_result_count)s de %(result_count)s )"
#: views.py:37
msgid "results"
@@ -100,9 +98,7 @@ msgstr "Ajuda"
msgid ""
"Enter the desired search keywords separated by space. Only the top "
"%(search_results_limit)s results will be available."
msgstr ""
"Digite as palavras-chave da pesquisa desejada separadas por um espaço. "
"Apenas o máximo %(search_results_limit)s resultados estarão disponíveis."
msgstr "Digite as palavras-chave da pesquisa desejada separadas por um espaço. Apenas o máximo %(search_results_limit)s resultados estarão disponíveis."
#: templates/search_results.html:3
msgid "Search results"

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

Binary file not shown.

25
apps/dynamic_search/locale/ru/LC_MESSAGES/django.po
View File

@@ -1,23 +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: \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:08-0400\n"
"PO-Revision-Date: 2011-11-03 22:40+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"
"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:5
msgid "search"
@@ -62,8 +60,7 @@ msgstr "последние запросы"
#: views.py:33
#, python-format
msgid "results, (showing only %(shown_result_count)s out of %(result_count)s)"
msgstr ""
"результаты, (показывая только %(shown_result_count)s из %(result_count)s)"
msgstr "результаты, (показывая только %(shown_result_count)s из %(result_count)s)"
#: views.py:37
msgid "results"
@@ -89,9 +86,7 @@ msgstr "Максимальное количество отображаемых
#: conf/settings.py:13
msgid "Maximum number of search queries to remember per user."
msgstr ""
"Максимальное количество поисковых запросов запоминаемых для каждого "
"пользователя."
msgstr "Максимальное количество поисковых запросов запоминаемых для каждого пользователя."
#: templates/search_help.html:3
msgid "Help"
@@ -102,9 +97,7 @@ msgstr "Помощь"
msgid ""
"Enter the desired search keywords separated by space. Only the top "
"%(search_results_limit)s results will be available."
msgstr ""
"Введите ключевые слова для поиска желаемого через пробел. Только первые "
"%(search_results_limit)s будут доступны."
msgstr "Введите ключевые слова для поиска желаемого через пробел. Только первые %(search_results_limit)s будут доступны."
#: templates/search_results.html:3
msgid "Search results"