Skip to content

Commit 1ab520d

Browse files
author
Kristan Kenney
committed
Merge branch 'fix/2020-07_ui-lang-strings' into staging/fixes
2 parents f902ca7 + 1db1c7c commit 1ab520d

40 files changed

+1203
-3
lines changed

‎web/css/src/styles.css‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,6 +1510,29 @@ div.l-content > div.l-separator:nth-of-type(4) {
15101510
font-weight: 400;
15111511
}
15121512

1513+
.body-firewall.lang-bg .l-select {
1514+
width: 120px;
1515+
}
1516+
1517+
.body-firewall.lang-el .l-select {
1518+
max-width: 90px;
1519+
}
1520+
1521+
.body-mail.lang-el .l-select {
1522+
max-width: 80px;
1523+
}
1524+
.body-mail.lang-el td.l-sort-toolbar__search-box {
1525+
display: none;
1526+
}
1527+
1528+
.body-cron.lang-el .search-input {
1529+
max-width: 80px;
1530+
}
1531+
1532+
.body-cron.lang-el .l-select {
1533+
max-width: 120px;
1534+
}
1535+
15131536
.lang-ru .l-select {
15141537
width: 170px;
15151538
}
@@ -1526,6 +1549,16 @@ div.l-content > div.l-separator:nth-of-type(4) {
15261549
max-width: 135px;
15271550
}
15281551

1552+
.lang-bg .l-stat__col-title {
1553+
font-size: 0.75rem;
1554+
font-weight: bold;
1555+
}
1556+
1557+
.lang-bg .l-stat__col .fas,
1558+
.lang-bg .l-stat__col--active .fas {
1559+
font-size: 0.85rem;
1560+
}
1561+
15291562
.l-select:after {
15301563
pointer-events: none;
15311564
width: 7px;
@@ -3922,6 +3955,8 @@ form#vstobjects.suspended {
39223955

39233956
.userlist-email {
39243957
font-size: 0.75rem;
3958+
white-space: nowrap;
3959+
text-overflow: ellipsis;
39253960
}
39263961

39273962
.userlist-username {

‎web/css/styles.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/inc/i18n/ar.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,4 +856,35 @@
856856
'Enable 2FA' => 'تمكين المصادقة الثنائية',
857857
'Please scan the code below in your 2FA application:' => 'لإنهاء إعداد المصادقة ذات العاملين ، امسح رمز الاستجابة السريعة أدناه <br /> باستخدام تطبيق المصادقة (مثل <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a>):',
858858
'2FA Reset Code:' => 'رمز استرداد الحساب:',
859+
860+
//list user
861+
'Name' => 'Name',
862+
//Add / Edit user
863+
'Contact' => 'Name',
864+
'GREETINGS_GORDON' => "Hello, %s,\n",
865+
866+
//List Mail Accounts
867+
'Forwarding' => 'Forwarding',
868+
869+
//Cron Jobs
870+
'Cron Job' => 'Cron Job',
871+
//Edit server
872+
'Host' => 'Host',
873+
874+
//list Backups
875+
'1 backups' => '1 backups',
876+
'%s backups' => '%s backups',
877+
//list Firewall Rules
878+
'1 firewall rule' => '1 firewall rule',
879+
'%s firewall rules' => '%s firewall rules',
880+
//list ip
881+
'1 banned IP address' => '1 banned IP address',
882+
'%s banned IP addresses' => '%s banned IP addresses',
883+
//list DNS
884+
'Records_DNS' => 'Records',
885+
//Dowload Backup
886+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
887+
'backend server' => 'Backend Server',
888+
'traffic' => 'Traffic',
889+
'disk' => 'Disk',
859890
);

‎web/inc/i18n/az.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,4 +820,35 @@
820820
'Enable 2FA' => 'İki faktorlu identifikasiyanı aktivləşdirin',
821821
'Please scan the code below in your 2FA application:' => 'İki faktorlu identifikasiyanı qurmağı başa çatdırmaq üçün aşağıdakı qr kodu yoxlayın <br /> bir identifikasiya tətbiqindən istifadə edərəkp (kimi <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a>):',
822822
'2FA Reset Code:' => 'Hesab bərpa kodu:',
823+
824+
//list user
825+
'Name' => 'Name',
826+
//Add / Edit user
827+
'Contact' => 'Name',
828+
'GREETINGS_GORDON' => "Hello, %s,\n",
829+
830+
//List Mail Accounts
831+
'Forwarding' => 'Forwarding',
832+
833+
//Cron Jobs
834+
'Cron Job' => 'Cron Job',
835+
//Edit server
836+
'Host' => 'Host',
837+
838+
//list Backups
839+
'1 backups' => '1 backups',
840+
'%s backups' => '%s backups',
841+
//list Firewall Rules
842+
'1 firewall rule' => '1 firewall rule',
843+
'%s firewall rules' => '%s firewall rules',
844+
//list ip
845+
'1 banned IP address' => '1 banned IP address',
846+
'%s banned IP addresses' => '%s banned IP addresses',
847+
//list DNS
848+
'Records_DNS' => 'Records',
849+
//Dowload Backup
850+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
851+
'backend server' => 'Backend Server',
852+
'traffic' => 'Traffic',
853+
'disk' => 'Disk',
823854
);

