Merge branch 'patch-4' of https://github.com/ttcttctw/vesta into ttcttctw-patch-4

Conflicts:
	web/inc/i18n/tw.php

web/inc/i18n/tw.php

@@ -5,7 +5,6 @@
  * Clark's Computer Knowledge Journal (https://www.clark-chen.com)
  * Clark's Hosting Service (https://host.clark-chen.com)
  * Clark Chen (clark@clark-chen.com)
- * Github - https://github.com/ttcttctw/Vesta-Control-Panel-Traditional-Chinese-Translation/blob/master/tw.php
  */
 $LANG['tw'] = array(
     'Packages'  => '方案設定',
@@ -13,9 +12,9 @@ $LANG['tw'] = array(
     'Graphs'  => '資源使用圖表',
     'Statistics'  => '統計資料',
     'Log'  => '系統紀錄',
-    'Server' => '伺服器',
     'Services'  => '服務',
     'Firewall' => '防火牆',
+    'Server' => '伺服器',
     'Updates'  => '系統更新',
     'Log in'  => '登入',
     'Log out'  => '登出',
@@ -38,9 +37,9 @@ $LANG['tw'] = array(
     'UPDATES'  => 'UPDATES',
     'FIREWALL'  => 'FIREWALL',
     'SERVER'  => 'SERVER',
-    'MEMORY'  => '記憶體',
-    'DISK' => '磁碟',
-    'NETWORK' => '網路',
+    'MEMORY'  => 'MEMORY',
+    'DISK'  => 'DISK',
+    'NETWORK'  => 'NETWORK',
     'Web Log Manager'  => 'Web Log Manager',
 
     'Add User'  => '新增使用者',
@@ -175,9 +174,9 @@ $LANG['tw'] = array(
     'DNS Template'  => 'DNS模板',
     'Web Domains'  => '網站網域',
     'SSL Domains'  => 'SSL網域',
-    'Web Aliases'  => '網站次網域',
+    'Web Aliases'  => '網站子網域',
     'per domain'  => '(每網域)',
-    'DNS Domains'  => 'DNS網域',
+    'DNS Domains'  => 'DNS Domains',
     'DNS domains'  => 'DNS網域',
     'DNS records'   => 'DNS紀錄',
     'Name Servers'  => '域名服務器',
@@ -197,7 +196,7 @@ $LANG['tw'] = array(
     'Proxy Extensions'  => 'Nginx擴充',
     'Web Statistics'  => '網站統計',
     'Additional FTP Account'  => '其他FTP帳號',
-    'Path' => '路徑',
+    'Path'  => 'Path',
     'SOA'  => 'SOA',
     'TTL'  => 'TTL',
     'Expire'  => '過期',
@@ -243,15 +242,15 @@ $LANG['tw'] = array(
     'Users'  => '使用者',
     'Load Average'  => '平均負載量',
     'Memory Usage'  => '記憶體使用量',
-    'APACHE2 Usage' => 'Apache2使用量',
-    'HTTPD Usage'  => 'Apache使用量',
-    'NGINX Usage'  => 'NGINX使用量',
-    'MySQL Usage on localhost'  => 'MySQL使用量 (localhost)',
-    'PostgreSQL Usage on localhost'  => 'PostgreSQL使用量 (localhost)',
-    'Bandwidth Usage eth0' => '流量使用量 (eth0)',
-    'Exim Usage' => 'Exim使用量',
-    'FTP Usage'  => 'FTP使用量',
-    'SSH Usage'  => 'SSH使用量',
+    'APACHE2 Usage'  => 'APACHE2 Usage',
+    'HTTPD Usage'  => 'HTTPD Usage',
+    'NGINX Usage'  => 'NGINX Usage',
+    'MySQL Usage on localhost'  => 'MySQL Usage on localhost',
+    'PostgreSQL Usage on localhost'  => 'PostgreSQL Usage on localhost',
+    'Bandwidth Usage eth0'  => 'Bandwidth Usage eth0',
+    'Exim Usage'  => 'Exim Usage',
+    'FTP Usage'  => 'FTP Usage',
+    'SSH Usage'  => 'SSH Usage',
     'reverse proxy'  => '代理伺服器',
     'web server'  => '網站主機',
     'dns server'  => 'DNS主機',
@@ -289,7 +288,7 @@ $LANG['tw'] = array(
     'Mail Support'  => '信箱支援',
     'Advanced options'  => '進階選項',
     'Basic options'  => 'Basic options',
-    'Aliases'  => '次網域',
+    'Aliases'  => '子網域',
     'SSL Certificate'  => 'SSL憑證',
     'SSL Key'  => 'SSL密鑰',
     'SSL Certificate Authority / Intermediate'  => 'SSL中繼憑證',
@@ -319,14 +318,14 @@ $LANG['tw'] = array(
     'Command'  => '指令',
     'Package Name'  => '方案名稱',
     'Netmask'  => '子網路遮罩',
-    'Interface'  => '端口',
+    'Interface'  => '介面卡',
     'Shared'  => '共享',
     'Assigned user'  => '指定使用者',
     'Assigned domain'  => '指定網址',
     'NAT IP association' => 'NAT IP連結',
     'shell'  => 'shell',
     'web domains'  => '網站網域',
-    'web aliases'  => '網站次網域',
+    'web aliases'  => '網站子網域',
     'dns records'  => 'DNS記錄',
     'mail domains'  => '信箱網域',
     'mail accounts'  => '信箱帳號',
@@ -339,7 +338,7 @@ $LANG['tw'] = array(
     'cmd'  => '指令',
     'users'  => '使用者',
     'domains'  => '網域',
-    'aliases'  => '次網域',
+    'aliases'  => '子網域',
     'records'  => '記錄',
     'jobs'  => '任務',
     'username'  => '使用者名稱',
@@ -351,7 +350,7 @@ $LANG['tw'] = array(
     'ip address'  => 'IP位置',
     'IP address'  => 'IP位置',
     'netmask'  => '子網路遮罩',
-    'interface'  => '端口',
+    'interface'  => '介面卡',
     'assigned user'  => '指定使用者',
     'ns1'  => 'ns1',
     'ns2'  => 'ns2',
@@ -378,21 +377,21 @@ $LANG['tw'] = array(
     'City / Locality' => '市 / 地區',
     'Organization' => '組織名稱',
     'Action' => '動作',
-    'Protocol' => '協議',
-    'Port' => '端口',
-    'Comment' => '備註',
-    'Banlist' => '黑名單',
-    'ranges are acceptable' => '可使用範圍(例如:21-22)',
-    'CIDR format is supported' => '支援CIDR格式',
-    'ACCEPT' => '允許',
-    'DROP' => '封鎖',
+    'Protocol' => '協定',
+    'Port' => '連線埠',
+    'Comment' => 'Comment',
+    'Banlist' => 'Banlist',
+    'ranges are acceptable' => 'ranges are acceptable',
+    'CIDR format is supported' => 'CIDR format is supported',
+    'ACCEPT' => 'ACCEPT',
+    'DROP' => 'DROP',
     'TCP' => 'TCP',
     'UDP' => 'UDP',
     'ICMP' => 'ICMP',
     'SSH' => 'SSH',
     'FTP' => 'FTP',
     'VESTA' => 'VESTA',
-    'Add one more Name Server' => '新增域名服務器',
+    'Add one more Name Server' => 'Add one more Name Server',
 
     'web domain' => 'web domain',
     'dns domain' => 'dns domain',
@@ -448,7 +447,7 @@ $LANG['tw'] = array(
     'PACKAGE_CREATED_OK'  => '方案 <a href="/edit/package/?package=%s"><b>%s</b></a> 已加入成功!',
     'SSL_GENERATED_OK' => 'SSL憑證 已加入成功!',
     'RULE_CREATED_OK' => 'Rule 已加入成功!',
-    'BANLIST_CREATED_OK' => 'IP address has been banned successfully',    // I'm not sure about this text
+    'BANLIST_CREATED_OK' => 'IP address has been banned successfully',
     'Autoupdate has been successfully enabled' => '自動更新已成功啟動',
     'Autoupdate has been successfully disabled' => '自動更新已成功關閉',
     'Cronjob email reporting has been successfully enabled' => '任務排程 電子郵件回報已成功啟動',
@@ -499,12 +498,12 @@ $LANG['tw'] = array(
     'RESTORE_SCHEDULED'  => '您的要求已加入隊列中，回復完成後會再以電子郵件通知您',
     'RESTORE_EXISTS'  => '已經有一個回復正在執行中，請等待備份完成後在操作',
 
-    'WEB_EXCLUSIONS' => '輸入網域名稱，每行一個網域。如要排除備份所有網域請使用*。排除特定的資料夾請依照這個格式: Example.com:public_html/cache:public_html/tmp',
-    'DNS_EXCLUSIONS' => '輸入網域名稱，每行一個網域。如要排除備份所有網域請使用*',
-    'MAIL_EXCLUSIONS' => '輸入網域名稱，每行一個網域。如要排除備份所有網域請使用*。要排除特定使用者請依照這個格式: Example.com:info:support:postmaster',
-    'DB_EXCLUSIONS' => '輸入完整資料庫名城，每行一個資料庫。如要排除備份所有資料庫請使用*',
-    'CRON_EXCLUSIONS' => '要排除備份所有任務排程請使用*',
-    'USER_EXCLUSIONS' => '輸入要排除備份的資料夾名稱，每行一個資料夾。如要排除備份所有資料夾請使用*',
+    'WEB_EXCLUSIONS' => "輸入網域名稱，每行一個網域。如要排除備份所有網域請使用*。排除特定的資料夾請依照這個格式: Example.com:public_html/cache:public_html/tmp",
+    'DNS_EXCLUSIONS' => "輸入網域名稱，每行一個網域。如要排除備份所有網域請使用*",
+    'MAIL_EXCLUSIONS' => "輸入網域名稱，每行一個網域。如要排除備份所有網域請使用*。要排除特定使用者請依照這個格式: Example.com:info:support:postmaster",
+    'DB_EXCLUSIONS' => "輸入完整資料庫名城，每行一個資料庫。如要排除備份所有資料庫請使用*",
+    'CRON_EXCLUSIONS' => "要排除備份所有任務排程請使用*",
+    'USER_EXCLUSIONS' => "輸入要排除備份的資料夾名稱，每行一個資料夾。如要排除備份所有資料夾請使用*",
 
     'Welcome to Vesta Control Panel'  => '歡迎來到 Vesta 管理系統',
     'MAIL_FROM'  => 'Vesta 管理系統 <noreply@%s>',
@@ -515,7 +514,7 @@ $LANG['tw'] = array(
     'FTP login credentials'  => 'FTP 登入資料',
     'FTP_ACCOUNT_READY' => "FTP帳號已成功建立，並可以開始使用了!\n\n主機名稱: %s\n使用者名稱: %s_%s\n密碼: %s\n\n--\nVesta Control Panel\n",
 
-    'Database Credentials'  => '資料庫 登入資料',
+    'Database Credentials'  => "資料庫 登入資料",
     'DATABASE_READY' => "資料庫已加入成功!\n\n資料庫名稱: %s\n使用者名稱: %s\n密碼: %s\n%s\n\n--\nVesta Control Panel\n",
 
     'forgot password'  => '忘記密碼',
@@ -524,11 +523,33 @@ $LANG['tw'] = array(
     'Confirm Password'  => '確認密碼',
     'Reset'  => '重設',
     'Reset Code'  => '重設代碼',
-    'RESET_NOTICE'  => '',    // should we add something here?
+    'RESET_NOTICE'  => '',
     'RESET_CODE_SENT'  => '密買重設代碼已發送到您的信箱<br>',
     'MAIL_RESET_SUBJECT'  => '密碼重置在 %s',
     'PASSWORD_RESET_REQUEST' => "重置密碼請點擊連結:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 輸入密碼重設代碼:\n%s\n\n如果您沒有要求重設密碼，請忽略此郵件\n\n—\nVesta Control Panel\n",
 
+    'Run Command' => '執行指令',
+    'every month' => '每月',
+    'every odd month' => '每個單數月',
+    'every even month' => '每個偶數月',
+    'every day' => '每天',
+    'every odd day' => '每次單數日',
+    'every even day' => '每次偶數日',
+    'weekdays (5 days)' => '平常日 (五天)',
+    'weekend (2 days)' => '週末 (兩天)',
+    'Monday' => '星期一',
+    'Tuesday' => '星期二',
+    'Wednesday' => '星期三',
+    'Thursday' => '星期四',
+    'Friday' => '星期五',
+    'Saturday' => '星期六',
+    'Sunday' => '星期日',
+    'every hour' => '每小時',
+    'every two hours' => '每兩小時',
+    'every minute' => '每分鐘',
+    'every two minutes' => '每兩分鐘',
+    'every' => '每',
+
     'Jan' => '1月',
     'Feb' => '2月',
     'Mar' => '3月',
@@ -546,26 +567,26 @@ $LANG['tw'] = array(
     'Hostname' => '主機名稱',
     'Time Zone' => '時區',
     'Default Language' => '預設語言',
-    'Proxy Server' => '代理伺服器',
-    'Web Server' => '網頁伺服器',
+    'Proxy Server' => 'Proxy Server',
+    'Web Server' => 'Web Server',
     'Backend Server' => 'Backend Server',
     'Backend Pool Mode' => 'Backend Pool Mode',
-    'DNS Server' => 'DNS伺服器',
+    'DNS Server' => 'DNS Server',
     'DNS Cluster' => 'DNS Cluster',
-    'MAIL Server' => '郵件伺服器',
-    'Antivirus' => '防毒系統',
-    'AntiSpam' => '防垃圾郵件',
-    'Webmail URL' => '網路信箱網址',
-    'MySQL Support' => 'MySQL支援',
-    'phpMyAdmin URL' => 'phpMyAdmin網址',
-    'PostgreSQL Support' => 'PostgreSQL支援',
+    'MAIL Server' => 'MAIL Server',
+    'Antivirus' => 'Antivirus',
+    'AntiSpam' => 'AntiSpam',
+    'Webmail URL' => 'Webmail URL',
+    'MySQL Support' => 'MySQL Support',
+    'phpMyAdmin URL' => 'phpMyAdmin URL',
+    'PostgreSQL Support' => 'PostgreSQL Support',
     'phpPgAdmin URL' => 'phpPgAdmin URL',
-    'Maximum Number Of Databases' => '資料庫最高可使用數量',
-    'Current Number Of Databases' => '資料庫目前已使用數量',
-    'Local backup' => '本機備份',
-    'Compression level' => '壓縮程度',
-    'Directory' => '路徑',
-    'Remote backup' => '異地備份',
+    'Maximum Number Of Databases' => 'Maximum Number Of Databases',
+    'Current Number Of Databases' => 'Current Number Of Databases',
+    'Local backup' => 'Local backup',
+    'Compression level' => 'Compression level',
+    'Directory' => 'Directory',
+    'Remote backup' => 'Remote backup',
     'ftp' => 'FTP',
     'sftp' => 'SFTP',
     'SFTP Chroot' => 'SFTP Chroot',
@@ -584,7 +605,6 @@ $LANG['tw'] = array(
     'Starred' => '加註星號',
     'Name' => '名稱',
 
-
     'File Manager' => '檔案管理器',
     'size' => '大小',
     'date' => '日期',
@@ -601,7 +621,7 @@ $LANG['tw'] = array(
     'ARCHIVE' => '壓縮',
     'EXTRACT' => '解壓縮',
     'DOWNLOAD' => '下載',
-    'Are you sure?' => 'Are you sure?',    // unused?
+    'Are you sure?' => 'Are you sure?',
     'Hit' => 'Hit',
     'to reload the page' => '重新整理頁面',
     'Directory name cannot be empty' => '資料夾名稱不能為空白',
@@ -688,9 +708,9 @@ $LANG['tw'] = array(
     'Select Bunch of Files' => '選取多個檔案',
     'Add File to the Current Selection' => '增加檔案到已選取的列表',
     'Select All Files' => '選取所有檔案',
-    'shortcuts are inspired by magnificent GNU <a href="https://www.midnight-commander.org/">Midnight Commander</a> file manager' =>
+    'shortcuts are inspired by magnificent GNU <a href="https://www.midnight-commander.org/">Midnight Commander</a> file manager' => 
         "快捷鍵是的想法是由 magnificent GNU <a href='https://www.midnight-commander.org/'>Midnight Commander</a> 檔案管理器 啟發的<br> 繁體中文翻譯是由 <a href='https://host.clark-chen.com'>Clark's 虛擬主機服務</a> 總工程師 <a href='https://www.clark-chen.com/'>Clark Chen</a> 提供。",
-
+    'Save' => '儲存',
     'Licence Key' => '授權金鑰',
     'Enter License Key' => '輸入授權金鑰',
     'Buy Licence' => '購買授權',
@@ -730,13 +750,4 @@ $LANG['tw'] = array(
     'webalizer' => 'webalizer',
     'awstats' => 'awstats',
 
-
-// Texts below doesn't exist in en.php
-    'Bandwidth Usage p2p1' => '流量使用量 (p2p1)',
-    'Bandwidth Usage ppp0' => '流量使用量 (ppp0)',
-    'Bandwidth Usage ppp1' => '流量使用量 (ppp1)',
-    'Bandwidth Usage eth1' => '流量使用量 (eth1)',
-    'Bandwidth Usage sit0' => '流量使用量 (sit0)',
-    'Bandwidth Usage sit1' => '流量使用量 (sit1)',
-    'Bandwidth Usage he-ipv6' => '流量使用量 (he-ipv6)',
 );