Merge branch 'master' of github.com:tonioo/modoboa

doc/integration/web_servers.rst

@@ -227,7 +227,7 @@ Here is a sample nginx configuration::
         location <modoba's root url>/ {
             include uwsgi_params;
             uwsgi_pass <uwsgi port>;
-            uwsgi_param UWSGI_SCRIPT <modoboa instance name>.wsgi:application
+            uwsgi_param UWSGI_SCRIPT <modoboa instance name>.wsgi:application;
             uwsgi_param UWSGI_SCHEME https;
         }
     }

modoboa/extensions/admin/app_settings.py

@@ -19,7 +19,7 @@ class AdminParametersForm(parameters.AdminParametersForm):
     )
 
     mailboxes_owner = forms.CharField(
-        label=ugettext_lazy("Mailboxes ower"),
+        label=ugettext_lazy("Mailboxes owner"),
         initial="vmail",
         help_text=ugettext_lazy("The UNIX account who owns mailboxes on the filesystem")
     )

modoboa/locale/cs_CZ/LC_MESSAGES/django.po

@@ -661,7 +661,7 @@ msgstr ""
 "přejmenovány nebo odstraněny v Modoboa"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Vlastník schránek"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/de/LC_MESSAGES/django.po

@@ -658,7 +658,7 @@ msgid "Rename or remove mailboxes on the filesystem when they get renamed or rem
 msgstr "Mailboxen auch in Dateisystem umbenennen oder entfernen wenn sie in Modoboa umbenannt oder entfernt werden"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Mailbox-Besitzer"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/en/LC_MESSAGES/django.po

@@ -623,7 +623,7 @@ msgid ""
 msgstr ""
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr ""
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/es/LC_MESSAGES/django.po

@@ -663,7 +663,7 @@ msgstr ""
 "renombrados o eliminados dentro de Modoboa"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Propietario de los mailboxes"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/fr/LC_MESSAGES/django.po

@@ -661,7 +661,7 @@ msgstr ""
 "renommées ou supprimées dans Modoboa"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Propriétaire des boites"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/it/LC_MESSAGES/django.po

@@ -651,7 +651,7 @@ msgstr ""
 "o rimosse in Modoboa"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Proprietario delle caselle postali"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/nl_NL/LC_MESSAGES/django.po

@@ -622,7 +622,7 @@ msgid ""
 msgstr "Hernoem of verwijder mailboxen op het bestandssysteem wanner ze hernoemd of verwijderd worden in Modoboa."
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Eigenaar van mailboxen"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/pt_PT/LC_MESSAGES/django.po

@@ -627,7 +627,7 @@ msgid ""
 msgstr "Renomear ou remover as caixas de correio no sistema de ficheiros quando estas são renomeadas no Modoboa"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Detentor das Caixas de Correio (Owner)"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/ru/LC_MESSAGES/django.po

@@ -646,7 +646,7 @@ msgstr ""
 "переименованы в Modoboa"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Почтовые ящики закончились"
 
 #: extensions/admin/app_settings.py:22

modoboa/locale/sv/LC_MESSAGES/django.po

@@ -657,7 +657,7 @@ msgstr ""
 "eller tas bort inom Modoboa"
 
 #: extensions/admin/app_settings.py:20
-msgid "Mailboxes ower"
+msgid "Mailboxes owner"
 msgstr "Brevlådors ägare"
 
 #: extensions/admin/app_settings.py:22

modoboa/templates/layout_simple.html

@@ -7,7 +7,7 @@
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.css" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap-responsive.css" />
     <script src="{{ STATIC_URL }}js/bootstrap.js" type="text/javascript"></script>
-    <script src="{{ STATIC_URL }}js/bootstrap-datepicker.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}js/bootstrap-datetimepicker.js" type="text/javascript"></script>
     {% url "django.views.i18n.javascript_catalog" as catalog_url %}
     <script type="text/javascript" src="{{ catalog_url }}"></script>
     <style>