Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Patrício dos Santos
ISPConfig 3
Commits
6cdb029d
Commit
6cdb029d
authored
Sep 12, 2015
by
Marius Cramer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
Master See merge request !226
parents
842b5c34
a5d73310
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
install/tpl/fedora_amavisd_conf.master
install/tpl/fedora_amavisd_conf.master
+1
-1
interface/web/mail/lib/lang/de_mail_user_stats_list.lng
interface/web/mail/lib/lang/de_mail_user_stats_list.lng
+2
-2
No files found.
install/tpl/fedora_amavisd_conf.master
View file @
6cdb029d
...
...
@@ -144,7 +144,7 @@ $defang_by_ccat{+CC_BADH.",6"} = 1; # header field syntax error
# OTHER MORE COMMON SETTINGS (defaults may suffice):
# $myhostname = 'host.example.com'; # must be a fully-qualified domain name!
$myhostname = '{hostname}';
$notify_method = 'smtp:[127.0.0.1]:10027';
$forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
...
...
interface/web/mail/lib/lang/de_mail_user_stats_list.lng
View file @
6cdb029d
<?php
$wb
[
'list_head_txt'
]
=
'E-Mail Datenverkehr'
;
$wb
[
'email_txt'
]
=
'E-Mail Adresse'
;
$wb
[
'this_month_txt'
]
=
'Aktuelle
s
Monat'
;
$wb
[
'last_month_txt'
]
=
'Vergangene
s
Monat'
;
$wb
[
'this_month_txt'
]
=
'Aktuelle
r
Monat'
;
$wb
[
'last_month_txt'
]
=
'Vergangene
r
Monat'
;
$wb
[
'this_year_txt'
]
=
'Aktuelles Jahr'
;
$wb
[
'last_year_txt'
]
=
'Vergangenes Jahr'
;
?>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment