Merge pull request #1 from serghey-rodin/master

Обновление из основного репозитория весты от 30 января 2020 г

bin/v-add-firewall-chain

@@ -22,7 +22,7 @@ protocol=$(echo $protocol|tr '[:lower:]' '[:upper:]')
 iptables="/sbin/iptables"
 
 # Get vesta port by reading nginx.conf
-vestaport=$(grep 'listen' /usr/local/vesta/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||")
+vestaport=$(grep 'listen' $VESTA/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||")
 if [ -z "$vestaport" ]; then
     vestaport=8083
 fi

bin/v-add-letsencrypt-domain

@@ -110,8 +110,8 @@ fi
 
 # Requesting nonce / STEP 1
 answer=$(curl -s -I "$API/directory")
-nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
+nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
-status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ')
+status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
 if [[ "$status" -ne 200 ]]; then
     check_result $E_CONNECT "Let's Encrypt nonce request status $status"
 fi
@@ -126,10 +126,10 @@ done
 payload=$(echo "$payload"|sed "s/,$//")
 payload=$payload']}'
 answer=$(query_le_v2 "$url" "$payload" "$nonce")
-nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
+nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
 authz=$(echo "$answer" |grep "acme/authz" |cut -f2 -d '"')
 finalize=$(echo "$answer" |grep 'finalize":' |cut -f4 -d '"')
-status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ')
+status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ')
 if [[ "$status" -ne 201 ]]; then
     check_result $E_CONNECT "Let's Encrypt new auth status $status"
 fi
@@ -140,8 +140,8 @@ for auth in $authz; do
     answer=$(query_le_v2 "$auth" "$payload" "$nonce")
     url=$(echo "$answer" |grep -A3 $proto |grep url |cut -f 4 -d \")
     token=$(echo "$answer" |grep -A3 $proto |grep token |cut -f 4 -d \")
-    nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
+    nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
-    status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ')
+    status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
     if [[ "$status" -ne 200 ]]; then
         check_result $E_CONNECT "Let's Encrypt acme/authz bad status $status"
     fi
@@ -199,8 +199,8 @@ for auth in $authz; do
         payload='{}'
         answer=$(query_le_v2 "$url" "$payload" "$nonce")
         validation=$(echo "$answer"|grep -A1 $proto |tail -n1|cut -f4 -d \")
-        nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
+        nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
-        status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ')
+        status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
         if [[ "$status" -ne 200 ]]; then
             check_result $E_CONNECT "Let's Encrypt validation status $status"
         fi
@@ -225,8 +225,8 @@ ssl_dir=$($BIN/v-generate-ssl-cert "$domain" "info@$domain" "US" "California"\
 csr=$(openssl req -in $ssl_dir/$domain.csr -outform DER |encode_base64)
 payload='{"csr":"'$csr'"}'
 answer=$(query_le_v2 "$finalize" "$payload" "$nonce")
-nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
+nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
-status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ')
+status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
 certificate=$(echo "$answer"|grep 'certificate":' |cut -f4 -d '"')
 if [[ "$status" -ne 200 ]]; then
     check_result $E_CONNECT "Let's Encrypt finalize bad status $status"

bin/v-add-letsencrypt-user

@@ -103,16 +103,16 @@ fi
 
 
 # Requesting ACME nonce
-nonce=$(curl -s -I "$API/directory" |grep Nonce |cut -f 2 -d \ |tr -d '\r\n')
+nonce=$(curl -s -I "$API/directory" |grep -i nonce |cut -f2 -d\ |tr -d '\r\n')
 
 # Creating ACME account
 url="$API/acme/new-acct"
 payload='{"termsOfServiceAgreed": true}'
 answer=$(query_le_v2 "$url" "$payload" "$nonce")
-kid=$(echo "$answer" |grep Location: |cut -f2 -d ' '|tr -d '\r')
+kid=$(echo "$answer" |grep -i location: |cut -f2 -d ' '|tr -d '\r')
 
 # Checking answer status
-status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ')
+status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ')
 if [[ "${status:0:2}" -ne "20" ]]; then
     check_result $E_CONNECT "Let's Encrypt acc registration failed $status"
 fi

src/deb/ioncube/control

@@ -1,7 +1,7 @@
 Source: vesta-ioncube
 Package: vesta-ioncube
 Priority: optional
-Version: 0.9.8-25
+Version: 0.9.8-26
 Section: admin
 Maintainer: Serghey Rodin <skid@vestacp.com>
 Homepage: https://www.ioncube.com

src/deb/nginx/control

@@ -1,7 +1,7 @@
 Source: vesta-nginx
 Package: vesta-nginx
 Priority: optional
-Version: 0.9.8-25
+Version: 0.9.8-26
 Section: admin
 Maintainer: Serghey Rodin <skid@vestacp.com>
 Homepage: http://vestacp.com

src/deb/php/control

@@ -1,7 +1,7 @@
 Source: vesta-php
 Package: vesta-php
 Priority: optional
-Version: 0.9.8-25
+Version: 0.9.8-26
 Section: admin
 Maintainer: Serghey Rodin <skid@vestacp.com>
 Homepage: http://vestacp.com

src/deb/softaculous/control

@@ -1,7 +1,7 @@
 Source: vesta-softaculous
 Package: vesta-softaculous
 Priority: optional
-Version: 0.9.8-25
+Version: 0.9.8-26
 Section: admin
 Maintainer: Serghey Rodin <skid@vestacp.com>
 Homepage: https://www.softaculous.com

src/deb/vesta/control

@@ -1,7 +1,7 @@
 Source: vesta
 Package: vesta
 Priority: optional
-Version: 0.9.8-25
+Version: 0.9.8-26
 Section: admin
 Maintainer: Serghey Rodin <skid@vestacp.com>
 Homepage: http://vestacp.com

src/rpm/specs/vesta-ioncube.spec

@@ -1,6 +1,6 @@
 Name:           vesta-ioncube
 Version:        0.9.8
-Release:        25
+Release:        26
 Summary:        ionCube Loader
 Group:          System Environment/Base
 License:        "Freely redistributable without restriction"

src/rpm/specs/vesta-nginx.spec

@@ -1,6 +1,6 @@
 Name:           vesta-nginx
 Version:        0.9.8
-Release:        25
+Release:        26
 Summary:        Vesta Control Panel
 Group:          System Environment/Base
 License:        BSD-like

src/rpm/specs/vesta-php.spec

@@ -1,6 +1,6 @@
 Name:           vesta-php
 Version:        0.9.8
-Release:        25
+Release:        26
 Summary:        Vesta Control Panel
 Group:          System Environment/Base
 License:        GPL

src/rpm/specs/vesta-softaculous.spec

@@ -1,6 +1,6 @@
 Name:           vesta-softaculous
 Version:        0.9.8
-Release:        25
+Release:        26
 Summary:        Vesta Control Panel
 Group:          System Environment/Base
 License:        Softaculous License

src/rpm/specs/vesta.spec

@@ -1,6 +1,6 @@
 Name:           vesta
 Version:        0.9.8
-Release:        25
+Release:        26
 Summary:        Vesta Control Panel
 Group:          System Environment/Base
 License:        GPL
@@ -68,6 +68,9 @@ fi
 %config(noreplace) %{_vestadir}/web/css/uploadify.css
 
 %changelog
+* Sat Sep 29 2019 Serghey Rodin <builder@vestacp.com> - 0.9.8-26
+- Let's Encrypt HTTP/2 support
+
 * Thu Aug 15 2019 Serghey Rodin <builder@vestacp.com> - 0.9.8-25
 - Security bugfixes
 - LEv2 idn fix

upd/add_notifications.sh

@@ -5,4 +5,4 @@ rm -f /usr/local/vesta/data/users/admin/notifications.conf
 /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, copy, edit, view, and retrieve all your web domain files using a fully featured <a href='http://vestacp.com/features/#filemanager'>File Manager</a>. Plugin is available for <a href='/edit/server/?lead=filemanager#module-filemanager'>purchase</a>." 'filemanager'
 /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want to have SFTP accounts that will be used only to transfer files (and not to SSH), you can  <a href='/edit/server/?lead=sftp#module-sftp'>purchase</a> and enable <a href='http://vestacp.com/features/#sftpchroot'>SFTP Chroot</a>"
 /usr/local/vesta/bin/v-add-user-notification admin "Softaculous" "Softaculous is one of the best Auto Installers and it is finally <a href='/edit/server/?lead=sftp#module-softaculous'>available</a>"
-/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-25" "This release is about stability and refinement. We added Let's Encrypt v2 support and added server certificate management tools. For more information please read <a href='http://vestacp.com/history/#0.9.8-25'>release notes</a>"
+/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-26" "This release adds support for Lets Encrypt HTTP/2. For more information please read <a href='http://vestacp.com/history/#0.9.8-26'>release notes</a>"

web/edit/mail/index.php

@@ -72,13 +72,14 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
 
     $v_domain = escapeshellarg($_GET['domain']);
     $v_account = escapeshellarg($_GET['account']);
+    $v_account_without_quotas = $_GET['account'];
 
     // Parse autoreply
     if ( $v_autoreply == 'yes' ) {
         exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." ".$v_domain." ".$v_account." json", $output, $return_var);
         $autoreply_str = json_decode(implode('', $output), true);
         unset($output);
-        $v_autoreply_message = $autoreply_str[$v_account]['MSG'];
+        $v_autoreply_message = $autoreply_str[$v_account_without_quotas]['MSG'];
         $v_autoreply_message=str_replace("\\n", "\n", $v_autoreply_message);
     }
 }

web/inc/i18n/id.php

@@ -196,7 +196,7 @@ $LANG['id'] = array(
     'SSL Home Directory'  => 'Direktori Home SSL',
     'Lets Encrypt Support'  => 'Dukungan Lets Encrypt',
     'Lets Encrypt'  => 'Lets Encrypt',
-    'Your certificate will be automatically issued in 5 minutes' => 'Sertifikat anda akan otomatis didapat dalam 5 menit',
+    'Your certificate will be automatically issued in 5 minutes' => 'Sertifikat anda akan otomatis diterbitkan dalam 5 menit',
     'Proxy Support'  => 'Dukungan Proxy',
     'Proxy Extensions'  => 'Ekstensi Proxy',
     'Web Statistics'  => 'Statistik Web',
@@ -219,11 +219,11 @@ $LANG['id'] = array(
     'IMAP hostname'  => 'hostname IMAP',
     'IMAP port'  => 'port IMAP',
     'IMAP security'  => 'keamanan IMAP',
-    'IMAP auth method'  => 'metode autentikasi IMAP',
+    'IMAP auth method'  => 'metode otentikasi IMAP',
     'SMTP hostname'  => 'hostname SMTP',
     'SMTP port'  => 'port SMTP',
     'SMTP security'  => 'keamanan SMTP',
-    'SMTP auth method'  => 'metode autentikasi SMTP',
+    'SMTP auth method'  => 'metode otentikasi SMTP',
     'STARTTLS'  => 'STARTTLS',
     'Normal password'  => 'kata sandi',
     'database'  => 'basis data',
@@ -237,7 +237,7 @@ $LANG['id'] = array(
     'Day of week'  => 'Hari dalam Minggu',
     'local'  => 'lokal',
     'Run Time'  => 'Run Time',
-    'Backup Size'  => 'Ukuran Backup',
+    'Backup Size'  => 'Ukuran Cadangan',
     'SYS'  => 'SYS',
     'Domains'  => 'Domains',
     'Status'  => 'Status',
@@ -268,25 +268,25 @@ $LANG['id'] = array(
     'ftp server'  => 'server ftp',
     'job scheduler'  => 'jadwal pekerjaan',
     'firewall'  => 'firewall',
-    'brute-force monitor'  => 'brute-force monitor',
+    'brute-force monitor'  => 'pantau brute-force',
     'CPU'  => 'CPU',
     'Memory'  => 'Memori',
     'Uptime'  => 'Uptime',
     'core package'  => 'paket inti',
     'php interpreter'  => 'php interpreter',
-    'internal web server'  => 'internal web server',
+    'internal web server'  => 'server web internal',
     'Version'  => 'Versi',
     'Release'  => 'Rilis',
     'Architecture'  => 'Arsitektur',
     'Object'  => 'Objek',
     'Username'  => 'Nama Pengguna',
     'Password'  => 'Kata sandi',
-    'Email'  => 'Email',
+    'Email'  => 'Surel',
     'Package'  => 'Paket',
     'Language'  => 'Bahasa',
     'First Name'  => 'Nama Depan',
     'Last Name'  => 'Nama Belakang',
-    'Send login credentials to email address'  => 'Kirim kredensial login ke alamat email',
+    'Send login credentials to email address'  => 'Kirim kredensial login ke alamat surel',
     'Default Template'  => 'Template Standar',
     'Default Name Servers'  => 'Name Servers Standar',
     'Domain'  => 'Domain',
@@ -300,13 +300,13 @@ $LANG['id'] = array(
     'SSL Certificate Authority / Intermediate'  => 'Otoritas Sertifikat SSL / Menengah',
     'SSL CSR' => 'SSL CSR',
     'optional'  => 'opsi',
-    'internal' => 'intern',
+    'internal' => 'internal',
     'Statistics Authorization'  => 'Statistik Otoritas',
     'Statistics Auth'  => 'Statistik Otoritas',
     'Account'  => 'Pengguna',
-    'Prefix will be automaticaly added to username'  => 'Prefix %s nantinya ditambahin otomatis ke nama pengguna',
+    'Prefix will be automaticaly added to username'  => 'Prefix %s akan otomatis ditambahkan ke nama pengguna',
-    'Send FTP credentials to email'  => 'Kirim kredensial FTP ke email',
+    'Send FTP credentials to email'  => 'Kirim kredensial FTP ke surel',
-    'Expiration Date'  => 'Tanggal Kadaluarsa',
+    'Expiration Date'  => 'Tanggal Kadaluwarsa',
     'YYYY-MM-DD'  => 'YYYY-MM-DD',
     'Name servers'  => 'Name server',
     'Record'  => 'Record',
@@ -316,7 +316,7 @@ $LANG['id'] = array(
     'in megabytes'  => 'dalam megabytes',
     'Message'  => 'Pesan',
     'use local-part'  => 'gunakan part lokal',
-    'one or more email addresses'  => 'satu atau lebih alamat email',
+    'one or more email addresses'  => 'satu atau lebih alamat surel',
     'Prefix will be automaticaly added to database name and database user'  => 'Prefix  %s akan otomatis ditambahkan ke nama basis data dan pengguna basis data',
     'Database'  => 'Basis Data',
     'Type'  => 'Jenis',
@@ -407,7 +407,7 @@ $LANG['id'] = array(
     'cron job' => 'cron job',
 
     'cron' => 'cron',
-    'user dir' => 'dir pengguna',
+    'user dir' => 'direktori pengguna',
 
     'unlimited'  => 'tidak terbatas',
     '1 account'  => '1 pengguna',
@@ -489,14 +489,14 @@ $LANG['id'] = array(
     'RESTART_CONFIRMATION' => 'Apakah anda yakin ingin me-restart %s?',
     'Welcome'  => 'Selamat Datang',
     'LOGGED_IN_AS'  => 'Masuk sebagai pengguna %s',
-    'Error'  => 'Kesalahan',
+    'Error'  => 'Galat',
     'Invalid username or password'  => 'Nama pengguna atau kata sandi salah',
     'Invalid username or code'  => 'Kode atau nama pengguna salah',
     'Passwords not match'  => 'Kata sandi tidak sama',
     'Please enter valid email address.'  => 'Masukkan alamat surel yang valid.',
     'Field "%s" can not be blank.'  => 'Field "%s" tidak boleh kosong.',
     'Password is too short.'  => 'Kata sandi terlalu pendek (minimal 6 karakter)',
-    'Error code:'  => 'Kode kesalahan: %s',
+    'Error code:'  => 'Kode galat: %s',
     'SERVICE_ACTION_FAILED'  => '"%s" "%s" gagal',
     'IP address is in use' => 'Alamat IP sudah digunakan',
     'BACKUP_SCHEDULED'  => 'Tugas sudah ditambahkan ke antrian. email pemberitahuan akan dikirim ketika cadangan telah siap diunduh.',
@@ -560,11 +560,11 @@ $LANG['id'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate',
+    'Use Web Domain SSL Certificate' => 'Gunakan Sertifikat SSL Domain Web',
     'Webmail URL' => 'Webmail URL',
-    'MySQL Support' => 'MySQL Support',
+    'MySQL Support' => 'Dukungan MySQL',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
-    'PostgreSQL Support' => 'PostgreSQL Support',
+    'PostgreSQL Support' => 'Dukungan PostgreSQL',
     'phpPgAdmin URL' => 'phpPgAdmin URL',
     'Maximum Number Of Databases' => 'Jumlah maximal basis data',
     'Current Number Of Databases' => 'Jumlah database saat ini',
@@ -581,7 +581,7 @@ $LANG['id'] = array(
     'Reseller Role' => 'Aturan Reseller',
     'Web Config Editor' => 'Web Config Editor',
     'Template Manager' => 'Template Manager',
-    'Backup Migration Manager' => 'Backup Migration Manager',
+    'Backup Migration Manager' => 'Manajer Migrasi Cadangan',
     'FileManager' => 'FileManager',
     'show: CPU / MEM / NET / DISK' => 'tampilkan: CPU / MEM / NET / DISK',
 
@@ -598,7 +598,7 @@ $LANG['id'] = array(
     'name' => 'nama',
     'Initializing' => 'Inisialisasi',
     'UPLOAD' => 'UNGGAH',
-    'NEW FILE' => 'FILE BARU',
+    'NEW FILE' => 'BERKAS BARU',
     'NEW DIR' => 'DIREKTORI BARU',
     'DELETE' => 'HAPUS',
     'RENAME' => 'GANTI',
@@ -612,10 +612,10 @@ $LANG['id'] = array(
     'Hit' => 'Hit',
     'to reload the page' => 'untuk memuat ulang halaman',
     'Directory name cannot be empty' => 'Nama Direktori tidak boleh kosong',
-    'File name cannot be empty' => 'Nama File tidak boleh kosong',
+    'File name cannot be empty' => 'Nama berkas tidak boleh kosong',
-    'No file selected' => 'Tidak ada file yang dipilih',
+    'No file selected' => 'Tidak ada berkas yang dipilih',
-    'No file or folder selected' => 'Tidak ada file atau folder yg dipilih',
+    'No file or folder selected' => 'Tidak ada berkas atau folder yg dipilih',
-    'File type not supported' => 'Tipe file tidak didukung',
+    'File type not supported' => 'Tipe berkas tidak didukung',
     'Directory download not available in current version' => 'Direktori Unduh tidak tersedia di versi ini',
     'Directory not available' => 'Direktori tidak tersedia',
     'Done' => 'Selesai',
@@ -633,21 +633,21 @@ $LANG['id'] = array(
     'YOU ARE COPYING' => 'ANDA MENYALIN',
     'YOU ARE REMOVING' => 'ANDA MENGHAPUS',
     'Delete items' => 'Hapus item',
-    'Copy files' => 'Salin file',
+    'Copy files' => 'Salin berkas',
-    'Move files' => 'Pindah file',
+    'Move files' => 'Pindah berkas',
     'Are you sure you want to copy' => 'Apakah anda yakin ingin menyalin',
     'Are you sure you want to move' => 'Apakah anda yakin ingin memindahkan',
     'Are you sure you want to delete' => 'Aapakah anda Yakin ingin menghapus',
     'into' => 'ke',
-    'existing files will be replaced' => 'file yang sudah ada akan diganti',
+    'existing files will be replaced' => 'berkas yang sudah ada akan diganti',
     'Original name' => 'Nama orisinal',
-    'File' => 'File',
+    'File' => 'Berkas',
     'already exists' => 'sudah ada',
-    'Create file' => 'Buat file',
+    'Create file' => 'Buat berkas',
     'Create directory' => 'Buat direktori',
-    'read by owner' => 'dibaca oleh owner',
+    'read by owner' => 'dibaca oleh pemilik',
-    'write by owner' => 'ditulis oleh owner',
+    'write by owner' => 'ditulis oleh pemilik',
-    'execute/search by owner' => 'eksekusi/cari oleh owner',
+    'execute/search by owner' => 'eksekusi/cari oleh pemilik',
     'read by group' => 'dibaca oleh grup',
     'write by group' => 'ditulis oleh grup',
     'execute/search by group' => 'ekseskusi/cari oleh grup',
@@ -671,30 +671,30 @@ $LANG['id'] = array(
     'Move backward through top menu' => 'Pindah ke sebelumnya lewat menu atas',
     'Move forward through top menu' => 'Pindah ke setelahnya lewat menu atas',
     'Enter focused element' => 'Masuk ke fokus elemen',
-    'Move up through elements list' => 'Move up through elements list',
+    'Move up through elements list' => 'Pindah ke atas melalui daftar elemen',
-    'Move down through elements list' => 'Move down through elements list',
+    'Move down through elements list' => 'Pindah ke bawah melalui daftar elemen',
 
     'Upload' => 'Unggah',
-    'New File' => 'File baru',
+    'New File' => 'Berkas baru',
     'New Folder' => 'Folder baru',
     'Download' => 'Unduh',
     'Archive' => 'Arsip',
-    'Save File (in text editor)' => 'Simpan File (di text editor)',
+    'Save File (in text editor)' => 'Simpan berkas (di penyunting teks)',
     'Close Popup / Cancel' => 'Tutup Popup / Batal',
     'Move Cursor Up' => 'Pindahkan kursor keatas',
     'Move Cursor Down' => 'Pindahkan kursor kebawah',
     'Switch to Left Tab' => 'Pindah ke tab kiri',
     'Switch to Right Tab' => 'Pindah ke tab kanan',
     'Switch Tab' => 'Pindah Tab',
-    'Go to the Top of the File List' => 'Pindah Ke atas dari Daftar File',
+    'Go to the Top of the File List' => 'Pindah Ke atas dari Daftar Berkas',
-    'Go to the Last File' => 'Pindah File terakhir',
+    'Go to the Last File' => 'Pindah Berkas terakhir',
-    'Open File / Enter Directory' => 'Buka File/Masuk ke Direktori',
+    'Open File / Enter Directory' => 'Buka Berkas/Masuk ke Direktori',
-    'Edit File' => 'Sunting File',
+    'Edit File' => 'Sunting Berkas',
     'Go to Parent Directory' => 'Ke Direktori Induk',
-    'Select Current File' => 'Pilih File ini',
+    'Select Current File' => 'Pilih Berkas ini',
-    'Select Bunch of Files' => 'Pilih Bunch of Files',
+    'Select Bunch of Files' => 'Pilih banyak berkas',
-    'Add File to the Current Selection' => 'Tambahkan File di Seleksi ini',
+    'Add File to the Current Selection' => 'Tambahkan Berkas diseleksi ini',
-    'Select All Files' => 'Pilih semua file',
+    'Select All Files' => 'Pilih semua berkas',
     'shortcuts are inspired by magnificent GNU <a href="https://www.midnight-commander.org/">Midnight Commander</a> file manager' =>
         'pintasan terinspirasi oleh magnificent GNU <a href="https://www.midnight-commander.org/">Midnight Commander</a> file manager',
 
@@ -706,7 +706,7 @@ $LANG['id'] = array(
     'Licence Activated' => 'Lisensi telah aktif',
     'Licence Deactivated' => 'Lisensi telah di nonaktifkan',
     'Restrict users so that they cannot use SSH and access only their home directory.' => 'Batasi pengguna agar tidak dapat menggunakan SSH dan hanya dapat mengakses direktori home.',
-    'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Jelajahi, salin, sunting, lihat dan dapatkan semua file web anda menggunakan File Manager.',
+    'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Jelajahi, salin, sunting, lihat dan dapatkan semua berkas web anda menggunakan File Manager.',
     'This is a commercial module, you would need to purchace license key to enable it.' => 'Ini modul komersial, anda perlu membayar lisensi untuk mengaktifkannya.',
 
     'Minutes' => 'Permenit',

web/inc/i18n/nl.php

@@ -758,5 +758,5 @@ $LANG['nl'] = array(
 
     'maximum characters length, including prefix' => 'maximaal %s karakters lang, inclusief prefix',
 
-    'Email Credentials' => 'Email Credentials',
+    'Email Credentials' => 'E-mailreferenties',
 );