7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

Browse Source
This commit is contained in:
André
2018-10-23 21:15:50 +02:00
parent ee630b9a84 bf06d8dd3a
commit c723a9d145
2 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/lang/lang.en.php
View File

@@ -247,7 +247,7 @@ $lang['user']['create_syncjob'] = 'Create new sync job';
$lang['start']['mailcow_apps_detail'] = 'Use a mailcow app to access your mails, calendar, contacts and more.';
$lang['start']['mailcow_panel_detail'] = '<b>Domain administrators</b> create, modify or delete mailboxes and aliases, change domains and read further information about their assigned domains.<br>
<b>Mailbox users</b> are able to create time-limited aliases (spam aliases), change their password and spam filter settings.';
<b>Mailbox users</b> are able to create time-limited aliases (spam aliases), change their password and spam filter settings.';
$lang['start']['imap_smtp_server_auth_info'] = 'Please use your full email address and the PLAIN authentication mechanism.<br>
Your login data will be encrypted by the server-side mandatory encryption.';
$lang['start']['help'] = 'Show/Hide help panel';
@@ -747,4 +747,4 @@ $lang['admin']['send'] = 'Send';
$lang['warning']['ip_invalid'] = 'Skipped invalid IP: %s';
$lang['danger']['text_empty'] = 'Text must not be empty';
$lang['danger']['subject_empty'] = 'Subject must not be empty';
$lang['danger']['from_invalid'] = 'Absender darf nicht leer sein';
$lang['danger']['from_invalid'] = 'Sender must not be empty';