github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.3.x

Browse Source
This commit is contained in:
Antoine Nguyen
2015-05-06 12:16:17 +02:00
parent 35be247da7 d31104be94
commit 4d0ee14a80
13 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/core/app_settings.py
+1 -1
View File
@@ -80,7 +80,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
label=ugettext_lazy("Server address"),
initial="localhost",
help_text=ugettext_lazy(
"The IP address of the DNS name of the LDAP server"),
"The IP address or the DNS name of the LDAP server"),
widget=forms.TextInput(attrs={"class": "form-control"})
)
modoboa/locale/cs_CZ/LC_MESSAGES/django.po
+1 -1
View File
@@ -102,7 +102,7 @@ msgid "Server address"
msgstr "Adresa serveru"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "IP adresa DNS jména LDAP serveru"
#: core/app_settings.py:88
modoboa/locale/de/LC_MESSAGES/django.po
+14 -15
View File
@@ -72,7 +72,7 @@ msgstr "plain (schwach)"
#: core/app_settings.py:55
msgid "Scheme used to crypt mailbox passwords"
msgstr "Verschlüsselungsschema der Mailbox-Passworte"
msgstr "Verschlüsselungsschema der Mailbox-Passwörter"
#: core/app_settings.py:60
msgid "Rounds"
@@ -92,7 +92,7 @@ msgstr "Geheimer Schlüssel"
#: core/app_settings.py:72
msgid "Key used to encrypt/decrypt passwords"
msgstr "Verwendeter Schlüssel, um Passworte zu ver-/entschlüsseln"
msgstr "Verwendeter Schlüssel, um Passwörter zu ver-/entschlüsseln"
#: core/app_settings.py:77
msgid "LDAP settings"
@@ -103,8 +103,8 @@ msgid "Server address"
msgstr "Server-Adresse"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgstr "Die IP-Adresse des LDAP-Server Hostnamens"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "IP-Adresse oder Hostname des LDAP-Servers"
#: core/app_settings.py:88
msgid "Server port"
@@ -155,15 +155,15 @@ msgstr "Bind Passwort"
#: core/app_settings.py:125
msgid "The password to use when binding to the LDAP server (with 'Bind DN')"
msgstr "Das Kennwort wenn mit dem Bind DN angemeldet wird."
msgstr "Das Passwort wenn mit dem Bind DN angemeldet wird."
#: core/app_settings.py:134
msgid "Users search base"
msgstr "Anwender Search Base"
msgstr "Benutzer Search Base"
#: core/app_settings.py:137
msgid "The distinguished name of the search base used to find users"
msgstr "Der DN der Search Base mit der Anwenderkonten gefunden werden"
msgstr "Der DN der Search Base mit der Benutzerkonten gefunden werden"
#: core/app_settings.py:144
msgid "Search filter"
@@ -196,7 +196,7 @@ msgstr "Passwort-Attribut"
#: core/app_settings.py:168
msgid "The attribute used to store user passwords"
msgstr "Das Attribut für Benutzerpassworte"
msgstr "Das Attribut für Benutzerpasswörter"
#: core/app_settings.py:173
msgid "Active Directory"
@@ -340,7 +340,7 @@ msgstr "Sie können Ihr eigenes Konto nicht entfernen"
#: core/models.py:133
msgid "Failed to update password: LDAP module not installed"
msgstr "Konnte Kennwort nicht aktualisieren: LDAP-Modul nicht installiert"
msgstr "Konnte Passwort nicht aktualisieren: LDAP-Modul nicht installiert"
#: core/models.py:186
msgid "account"
@@ -363,8 +363,7 @@ msgstr "Der normale Benutzer '%s' muss eine gültige E-Mail-Adresse besitzen"
#, python-format
msgid "username and email fields must not differ for '%s'"
msgstr ""
"Die Felder für Benutzername und E-Mail für '%s' dürfen sich nicht "
"unterscheiden"
"Benutzername und E-Mail für '%s' dürfen sich nicht unterscheiden"
#: core/models.py:465
msgid "added"
@@ -583,11 +582,11 @@ msgstr "Nein"
#: lib/ldap_utils.py:116
#, python-format
msgid "Failed to update password: %s"
msgstr "Konnte Kennwort nicht aktualisieren: %s"
msgstr "Konnte Passwort nicht aktualisieren: %s"
#: lib/permissions.py:21
msgid "Simple user"
msgstr "Normaler Anwender"
msgstr "Normaler Benutzer"
#: lib/permissions.py:23
msgid "Super administrator"
@@ -638,11 +637,11 @@ msgstr "Schließen"
#: templates/common/wizard_forms.html:31
msgid "Previous"
msgstr "Vorheriges"
msgstr "Zurück"
#: templates/common/wizard_forms.html:32
msgid "Next"
msgstr "Nächstes"
msgstr "Weiter"
#: templates/registration/login.html:10
msgid "Welcome to Modoboa"
modoboa/locale/de/LC_MESSAGES/djangojs.po
+1 -1
View File
@@ -22,7 +22,7 @@ msgstr ""
#: core/static/core/js/settings.js:14
msgid "No more log entry to show"
msgstr "Keine weiteren log eintrage"
msgstr "Keine weiteren Log-Einträge"
#: static/js/confirmation.js:44
msgid "Warning"
modoboa/locale/en/LC_MESSAGES/django.po
+1 -1
View File
@@ -96,7 +96,7 @@ msgid "Server address"
msgstr ""
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr ""
#: core/app_settings.py:88
modoboa/locale/es/LC_MESSAGES/django.po
+1 -1
View File
@@ -100,7 +100,7 @@ msgid "Server address"
msgstr "Dirección del servidor"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "La dirección IP del servidor de nombres (DNS) del servidor LDAP"
#: core/app_settings.py:88
modoboa/locale/fr/LC_MESSAGES/django.po
+1 -1
View File
@@ -101,7 +101,7 @@ msgid "Server address"
msgstr "Adresse du serveur"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "L'adresse IP ou le nom DNS du serveur LDAP"
#: core/app_settings.py:88
modoboa/locale/it/LC_MESSAGES/django.po
+1 -1
View File
@@ -100,7 +100,7 @@ msgid "Server address"
msgstr "Indirizzo del server"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "L'indirizzo IP associato al DNS name del server LDAP"
#: core/app_settings.py:88
modoboa/locale/nl_NL/LC_MESSAGES/django.po
+2 -2
View File
@@ -103,8 +103,8 @@ msgid "Server address"
msgstr "Server adres"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgstr "Het IP adres en de DNS naam van LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "Het IP adres of de DNS naam van LDAP server"
#: core/app_settings.py:88
msgid "Server port"
modoboa/locale/pt_BR/LC_MESSAGES/django.po
+1 -1
View File
@@ -104,7 +104,7 @@ msgid "Server address"
msgstr "Endereço do servidor"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "O endereço IP do nome DNS do servidor LDAP"
#: core/app_settings.py:88
modoboa/locale/pt_PT/LC_MESSAGES/django.po
+1 -1
View File
@@ -105,7 +105,7 @@ msgid "Server address"
msgstr "Endereço do Servidor"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "O endereço IP do servidor de DNS do servidor LDAP"
#: core/app_settings.py:88
modoboa/locale/ru/LC_MESSAGES/django.po
+1 -1
View File
@@ -99,7 +99,7 @@ msgid "Server address"
msgstr "Адрес сервера"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "IP адрес или DNS имя сервера LDAP"
#: core/app_settings.py:88
modoboa/locale/sv/LC_MESSAGES/django.po
+1 -1
View File
@@ -104,7 +104,7 @@ msgid "Server address"
msgstr "Server adress"
#: core/app_settings.py:83
msgid "The IP address of the DNS name of the LDAP server"
msgid "The IP address or the DNS name of the LDAP server"
msgstr "IP adressen eller DNS namn för LDAP server"
#: core/app_settings.py:88