Skip to content

Commit 5ceb256

Browse files
ms217ms217
committed
Merge branch 'develop' into 6501-php-ssh-cron
2 parents 32bbf9a + e318f99 commit 5ceb256

File tree

69 files changed

+404
-400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+404
-400
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
.idea
22
/nbproject/private/
33
.phplint-cache
4+
5+
# Vim and patch specific excludes
46
*.swp
7+
*.orig
8+
*.rej
59

610
# macOS-specific things to exclude
711

‎interface/web/admin/templates/server_list.htm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
5151
</tmpl_loop>
5252
<tmpl_unless name="records">
5353
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
54-
<td colspan="7">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
54+
<td colspan="9">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
5555
</tr>
5656
</tmpl_unless>
5757
</tbody>
5858
<tfoot>
5959
<tr>
60-
<td colspan="7"><tmpl_var name="paging"></td>
60+
<td colspan="9"><tmpl_var name="paging"></td>
6161
</tr>
6262
</tfoot>
6363
</table>
6464
</div>
65-
66-
</div>
65+
66+
</div>

‎interface/web/admin/templates/server_php_list.htm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
44

55

66
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
7-
7+
88
<button class="btn btn-default formbutton-success" type="button" data-load-content="admin/server_php_edit.php">{tmpl_var name="add_new_record_txt"}</button>
9-
10-
119

12-
10+
11+
12+
1313
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
1414
<div class="table-wrapper marginTop15">
1515
<table class="table">
@@ -50,16 +50,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
5050
</tmpl_loop>
5151
<tmpl_unless name="records">
5252
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
53-
<td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
53+
<td colspan="7">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
5454
</tr>
5555
</tmpl_unless>
5656
</tbody>
5757
<tfoot>
5858
<tr>
59-
<td colspan="6"><tmpl_var name="paging"></td>
59+
<td colspan="7"><tmpl_var name="paging"></td>
6060
</tr>
6161
</tfoot>
6262
</table>
6363
</div>
64-
65-
64+
65+

‎interface/web/dns/templates/dns_a_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<td><input class="form-control" type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
7474
<td><input class="form-control" type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td>
7575
<td class="text-right">
76-
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return ISPConfig.changeTab('dns_records','dns/dns_soa_edit.php',true);" data-form-action="dns/dns_a_list.php"><span class="icon icon-filter"></span></button>
76+
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="return ISPConfig.changeTab('dns_records','dns/dns_soa_edit.php',true);" data-form-action="dns/dns_soa_edit.php?id={tmpl_var name='parent_id'}&next_tab=dns_records"><span class="icon icon-filter"></span></button>
7777
</td>
7878
</tr>
7979
</thead>

‎interface/web/mail/lib/lang/de_backup_stats_list.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
$wb['list_head_txt'] = 'Backup Statistiken';
2+
$wb['list_head_txt'] = 'Backup-Statistiken';
33
$wb['active_txt'] = 'Aktiv';
44
$wb['domain_txt'] = 'Email';
55
$wb['backup_count_txt'] = 'Anz. Backups';

‎interface/web/mail/lib/lang/de_mail_alias.lng‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
2-
$wb['email_txt'] = 'E-Mail Adresse';
2+
$wb['email_txt'] = 'E-Mail-Adresse';
33
$wb['destination_txt'] = 'Ziel';
44
$wb['active_txt'] = 'Aktiv';
5-
$wb['email_error_isemail'] = 'E-Mail Adresse ist ungültig';
6-
$wb['email_error_unique'] = 'Doppelte E-Mail Adresse.';
5+
$wb['email_error_isemail'] = 'E-Mail-Adresse ist ungültig';
6+
$wb['email_error_unique'] = 'Doppelte E-Mail-Adresse.';
77
$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
88
$wb['destination_error_isemail'] = 'Zieladresse ist ungültig.';
9-
$wb['limit_mailalias_txt'] = 'Die maximale Anzahl an E-Mail Aliasen für Ihr Konto wurde erreicht.';
10-
$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine E-Mail Konto mit dieser E-Mail Adresse.';
9+
$wb['limit_mailalias_txt'] = 'Die maximale Anzahl an E-Mail-Aliasen für Ihr Konto wurde erreicht.';
10+
$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine E-Mail Konto mit dieser E-Mail-Adresse.';
1111
$wb['domain_txt'] = 'Domain';
12-
$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.';
12+
$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail-Alias existiert bereits.';
1313
$wb['source_txt'] = 'Alias';
1414
$wb['send_as_txt'] = 'Senden als';
1515
$wb['send_as_exp'] = 'Ziel erlauben, den Alias als Absender zu benutzen';