‎web/inc/i18n/bg.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,5 +846,36 @@
846846
'Enable 2FA' => 'Активиране на двуфакторна автентификация',
847847
'Please scan the code below in your 2FA application:' => 'за да завършите настройката на двуфакторната автентификация, сканирайте QR кода по-долу <br /> с помощта на приложение за удостоверяване (като <a href = "https://play.google.com/store/apps/details?id=com"). google.android.apps.authenticator2 "> Google Удостоверител </a>):',
848848
'2FA Reset Code:' => 'Код за възстановяване на акаунта:',
849+
850+
//list user
851+
'Name' => 'Name',
852+
//Add / Edit user
853+
'Contact' => 'Name',
854+
'GREETINGS_GORDON' => "Hello, %s,\n",
855+
856+
//List Mail Accounts
857+
'Forwarding' => 'Forwarding',
858+
859+
//Cron Jobs
860+
'Cron Job' => 'Cron Job',
861+
//Edit server
862+
'Host' => 'Host',
863+
864+
//list Backups
865+
'1 backups' => '1 backups',
866+
'%s backups' => '%s backups',
867+
//list Firewall Rules
868+
'1 firewall rule' => '1 firewall rule',
869+
'%s firewall rules' => '%s firewall rules',
870+
//list ip
871+
'1 banned IP address' => '1 banned IP address',
872+
'%s banned IP addresses' => '%s banned IP addresses',
873+
//list DNS
874+
'Records_DNS' => 'Records',
875+
//Dowload Backup
876+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
877+
'backend server' => 'Backend Server',
878+
'traffic' => 'Traffic',
879+
'disk' => 'Disk',
849880
);
850881

‎web/inc/i18n/bs.php‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,4 +848,62 @@
848848
'Enable 2FA' => 'Omogući dvofaktorsku provjeru identiteta',
849849
'Please scan the code below in your 2FA application:' => 'Da biste dovršili postavljanje dvofaktorske provjere autentičnosti, skenirajte QR kôd ispod <br /> pomoću autentifikacijske aplikacije (poput <a href = "https://play.google.com/store/apps/details?id=com" google.android.apps.authenticator2 "> Google Autentičar </a>):',
850850
'2FA Reset Code:' => 'Kôd za povrat računa:',
851+
852+
//list user
853+
'Name' => 'Name',
854+
//Add / Edit user
855+
'Contact' => 'Name',
856+
'GREETINGS_GORDON' => "Hello, %s,\n",
857+
858+
//List Mail Accounts
859+
'Forwarding' => 'Forwarding',
860+
861+
//Cron Jobs
862+
'Cron Job' => 'Cron Job',
863+
//Edit server
864+
'Host' => 'Host',
865+
866+
//list Backups
867+
'1 backups' => '1 backups',
868+
'%s backups' => '%s backups',
869+
//list Firewall Rules
870+
'1 firewall rule' => '1 firewall rule',
871+
'%s firewall rules' => '%s firewall rules',
872+
//list ip
873+
'1 banned IP address' => '1 banned IP address',
874+
'%s banned IP addresses' => '%s banned IP addresses',
875+
//list DNS
876+
'Records_DNS' => 'Records',
877+
//Dowload Backup
878+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
879+
//list user
880+
'Name' => 'Name',
881+
//Add / Edit user
882+
'Contact' => 'Name',
883+
'GREETINGS_GORDON' => "Hello, %s,\n",
884+
885+
//List Mail Accounts
886+
'Forwarding' => 'Forwarding',
887+
888+
//Cron Jobs
889+
'Cron Job' => 'Cron Job',
890+
//Edit server
891+
'Host' => 'Host',
892+
893+
//list Backups
894+
'1 backups' => '1 backups',
895+
'%s backups' => '%s backups',
896+
//list Firewall Rules
897+
'1 firewall rule' => '1 firewall rule',
898+
'%s firewall rules' => '%s firewall rules',
899+
//list ip
900+
'1 banned IP address' => '1 banned IP address',
901+
'%s banned IP addresses' => '%s banned IP addresses',
902+
//list DNS
903+
'Records_DNS' => 'Records',
904+
//Dowload Backup
905+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.';
906+
'backend server' => 'Backend Server',
907+
'traffic' => 'Traffic',
908+
'disk' => 'Disk',
851909
);

