Minor fixes to translations (#3551)

bin/v-list-sys-services

@@ -200,7 +200,7 @@ fi
 # Checking MAIL IMAP
 if [ -n "$IMAP_SYSTEM" ] && [ "$IMAP_SYSTEM" != 'remote' ]; then
 	get_srv_state "$IMAP_SYSTEM"
-	data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='imap / pop server' STATE='$state'"
+	data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='imap/pop3 server' STATE='$state'"
 	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
 fi
 

install/common/templates/email/examples/account_ready.html

@@ -1,7 +1,12 @@
-Hello {{name}}, Your account has been created and is ready for use.
+Hello {{name}},
+
+Your account has been created and ready to use.
+
 https://{{hostname}}/login/
 Username: {{user}}
 Password: {{password}}
 
 Best regards,
+
+--
 {{appname}}

install/common/templates/email/examples/database_credentials.html

@@ -1,7 +1,11 @@
-Database has been created successfully
+Database has been created.
+
 Database: {{database}}
-User: {{username}}
-Password:{{password}}
-{{dbadmin}}
+Username: {{username}}
+Password: {{password}}
+SQL Manager: {{dbadmin}}
+
 Best regards,
+
+--
 {{appname}}

install/common/templates/email/examples/email_credentials.html

@@ -1,25 +1,30 @@
-Mail account has been created
-Common account settings:
+Mail account has been created.
+
+Common Account Settings:
 Username: {{account}}@{{domain}}
 Password: {{password}}
 Webmail: {{webmail}}
 Hostname: {{hostname}}
-IMAP settings
-Authentication: Normal
-Password SSL/TLS: Port 993
+
+IMAP Settings
+Authentication: Normal password
+SSL/TLS: Port 993
 STARTTLS: Port 143
 No encryption: Port 143
 
-POP3 settings Authentication:
-Normal Password SSL/TLS:
-Port 995 STARTTLS: Port 110
+POP3 Settings
+Authentication: Normal password
+SSL/TLS: Port 995
+STARTTLS: Port 110
 No encryption: Port 110
 
-SMTP settings
-Authentication:
-Normal Password SSL/TLS: Port 465
+SMTP Settings
+Authentication: Normal password
+SSL/TLS: Port 465
 STARTTLS: Port 587
 No encryption: Port 25
 
 Best regards,
+
+--
 {{appname}}

install/common/templates/email/examples/ftp_credentials.html

@@ -1,4 +1,10 @@
-FTP account has been created and is ready for use.
+FTP account has been created and ready to use.
+
 Hostname: {{domain}}
 Username: {{username}}
-Password: {{password}} -- %s
+Password: {{password}}
+
+Best regards,
+
+--
+{{appname}}

install/common/templates/email/examples/reset_password.html

@@ -1,11 +1,15 @@
-<subject>{{hostname}} Password reset {{date}}</subject>
+<subject>{{hostname}} Password reset at {{date}}</subject>
 Hello {{name}},
+
 To reset your {{appname}} password, please follow this link:
 https://{{hostname}}/reset/?action=confirm&user={{user}}&code={{resetcode}}
+
 Alternatively, you may go to https://{{hostname}}/reset/?action=code&user={{user}} and enter the following reset code:
 {{resetcode}}
- If you did not request password reset, please ignore this message and accept our
-apologies.
+
+If you did not request password reset, please ignore this message and accept our apologies.
+
 Best regards,
 
+--
 {{appname}}

web/add/db/index.php

@@ -154,6 +154,8 @@ if (!empty($_POST["ok"])) {
 					"Password: {{password}}\n" .
 					"SQL Manager: {{dbadmin}}\n" .
 					"\n" .
+					"Best regards,\n" .
+					"\n" .
 					"--\n" .
 					"{{appname}}",
 			);

web/add/mail/index.php

@@ -461,6 +461,8 @@ if (!empty($_POST["ok_acc"])) {
 					"STARTTLS: Port 587\n" .
 					"No encryption: Port 25\n" .
 					"\n" .
+					"Best regards,\n" .
+					"\n" .
 					"--\n" .
 					"{{appname}}",
 			);

web/add/user/index.php

@@ -161,6 +161,8 @@ if (!empty($_POST["ok"])) {
 					"Username: {{user}}\n" .
 					"Password: {{password}}\n" .
 					"\n" .
+					"Best regards,\n" .
+					"\n" .
 					"--\n" .
 					"{{appname}}",
 			);

web/edit/mail/index.php

@@ -1115,6 +1115,8 @@ if (!empty($_POST["save"]) && !empty($_GET["domain"]) && !empty($_GET["account"]
 					"STARTTLS: Port 587\n" .
 					"No encryption: Port 25\n" .
 					"\n" .
+					"Best regards,\n" .
+					"\n" .
 					"--\n" .
 					"{{appname}}",
 			);

web/edit/web/index.php

@@ -1245,6 +1245,8 @@ if (!empty($_POST["save"])) {
 									"Username: {{username}}\n" .
 									"Password: {{password}}\n" .
 									"\n" .
+									"Best regards,\n" .
+									"\n" .
 									"--\n" .
 									"{{appname}}",
 							);
@@ -1389,6 +1391,8 @@ if (!empty($_POST["save"])) {
 								"Username: {{username}}\n" .
 								"Password: {{password}}\n" .
 								"\n" .
+								"Best regards,\n" .
+								"\n" .
 								"--\n" .
 								"{{appname}}",
 						);

web/js/src/addIpLists.js

@@ -12,7 +12,7 @@ export default function handleAddIpLists() {
 	const ipSetLists = parseAndSortIpLists(ipListSelect.dataset.ipsetLists);
 
 	const headerOption = document.createElement('option');
-	headerOption.textContent = 'IP address lists:';
+	headerOption.textContent = 'IPset IP Lists';
 	headerOption.disabled = true;
 	ipListSelect.appendChild(headerOption);
 

web/reset/index.php

@@ -67,7 +67,9 @@ if (!empty($_POST["user"]) && empty($_POST["code"])) {
 							"\n" .
 							"If you did not request password reset, please ignore this message and accept our apologies.\n" .
 							"\n" .
-							"Best regards\n" .
+							"Best regards,\n" .
+							"\n" .
+							"--\n" .
 							"{{appname}}",
 					);
 					putenv("LANGUAGE=" . detect_user_language());

web/templates/pages/add_mail_acc.php

@@ -147,7 +147,7 @@
 								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label">SSL / TLS</span>
+								<span class="values-list-label">SSL/TLS</span>
 								<span class="values-list-value"><?= _("Port") ?> 993</span>
 							</li>
 							<li class="values-list-item">
@@ -166,7 +166,7 @@
 								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label">SSL / TLS</span>
+								<span class="values-list-label">SSL/TLS</span>
 								<span class="values-list-value"><?= _("Port") ?> 995</span>
 							</li>
 							<li class="values-list-item">
@@ -185,7 +185,7 @@
 								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label">SSL / TLS</span>
+								<span class="values-list-label">SSL/TLS</span>
 								<span class="values-list-value"><?= _("Port") ?> 465</span>
 							</li>
 							<li class="values-list-item">

web/templates/pages/edit_backup_exclusions.php

@@ -37,7 +37,7 @@
 				<textarea class="form-control" name="v_db" id="v_db" placeholder="<?= _("Type full database name, one per line. To exclude all databases use *") ?>"><?= htmlentities(trim($v_db, "'")) ?></textarea>
 			</div>
 			<div class="u-mb10">
-				<label for="v_userdir" class="form-label"><?= _("User Directories") ?></label>
+				<label for="v_userdir" class="form-label"><?= _("User Directory") ?></label>
 				<textarea class="form-control" name="v_userdir" id="v_userdir" placeholder="<?= _("Type directory name, one per line. To exlude all dirs use *") ?>"><?= htmlentities(trim($v_userdir, "'")) ?></textarea>
 			</div>
 		</div>

web/templates/pages/edit_mail_acc.php

@@ -150,7 +150,7 @@
 								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label">SSL / TLS</span>
+								<span class="values-list-label">SSL/TLS</span>
 								<span class="values-list-value"><?= _("Port") ?> 993</span>
 							</li>
 							<li class="values-list-item">
@@ -169,7 +169,7 @@
 								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label">SSL / TLS</span>
+								<span class="values-list-label">SSL/TLS</span>
 								<span class="values-list-value"><?= _("Port") ?> 995</span>
 							</li>
 							<li class="values-list-item">
@@ -188,7 +188,7 @@
 								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label">SSL / TLS</span>
+								<span class="values-list-label">SSL/TLS</span>
 								<span class="values-list-value"><?= _("Port") ?> 465</span>
 							</li>
 							<li class="values-list-item">

web/templates/pages/edit_server.php

@@ -258,7 +258,7 @@
 					<?php if (count($v_php_versions)) { ?>
 						<div class="u-mt15">
 							<p class="u-mb10">
-								<?= _("Enabled multi PHP versions") ?>
+								<?= _("Enabled PHP Versions") ?>
 							</p>
 							<div class="alert alert-info u-mb10" role="alert">
 								<i class="fas fa-info"></i>

web/templates/pages/edit_user.php

@@ -132,7 +132,7 @@
 					</div>
 				</div>
 				<div x-cloak x-show="useIpAllowList" id="ip-allowlist" class="u-mt10">
-					<input type="text" class="form-control" name="v_login_allowed_ips" value="<?= htmlentities(trim($v_login_allowed_ips, "'")) ?>" placeholder="<?= _("For example") ?>: 127.0.0.1,192.168.1.100"">
+					<input type="text" class="form-control" name="v_login_allowed_ips" value="<?= htmlentities(trim($v_login_allowed_ips, "'")) ?>" placeholder="<?= _("For example") ?>: 127.0.0.1,192.168.1.100">
 				</div>
 			</div>
 			<div class="u-mb10">

web/templates/pages/list_cron.php

@@ -35,8 +35,8 @@
 						<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 						<select class="form-select" name="action">
 							<option value=""><?= _("Apply to selected") ?></option>
-							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'._('Disable notifications').'</option>'; ?>
-							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'._('Enable notifications').'</option>'; ?>
+							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">' . _('Disable Notifications') . '</option>'; ?>
+							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">' . _('Enable Notifications') . '</option>'; ?>
 							<option value="suspend"><?= _("Suspend") ?></option>
 							<option value="unsuspend"><?= _("Unsuspend") ?></option>
 							<option value="delete"><?= _("Delete") ?></option>

web/templates/pages/list_packages.php

@@ -89,7 +89,7 @@
 							<?php } else {?>
 								<div class="actions-panel__col actions-panel__edit shortcut-enter" data-key-action="href"><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit Package") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
 							<?php } ?>
-							<div class="actions-panel__col actions-panel__edit" data-key-action="href"><a href="/copy/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Copy") ?>"><i class="fas fa-clone icon-teal icon-dim"></i></a></div>
+							<div class="actions-panel__col actions-panel__edit" data-key-action="href"><a href="/copy/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Duplicate") ?>"><i class="fas fa-clone icon-teal icon-dim"></i></a></div>
 							<?php if ($key == 'system') { ?>
 								<!-- Restrict deleting system package -->
 							<?php } else {?>

web/templates/pages/list_stats.php

@@ -130,7 +130,7 @@
 							</li>
 							<li class="stats-item-summary-list-item">
 								<span>
-									<?= _("User Directories") ?>:
+									<?= _("User Directory") ?>:
 								</span>
 								<span>
 									<span class="u-text-bold"><?= humanize_usage_size($data[$key]["U_DISK_DIRS"]) ?></span>

web/templates/pages/list_updates.php

@@ -9,11 +9,11 @@
 				if($autoupdate == 'Enabled') {
 					$btn_url = '/delete/cron/autoupdate/?token='.$_SESSION['token'].'';
 					$btn_icon = 'fa-toggle-on icon-green';
-					$btn_label = _('Disable automatic updates');
+					$btn_label = _('Disable Automatic Updates');
 				} else {
 					$btn_url = '/add/cron/autoupdate/?token='.$_SESSION['token'].'';
 					$btn_icon = 'fa-toggle-off icon-red';
-					$btn_label = _('Enable automatic updates');
+					$btn_label = _('Enable Automatic Updates');
 				}
 			?>
 			<a class="button button-secondary" href="<?=$btn_url;?>">

web/templates/pages/setup_webapp.php

@@ -31,7 +31,7 @@
 						<i class="fas fa-info"></i>
 						<div>
 							<p class="u-mb10"><?= _("Data Loss Warning!") ?></p>
-							<p class="u-mb10"><?= _("Your web folder already has files uploaded to it. The installer will overwrite your files and / or the installation might fail.") ?></p>
+							<p class="u-mb10"><?= _("Your web folder already has files uploaded to it. The installer will overwrite your files and/or the installation might fail.") ?></p>
 							<p><?php echo sprintf(_("Please make sure ~/web/%s/public_html is empty!"), $v_domain); ?></p>
 						</div>
 					</div>