‎interface/web/mail/lib/lang/de_mail_alias_list.lng‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
$wb['list_head_txt'] = 'E-Mail Alias';
2+
$wb['list_head_txt'] = 'E-Mail-Alias';
33
$wb['active_txt'] = 'Aktiv';
44
$wb['source_txt'] = 'Quelle';
55
$wb['destination_txt'] = 'Ziel';
6-
$wb['email_txt'] = 'E-Mail Adresse';
7-
$wb['add_new_record_txt'] = 'Neuen E-Mail Alias hinzufügen';
6+
$wb['email_txt'] = 'E-Mail-Adresse';
7+
$wb['add_new_record_txt'] = 'Neuen E-Mail-Alias hinzufügen';
88
?>

‎interface/web/mail/lib/lang/de_mail_aliasdomain.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ $wb['source_txt'] = 'Quelle';
33
$wb['destination_txt'] = 'Ziel';
44
$wb['active_txt'] = 'Aktiv';
55
$wb['no_domain_perm'] = 'Sie haben keine Rechte für diese Domain.';
6-
$wb['limit_mailaliasdomain_txt'] = 'Die maximale Anzahl an E-Mail Alias Domains für Ihr Konto wurde erreicht.';
6+
$wb['limit_mailaliasdomain_txt'] = 'Die maximale Anzahl an E-Mail-Alias-Domains für Ihr Konto wurde erreicht.';
77
$wb['source_destination_identical_txt'] = 'Quell- und Ziel Domain sind identisch.';
8-
$wb['source_error_empty'] = 'Quell Domain ist leer.';
9-
$wb['source_error_unique'] = 'Quell Domain duplizieren.';
10-
$wb['source_error_regex'] = 'Ungültiger Quell Domainname.';
8+
$wb['source_error_empty'] = 'Quelldomain ist leer.';
9+
$wb['source_error_unique'] = 'Quelldomain duplizieren.';
10+
$wb['source_error_regex'] = 'Ungültiger Quelldomainname.';
1111
?>

‎interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
$wb['list_head_txt'] = 'E-Mail Domain Alias';
2+
$wb['list_head_txt'] = 'E-Mail-Domain-Alias';
33
$wb['active_txt'] = 'Aktiv';
44
$wb['source_txt'] = 'Quelle';
55
$wb['destination_txt'] = 'Ziel';
6-
$wb['add_new_record_txt'] = 'Neuen E-Mail Domain Alias hinzufügen';
6+
$wb['add_new_record_txt'] = 'Neuen E-Mail-Domain-Alias hinzufügen';
77
?>

‎interface/web/mail/lib/lang/de_mail_blacklist.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22
$wb['server_id_txt'] = 'Server';
3-
$wb['source_txt'] = 'Blacklist E-Mail Adresse';
3+
$wb['source_txt'] = 'Blacklist-E-Mail-Adresse';
44
$wb['recipient_txt'] = 'Empfänger';
55
$wb['active_txt'] = 'Aktiv';
66
$wb['source_error_notempty'] = 'Adresse ist leer.';
77
$wb['type_txt'] = 'Typ';
8-
$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filter für Ihr Konto wurde erreicht.';
9-
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10-
$wb['mail_access_unique'] = 'Blacklist Address already in use.';
8+
$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail-Filter für Ihr Konto wurde erreicht.';
9+
$wb['limit_mail_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.';
10+
$wb['mail_access_unique'] = 'Blacklist-E-Mail-Adresse wird bereits verwendet.';
1111
$wb['client_txt'] = 'Client';
1212
$wb['sender_txt'] = 'Sender';

0 commit comments

Comments
 (0)