‎web/inc/i18n/cn.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,4 +861,36 @@
861861
'Enable 2FA' => '启用两因素身份验证',
862862
'Please scan the code below in your 2FA application:' => '要完成两因素身份验证的设置，请扫描以下QR码<br />使用身份验证应用程序，例如 <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google身份验证器</a>):',
863863
'2FA Reset Code:' => '帐户恢复代码：',
864+
865+
//list user
866+
'Name' => 'Name',
867+
//Add / Edit user
868+
'Contact' => 'Name',
869+
'GREETINGS_GORDON' => "Hello, %s,\n",
870+
871+
//List Mail Accounts
872+
'Forwarding' => 'Forwarding',
873+
874+
//Cron Jobs
875+
'Cron Job' => 'Cron Job',
876+
//Edit server
877+
'Host' => 'Host',
878+
879+
//list Backups
880+
'1 backups' => '1 backups',
881+
'%s backups' => '%s backups',
882+
//list Firewall Rules
883+
'1 firewall rule' => '1 firewall rule',
884+
'%s firewall rules' => '%s firewall rules',
885+
//list ip
886+
'1 banned IP address' => '1 banned IP address',
887+
'%s banned IP addresses' => '%s banned IP addresses',
888+
//list DNS
889+
'Records_DNS' => 'Records',
890+
//Dowload Backup
891+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
892+
893+
'backend server' => 'Backend Server',
894+
'traffic' => 'Traffic',
895+
'disk' => 'Disk',
864896
);

‎web/inc/i18n/cz.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,4 +849,35 @@
849849
'Enable 2FA' => 'Enable two-factor authentication',
850850
'Please scan the code below in your 2FA application:' => 'To finish setting up two-factor authentication, scan the QR code below<br />using an authentication app (such as <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a>):',
851851
'2FA Reset Code:' => 'Account Recovery Code:',
852+
//list user
853+
'Name' => 'Name',
854+
//Add / Edit user
855+
'Contact' => 'Name',
856+
'GREETINGS_GORDON' => "Hello, %s,\n",
857+
858+
//List Mail Accounts
859+
'Forwarding' => 'Forwarding',
860+
861+
//Cron Jobs
862+
'Cron Job' => 'Cron Job',
863+
//Edit server
864+
'Host' => 'Host',
865+
866+
//list Backups
867+
'1 backups' => '1 backups',
868+
'%s backups' => '%s backups',
869+
//list Firewall Rules
870+
'1 firewall rule' => '1 firewall rule',
871+
'%s firewall rules' => '%s firewall rules',
872+
//list ip
873+
'1 banned IP address' => '1 banned IP address',
874+
'%s banned IP addresses' => '%s banned IP addresses',
875+
//list DNS
876+
'Records_DNS' => 'Records',
877+
//Dowload Backup
878+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
879+
880+
'backend server' => 'Backend Server',
881+
'traffic' => 'Traffic',
882+
'disk' => 'Disk',
852883
);

‎web/inc/i18n/da.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,4 +850,34 @@
850850
'Enable 2FA' => 'Enable two-factor authentication',
851851
'Please scan the code below in your 2FA application:' => 'To finish setting up two-factor authentication, scan the QR code below<br />using an authentication app (such as <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a>):',
852852
'2FA Reset Code:' => 'Account Recovery Code:',
853+
//list user
854+
'Name' => 'Name',
855+
//Add / Edit user
856+
'Contact' => 'Name',
857+
'GREETINGS_GORDON' => "Hello, %s,\n",
858+
859+
//List Mail Accounts
860+
'Forwarding' => 'Forwarding',
861+
862+
//Cron Jobs
863+
'Cron Job' => 'Cron Job',
864+
//Edit server
865+
'Host' => 'Host',
866+
867+
//list Backups
868+
'1 backups' => '1 backups',
869+
'%s backups' => '%s backups',
870+
//list Firewall Rules
871+
'1 firewall rule' => '1 firewall rule',
872+
'%s firewall rules' => '%s firewall rules',
873+
//list ip
874+
'1 banned IP address' => '1 banned IP address',
875+
'%s banned IP addresses' => '%s banned IP addresses',
876+
//list DNS
877+
'Records_DNS' => 'Records',
878+
//Dowload Backup
879+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
880+
'backend server' => 'Backend Server',
881+
'traffic' => 'Traffic',
882+
'disk' => 'Disk',
853883
);

‎web/inc/i18n/de.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,4 +846,35 @@
846846
'Reset 2FA' => 'Konto entsperren',
847847
'2FA Reset Code' => 'Kontowiederherstellungscode',
848848
'Invalid or missing token' => 'Ungültiger oder fehlender Kontowiederherstellungscode',
849+
850+
//list user
851+
'Name' => 'Name',
852+
//Add / Edit user
853+
'Contact' => 'Name',
854+
'GREETINGS_GORDON' => "Hello, %s,\n",
855+
856+
//List Mail Accounts
857+
'Forwarding' => 'Forwarding',
858+
859+
//Cron Jobs
860+
'Cron Job' => 'Cron Job',
861+
//Edit server
862+
'Host' => 'Host',
863+
864+
//list Backups
865+
'1 backups' => '1 backups',
866+
'%s backups' => '%s backups',
867+
//list Firewall Rules
868+
'1 firewall rule' => '1 firewall rule',
869+
'%s firewall rules' => '%s firewall rules',
870+
//list ip
871+
'1 banned IP address' => '1 banned IP address',
872+
'%s banned IP addresses' => '%s banned IP addresses',
873+
//list DNS
874+
'Records_DNS' => 'Records',
875+
//Dowload Backup
876+
'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
877+
878+
'backend server' => 'Backend Server',
879+
849880
);

0 commit comments

Comments
 (0)