Skip to content

Commit 9bed324

Browse files
myreverymyrevery
authored
Minor fixes to translations (hestiacp#3551)
1 parent 4df60ba commit 9bed324

23 files changed

+78
-40
lines changed

‎bin/v-list-sys-services‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ fi
200200
# Checking MAIL IMAP
201201
if [ -n "$IMAP_SYSTEM" ] && [ "$IMAP_SYSTEM" != 'remote' ]; then
202202
get_srv_state "$IMAP_SYSTEM"
203-
data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='imap / pop server' STATE='$state'"
203+
data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='imap/pop3 server' STATE='$state'"
204204
data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
205205
fi
206206

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
Hello {{name}}, Your account has been created and is ready for use.
1+
Hello {{name}},
2+
3+
Your account has been created and ready to use.
4+
25
https://{{hostname}}/login/
36
Username: {{user}}
47
Password: {{password}}
58

69
Best regards,
10+
11+
--
712
{{appname}}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
Database has been created successfully
1+
Database has been created.
2+
23
Database: {{database}}
3-
User: {{username}}
4-
Password:{{password}}
5-
{{dbadmin}}
4+
Username: {{username}}
5+
Password: {{password}}
6+
SQL Manager: {{dbadmin}}
7+
68
Best regards,
9+
10+
--
711
{{appname}}

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
1-
Mail account has been created
2-
Common account settings:
1+
Mail account has been created.
2+
3+
Common Account Settings:
34
Username: {{account}}@{{domain}}
45
Password: {{password}}
56
Webmail: {{webmail}}
67
Hostname: {{hostname}}
7-
IMAP settings
8-
Authentication: Normal
9-
Password SSL/TLS: Port 993
8+
9+
IMAP Settings
10+
Authentication: Normal password
11+
SSL/TLS: Port 993
1012
STARTTLS: Port 143
1113
No encryption: Port 143
1214

13-
POP3 settings Authentication:
14-
Normal Password SSL/TLS:
15-
Port 995 STARTTLS: Port 110
15+
POP3 Settings
16+
Authentication: Normal password
17+
SSL/TLS: Port 995
18+
STARTTLS: Port 110
1619
No encryption: Port 110
1720

18-
SMTP settings
19-
Authentication:
20-
Normal Password SSL/TLS: Port 465
21+
SMTP Settings
22+
Authentication: Normal password
23+
SSL/TLS: Port 465
2124
STARTTLS: Port 587
2225
No encryption: Port 25
2326

2427
Best regards,
28+
29+
--
2530
{{appname}}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
FTP account has been created and is ready for use.
1+
FTP account has been created and ready to use.
2+
23
Hostname: {{domain}}
34
Username: {{username}}
4-
Password: {{password}} -- %s
5+
Password: {{password}}
6+
7+
Best regards,
8+
9+
--
10+
{{appname}}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
<subject>{{hostname}} Password reset {{date}}</subject>
1+
<subject>{{hostname}} Password reset at {{date}}</subject>
22
Hello {{name}},
3+
34
To reset your {{appname}} password, please follow this link:
45
https://{{hostname}}/reset/?action=confirm&user={{user}}&code={{resetcode}}
6+
57
Alternatively, you may go to https://{{hostname}}/reset/?action=code&user={{user}} and enter the following reset code:
68
{{resetcode}}
7-
If you did not request password reset, please ignore this message and accept our
8-
apologies.
9+
10+
If you did not request password reset, please ignore this message and accept our apologies.
11+
912
Best regards,
1013

14+
--
1115
{{appname}}

‎web/add/db/index.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@
154154
"Password: {{password}}\n" .
155155
"SQL Manager: {{dbadmin}}\n" .
156156
"\n" .
157+
"Best regards,\n" .
158+
"\n" .
157159
"--\n" .
158160
"{{appname}}",
159161
);

‎web/add/mail/index.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@
461461
"STARTTLS: Port 587\n" .
462462
"No encryption: Port 25\n" .
463463
"\n" .
464+
"Best regards,\n" .
465+
"\n" .
464466
"--\n" .
465467
"{{appname}}",
466468
);

‎web/add/user/index.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@
161161
"Username: {{user}}\n" .
162162
"Password: {{password}}\n" .
163163
"\n" .
164+
"Best regards,\n" .
165+
"\n" .
164166
"--\n" .
165167
"{{appname}}",
166168
);

‎web/edit/mail/index.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,6 +1115,8 @@
11151115
"STARTTLS: Port 587\n" .
11161116
"No encryption: Port 25\n" .
11171117
"\n" .
1118+
"Best regards,\n" .
1119+
"\n" .
11181120
"--\n" .
11191121
"{{appname}}",
11201122
);

0 commit comments

Comments
 (0)