Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

florian030 · florian030 · commit 5fb17b6ee163 · 2020-01-03T14:31:59.000+01:00
diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
@@ -71,11 +71,11 @@ public function get_quota_data($clientid = null, $readable = true) {
 						$sites[$i]['hard'] .= ' KB';
 					}
 			
-					if($sites[$i]['soft'] == " KB") $sites[$i]['soft'] = $app->lng('unlimited');
-					if($sites[$i]['hard'] == " KB") $sites[$i]['hard'] = $app->lng('unlimited');
+					if($sites[$i]['soft'] == " KB") $sites[$i]['soft'] = $app->lng('unlimited_txt');
+					if($sites[$i]['hard'] == " KB") $sites[$i]['hard'] = $app->lng('unlimited_txt');
 					
-					if($sites[$i]['soft'] == '0 B' || $sites[$i]['soft'] == '0 KB' || $sites[$i]['soft'] == '0') $sites[$i]['soft'] = $app->lng('unlimited');
-					if($sites[$i]['hard'] == '0 B' || $sites[$i]['hard'] == '0 KB' || $sites[$i]['hard'] == '0') $sites[$i]['hard'] = $app->lng('unlimited');
+					if($sites[$i]['soft'] == '0 B' || $sites[$i]['soft'] == '0 KB' || $sites[$i]['soft'] == '0') $sites[$i]['soft'] = $app->lng('unlimited_txt');
+					if($sites[$i]['hard'] == '0 B' || $sites[$i]['hard'] == '0 KB' || $sites[$i]['hard'] == '0') $sites[$i]['hard'] = $app->lng('unlimited_txt');
 					
 					/*
 					 if(!strstr($sites[$i]['used'],'M') && !strstr($sites[$i]['used'],'K')) $sites[$i]['used'].= ' B';
@@ -266,7 +266,7 @@ public function get_mailquota_data($clientid = null, $readable = true) {
 					if($used_ratio >= 1) $emails[$i]['display_colour'] = '#cc0000';
 			
 					if($emails[$i]['quota'] == 0){
-						$emails[$i]['quota'] = $app->lng('unlimited');
+						$emails[$i]['quota'] = $app->lng('unlimited_txt');
 					} else {
                                                $emails[$i]['quota'] = round($emails[$i]['quota'] / 1048576, 1).' MB';
 					}
@@ -327,7 +327,7 @@ public function get_databasequota_data($clientid = null, $readable = true) {
 					if($used_ratio >= 1) $databases[$i]['display_colour'] = '#cc0000';
 						
 					if($databases[$i]['database_quota'] == 0){
-						$databases[$i]['database_quota'] = $app->lng('unlimited');
+						$databases[$i]['database_quota'] = $app->lng('unlimited_txt');
 					} else {
 						$databases[$i]['database_quota'] = $databases[$i]['database_quota'] . ' MB';
 					}
diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php
@@ -423,7 +423,7 @@ public function sites_web_domain_add($session_id, $client_id, $params, $readonly
 			$params['client_group_id'] = $rec['groupid'];
 		}
 
-		//* Set a few params to "not empty" values which get overwritten by the sites_web_domain_plugin
+		//* Set a few params to "not empty" values which get overwritten by the sites_web_vhost_domain_plugin
 		if($params['document_root'] == '') $params['document_root'] = '-';
 		if($params['system_user'] == '') $params['system_user'] = '-';
 		if($params['system_group'] == '') $params['system_group'] = '-';
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
 ?>
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Неограничен';
 ?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
@@ -158,4 +158,5 @@ $wb['security_check1_txt'] = 'Verifique as permissões de segurança:';
 $wb['security_check2_txt'] = 'falhou.';
 $wb['select_directive_snippet_txt'] = 'Diretiva de trechos de código';
 $wb['select_master_directive_snippet_txt'] = 'Diretiva mestre de trechos de código';
+$wb['unlimited_txt'] = 'Ilimitado';
 ?>
diff --git a/interface/lib/lang/ca.lng b/interface/lib/lang/ca.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Illimité';
 ?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Smazat XMPP doménu';
 $wb['datalog_status_i_xmpp_user'] = 'Vytvořit XMPP uživatele';
 $wb['datalog_status_u_xmpp_user'] = 'Aktualizovat XMPP uživatele';
 $wb['datalog_status_d_xmpp_user'] = 'Smazat XMPP uživatele';
+$wb['unlimited_txt'] = 'neomezeno';
 ?>
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
@@ -158,4 +158,5 @@ $wb['security_check1_txt'] = 'Sicherheitsüberprüfung für:';
 $wb['security_check2_txt'] = 'fehlgeschlagen.';
 $wb['select_directive_snippet_txt'] = 'Direktiven Schnipsel';
 $wb['select_master_directive_snippet_txt'] = 'Master Direktiven Schnipsel';
+$wb['unlimited_txt'] = 'unlimitiert';
 ?>
diff --git a/interface/lib/lang/dk.lng b/interface/lib/lang/dk.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Ubegrænset';
 ?>
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Απεριόριστα';
 ?>
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
@@ -159,4 +159,5 @@ $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
 $wb['select_directive_snippet_txt'] = 'Directive Snippets';
 $wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
-?>
+$wb['unlimited_txt'] = "Unlimited";
+?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Ilimitado';
 ?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
 ?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Illimité';
 ?>
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'neograničeno';
 ?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Korlátlan';
 ?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Tak terbatas';
 ?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'illimitati';
 ?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
 ?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Ongelimiteerd';
 ?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'nielimitowane';
 ?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
 ?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
 ?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Удалить  домен XMPP';
 $wb['datalog_status_i_xmpp_user'] = 'Создать пользователя XMPP';
 $wb['datalog_status_u_xmpp_user'] = 'Обновить пользователя XMPP';
 $wb['datalog_status_d_xmpp_user'] = 'Удалить пользователя XMPP';
+$wb['unlimited_txt'] = 'Безлимитный';
 ?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Obegränsat';
 ?>
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
 ?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
@@ -159,4 +159,5 @@ $wb['security_check1_txt'] = 'Güvenlik iznini denetle:';
 $wb['security_check2_txt'] = 'başarısız.';
 $wb['select_directive_snippet_txt'] = 'Yönerge Kod Parçaları';
 $wb['select_master_directive_snippet_txt'] = 'Ana Komut Parçaları';
+$wb['unlimited_txt'] = 'Sınırsız';
 ?>
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -80,7 +80,7 @@ function mail_user_filter_edit($event_name, $page_form) {
 			}
 		}
 
-		// We did not found our rule, so we add it now as first rule.
+		// We did not find our rule, so we add it now as first rule.
 		if($found == false && $page_form->dataRecord["active"] == 'y') {
 			$new_rule = $this->mail_user_filter_get_rule($page_form);
 			$out = $new_rule . $out;
@@ -92,7 +92,7 @@ function mail_user_filter_edit($event_name, $page_form) {
 	}
 
 	/*
-	 *	Remove the rendered filter from custom_mailfilter when a mail_user_filter is deleted
+	 *	Remove the rendered filter from custom_mailfilter when a mail_user_filter is deleted.
 	 */
 	function mail_user_filter_del($event_name, $page_form) {
 		global $app, $conf;
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Account limits';
 $wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng b/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Акаунт ограничения';
 $wb['of_txt'] = 'на';
-$wb['unlimited_txt'] = 'Неограничен';
 $wb['limit_maildomain_txt'] = 'Брой на email домейни';
 $wb['limit_mailbox_txt'] = 'Брой на пощенските кутии';
 $wb['limit_mailalias_txt'] = 'Брой на email псевдоними';
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_limits.lng b/interface/web/dashboard/lib/lang/br_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Limites de contas';
 $wb['of_txt'] = 'de';
-$wb['unlimited_txt'] = 'Ilimitado';
 $wb['limit_maildomain_txt'] = 'Número de domínios de e-mail';
 $wb['limit_mailmailinglist_txt'] = 'Número de listas de e-mail';
 $wb['limit_mailbox_txt'] = 'Número de contas de e-mail';
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Limites du compte';
 $wb['of_txt'] = 'sur';
-$wb['unlimited_txt'] = 'Illimité';
 $wb['limit_maildomain_txt'] = 'Nombre de domaines courriel';
 $wb['limit_mailmailinglist_txt'] = 'Nombre de mailing lists';
 $wb['limit_mailbox_txt'] = 'Nombre de boites courriel';
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Limity účtů';
 $wb['of_txt'] = 'z';
-$wb['unlimited_txt'] = 'neomezeno';
 $wb['limit_maildomain_txt'] = 'Počet e-mailových domén';
 $wb['limit_mailbox_txt'] = 'Počet e-mailových schránek';
 $wb['limit_mailalias_txt'] = 'Počet e-mailových přezdívek';
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Kontobeschränkungen';
 $wb['of_txt'] = 'von';
-$wb['unlimited_txt'] = 'unlimitiert';
 $wb['limit_maildomain_txt'] = 'Anzahl der E-Mail Domains';
 $wb['limit_mailbox_txt'] = 'Anzahl der E-Mail Konten';
 $wb['limit_mailalias_txt'] = 'Anzahl der E-Mail Aliase';
diff --git a/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Konto begrænsninger';
 $wb['of_txt'] = 'af';
-$wb['unlimited_txt'] = 'Ubegrænset';
 $wb['limit_maildomain_txt'] = 'Antal af e-mail domæner';
 $wb['limit_mailmailinglist_txt'] = 'Antal af mail-lister';
 $wb['limit_mailbox_txt'] = 'Antal af mail-bokse';
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Όρια Λογαριασμών';
 $wb['of_txt'] = 'από';
-$wb['unlimited_txt'] = 'Απεριόριστα';
 $wb['limit_maildomain_txt'] = 'Αριθμός email domains';
 $wb['limit_mailbox_txt'] = 'Αριθμός θυρίδων';
 $wb['limit_mailalias_txt'] = 'Αριθμός ψευδωνύμων email';
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = "Account limits";
 $wb['of_txt'] = "of";
-$wb['unlimited_txt'] = "Unlimited";
 $wb['limit_maildomain_txt'] = "Number of email domains";
 $wb['limit_mailmailinglist_txt'] = "Number of mailing lists";
 $wb['limit_mailbox_txt'] = "Number of mailboxes";
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_limits.lng b/interface/web/dashboard/lib/lang/es_dashlet_limits.lng
@@ -27,7 +27,6 @@ $wb['limit_web_subdomain_txt'] = 'Cantidad de sub-dominios';
 $wb['limit_webdav_user_txt'] = 'Cantidad de usuarios Webdav';
 $wb['limits_txt'] = 'Límites de la cuenta';
 $wb['of_txt'] = 'de';
-$wb['unlimited_txt'] = 'Ilimitado';
 $wb['limit_mailquota_txt'] = 'Assigned mailbox quota';
 $wb['limit_web_quota_txt'] = 'Assigned web quota';
 $wb['limit_database_quota_txt'] = 'Assigned database quota';
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Account limits';
 $wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Limites du compte';
 $wb['of_txt'] = 'sur';
-$wb['unlimited_txt'] = 'Illimité';
 $wb['limit_maildomain_txt'] = 'Nombre de domaines e-mail';
 $wb['limit_mailmailinglist_txt'] = 'Nombre de liste de distribution';
 $wb['limit_mailbox_txt'] = 'Nombre de boîtes aux lettres';
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Ograničenja';
 $wb['of_txt'] = 'od';
-$wb['unlimited_txt'] = 'neograničeno';
 $wb['limit_maildomain_txt'] = 'Mail domene';
 $wb['limit_mailbox_txt'] = 'Mailboxi';
 $wb['limit_mailalias_txt'] = 'Mail aliasi';
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Account limits';
 $wb['of_txt'] = '-';
-$wb['unlimited_txt'] = 'Korlátlan';
 $wb['limit_maildomain_txt'] = 'Email domainek száma';
 $wb['limit_mailbox_txt'] = 'Mailbox-ok száma';
 $wb['limit_mailalias_txt'] = 'Email aliasok száma';
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Batasan Akun';
 $wb['of_txt'] = 'dari';
-$wb['unlimited_txt'] = 'Tak terbatas';
 $wb['limit_maildomain_txt'] = 'Jumlah domain email';
 $wb['limit_mailbox_txt'] = 'Jumlah mailbox';
 $wb['limit_mailalias_txt'] = 'Jumlah alias email';
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Sintesi account';
 $wb['of_txt'] = 'su';
-$wb['unlimited_txt'] = 'illimitati';
 $wb['limit_maildomain_txt'] = 'Domini email';
 $wb['limit_mailbox_txt'] = 'Caselle email';
 $wb['limit_mailalias_txt'] = 'Alias di email';
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Account limits';
 $wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Account limieten';
 $wb['of_txt'] = 'van';
-$wb['unlimited_txt'] = 'Ongelimiteerd';
 $wb['limit_maildomain_txt'] = 'Aantal email domeinen';
 $wb['limit_mailbox_txt'] = 'Aantal mailboxes';
 $wb['limit_mailalias_txt'] = 'Aantal e-mail aliassen';
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Limity konta';
 $wb['of_txt'] = 'z';
-$wb['unlimited_txt'] = 'nielimitowane';
 $wb['limit_maildomain_txt'] = 'Liczba domen e-mail';
 $wb['limit_mailbox_txt'] = 'Liczba skrzynek pocztowych';
 $wb['limit_mailalias_txt'] = 'Liczba aliasów e-mail';
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Account limits';
 $wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Account limits';
 $wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Лимиты учётной записи';
 $wb['of_txt'] = 'из';
-$wb['unlimited_txt'] = 'Безлимитный';
 $wb['limit_maildomain_txt'] = 'Количество почтовых аккаунтов';
 $wb['limit_mailbox_txt'] = 'Количество почтовых ящиков';
 $wb['limit_mailalias_txt'] = 'Количество алиасов почты';
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
@@ -1,7 +1,6 @@
 <?php
 $wb['limits_txt'] = 'Kontogränser';
 $wb['of_txt'] = 'av';
-$wb['unlimited_txt'] = 'Obegränsat';
 $wb['limit_maildomain_txt'] = 'Antal epostdomäner';
 $wb['limit_mailbox_txt'] = 'Antal epostkonton';
 $wb['limit_mailalias_txt'] = 'Antal epostalias';
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
diff --git a/interface/web/sites/database_quota_stats.php b/interface/web/sites/database_quota_stats.php
diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php
diff --git a/remoting_client/API-docs/mail_user_add.html b/remoting_client/API-docs/mail_user_add.html
diff --git a/remoting_client/API-docs/mail_user_update.html b/remoting_client/API-docs/mail_user_update.html
diff --git a/server/conf/mail/welcome_email_nl.txt b/server/conf/mail/welcome_email_nl.txt

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ public function sites_web_domain_add($session_id, $client_id, $params, $readonly`
`423`	`423`	`$params['client_group_id'] = $rec['groupid'];`
`424`	`424`	`}`
`425`	`425`
`426`		`- //* Set a few params to "not empty" values which get overwritten by the sites_web_domain_plugin`
	`426`	`+ //* Set a few params to "not empty" values which get overwritten by the sites_web_vhost_domain_plugin`
`427`	`427`	`if($params['document_root'] == '') $params['document_root'] = '-';`
`428`	`428`	`if($params['system_user'] == '') $params['system_user'] = '-';`
`429`	`429`	`if($params['system_group'] == '') $params['system_group'] = '-';`