Merge branch 'hotfix/v0.12.2' into development
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
BIN
apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo
Normal file
BIN
apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo
Normal file
Binary file not shown.
75
apps/web_theme/locale/de_DE/LC_MESSAGES/django.po
Normal file
75
apps/web_theme/locale/de_DE/LC_MESSAGES/django.po
Normal file
@@ -0,0 +1,75 @@
|
||||
# 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:40+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"
|
||||
|
||||
#: conf/settings.py:10
|
||||
msgid ""
|
||||
"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
|
||||
"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
|
||||
"warehouse."
|
||||
msgstr "Anzuwendendes CSS Theme, Optionen sind: 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 "Zeige extra Informationen auf dem Login-Bildschirm"
|
||||
|
||||
#: templates/web_theme_base.html:101
|
||||
msgid "dismiss all notifications"
|
||||
msgstr "Bestätige alle Benachrichtigungen"
|
||||
|
||||
#: templates/web_theme_base.html:101
|
||||
msgid "close all"
|
||||
msgstr "Schließe Alle"
|
||||
|
||||
#: templates/web_theme_base.html:102
|
||||
msgid "dismiss this notification"
|
||||
msgstr "Bestätige diese Benachrichtigung"
|
||||
|
||||
#: templates/web_theme_base.html:102
|
||||
msgid "close"
|
||||
msgstr "Schließen"
|
||||
|
||||
#: templates/web_theme_login.html:12 templates/web_theme_login.html.py:34
|
||||
msgid "Login"
|
||||
msgstr "Login"
|
||||
|
||||
#: templates/web_theme_login.html:18
|
||||
msgid "You are already logged in"
|
||||
msgstr "Sind sind bereits angemeldet"
|
||||
|
||||
#: templates/web_theme_login.html:21
|
||||
msgid "Redirecting you to the website entry point in 5 seconds."
|
||||
msgstr "Umleitung zur Startseite in 5 Sekunden."
|
||||
|
||||
#: templates/web_theme_login.html:24
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
|
||||
"work."
|
||||
msgstr "Oder klicken <a href=\"%(LOGIN_REDIRECT_URL)s\">hier</a>, wenn die Umleitung nicht funktioniert."
|
||||
|
||||
#: templates/pagination/pagination.html:6
|
||||
#: templates/pagination/pagination.html:8
|
||||
msgid "Previous"
|
||||
msgstr "Zurück"
|
||||
|
||||
#: templates/pagination/pagination.html:26
|
||||
#: templates/pagination/pagination.html:28
|
||||
msgid "Next"
|
||||
msgstr "Weiter"
|
||||
@@ -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"
|
||||
|
||||
Binary file not shown.
@@ -1,21 +1,20 @@
|
||||
# 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:09-0400\n"
|
||||
"PO-Revision-Date: 2011-11-03 21:44+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"
|
||||
|
||||
#: conf/settings.py:10
|
||||
@@ -23,10 +22,7 @@ msgid ""
|
||||
"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
|
||||
"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
|
||||
"warehouse."
|
||||
msgstr ""
|
||||
"Tema CSS para aplicar, las opciones son: amro, bec, bec-green, blue, "
|
||||
"default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-"
|
||||
"greenish y warehouse."
|
||||
msgstr "Tema CSS para aplicar, las opciones son: amro, bec, bec-green, blue, default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish y warehouse."
|
||||
|
||||
#: conf/settings.py:12
|
||||
msgid "Display extra information in the login screen."
|
||||
@@ -65,9 +61,7 @@ msgstr "Se va a redirigir al punto de entrada al sitio web en 5 segundos."
|
||||
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."
|
||||
msgstr "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
|
||||
|
||||
Binary file not shown.
@@ -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 18:07+0000\n"
|
||||
"Last-Translator: Pierpaolo Baldan <pierpaolo.baldan@gmail.com>\n"
|
||||
"POT-Creation-Date: 2012-06-17 18:09-0400\n"
|
||||
"PO-Revision-Date: 2012-06-08 07:17+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"
|
||||
@@ -35,7 +36,7 @@ msgstr "Smetti tutte le notifiche"
|
||||
|
||||
#: templates/web_theme_base.html:101
|
||||
msgid "close all"
|
||||
msgstr "ciudi tutto"
|
||||
msgstr "chiudi tutto"
|
||||
|
||||
#: templates/web_theme_base.html:102
|
||||
msgid "dismiss this notification"
|
||||
@@ -51,7 +52,7 @@ msgstr "Login"
|
||||
|
||||
#: templates/web_theme_login.html:18
|
||||
msgid "You are already logged in"
|
||||
msgstr "Sei pronto per entrare"
|
||||
msgstr "Sei già loggato"
|
||||
|
||||
#: templates/web_theme_login.html:21
|
||||
msgid "Redirecting you to the website entry point in 5 seconds."
|
||||
|
||||
Binary file not shown.
@@ -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 17:16+0000\n"
|
||||
"Last-Translator: mic <winterfall24@gmail.com>\n"
|
||||
"Language-Team: Polish (http://www.transifex.net/projects/p/mayan-edms/language/pl/)\n"
|
||||
|
||||
Binary file not shown.
@@ -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:09-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: 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"
|
||||
|
||||
#: conf/settings.py:10
|
||||
@@ -24,10 +23,7 @@ msgid ""
|
||||
"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
|
||||
"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."
|
||||
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."
|
||||
|
||||
#: conf/settings.py:12
|
||||
msgid "Display extra information in the login screen."
|
||||
@@ -66,9 +62,7 @@ msgstr "Redirecionando você para o ponto de entrada do site em 5 segundos."
|
||||
msgid ""
|
||||
"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
|
||||
"work."
|
||||
msgstr ""
|
||||
"Ou clique <a href=\"%(LOGIN_REDIRECT_URL)s\">aqui</a> se o redirecionamento "
|
||||
"não funcionar."
|
||||
msgstr "Ou clique <a href=\"%(LOGIN_REDIRECT_URL)s\">aqui</a> se o redirecionamento não funcionar."
|
||||
|
||||
#: templates/pagination/pagination.html:6
|
||||
#: templates/pagination/pagination.html:8
|
||||
|
||||
Binary file not shown.
@@ -1,33 +1,28 @@
|
||||
# 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:09-0400\n"
|
||||
"PO-Revision-Date: 2011-11-04 15:22+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"
|
||||
|
||||
#: conf/settings.py:10
|
||||
msgid ""
|
||||
"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
|
||||
"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
|
||||
"warehouse."
|
||||
msgstr ""
|
||||
"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-"
|
||||
"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and "
|
||||
"warehouse."
|
||||
msgstr "CSS theme to apply, options are: 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."
|
||||
@@ -66,9 +61,7 @@ msgstr "Перенаправит вас на вход веб-сайта чере
|
||||
msgid ""
|
||||
"Or click <a href=\"%(LOGIN_REDIRECT_URL)s\">here</a> if redirection doesn't "
|
||||
"work."
|
||||
msgstr ""
|
||||
"Или нажмите <a href=\"%(LOGIN_REDIRECT_URL)s\">здесь</a> , если "
|
||||
"перенаправление не работает."
|
||||
msgstr "Или нажмите <a href=\"%(LOGIN_REDIRECT_URL)s\">здесь</a> , если перенаправление не работает."
|
||||
|
||||
#: templates/pagination/pagination.html:6
|
||||
#: templates/pagination/pagination.html:8
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{% extends "web_theme_base.html" %}
|
||||
{% load i18n %}
|
||||
{% load theme_tags %}
|
||||
{% load autoadmin_tags %}
|
||||
|
||||
{% block web_theme_head %}
|
||||
{% if user.is_authenticated %}
|
||||
@@ -28,27 +29,42 @@
|
||||
{% endblock %}
|
||||
{% else %}
|
||||
{% block content_plain %}
|
||||
{% auto_admin_properties %}
|
||||
{% if auto_admin_properties.account %}
|
||||
<div id="box">
|
||||
<h1>{% block project_name %}{% endblock %}</h1>
|
||||
<div class="block" id="block-login">
|
||||
<h2>{% trans "Login" %}</h2>
|
||||
<h2>{% trans "First time login" %}</h2>
|
||||
<div class="content login">
|
||||
<form action="." method="post" class="form login">{% csrf_token %}
|
||||
<div class="group wat-cf">
|
||||
{% include "generic_form_instance.html" %}
|
||||
<input type="hidden" name="next" value="{{ next|escape }}" />
|
||||
<div class="group navform wat-cf">
|
||||
<button class="button" type="submit">
|
||||
<img src="{{ STATIC_URL }}web_theme_media/images/icons/key.png" alt="Save" /> Login
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
<p>{% trans "You have just finished installing <strong>Mayan EDMS</strong>, congratulations!" %}</p>
|
||||
<p>{% trans "Login using the following credentials:" %}</p>
|
||||
<p>{% blocktrans with auto_admin_properties.account as account %}Username: <strong>{{ account }}</strong>{% endblocktrans %}</p>
|
||||
<p>{% blocktrans with auto_admin_properties.password as password %}Password: <strong>{{ password }}</strong>{% endblocktrans %}</p>
|
||||
<p>{% trans "Be sure to change the password to increase security and to disable this message." %}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% get_web_theme_setting "VERBOSE_LOGIN" as verbose_login %}
|
||||
{% if verbose_login %}
|
||||
{% include "verbose_login.html" %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<div id="box">
|
||||
<h1>{% block project_name %}{% endblock %}</h1>
|
||||
<div class="block" id="block-login">
|
||||
<h2>{% trans "Login" %}</h2>
|
||||
<div class="content login">
|
||||
<form action="." method="post" class="form login">{% csrf_token %}
|
||||
<div class="group wat-cf">
|
||||
{% include "generic_form_instance.html" %}
|
||||
<input type="hidden" name="next" value="{{ next|escape }}" />
|
||||
<div class="group navform wat-cf">
|
||||
<button class="button" type="submit">
|
||||
<img src="{{ STATIC_URL }}web_theme_media/images/icons/key.png" alt="Save" /> Login
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% get_web_theme_setting "VERBOSE_LOGIN" as verbose_login %}
|
||||
{% if verbose_login %}
|
||||
{% include "verbose_login.html" %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user