diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php
index 879f42368..0b0f40fd4 100644
--- a/web/inc/i18n/tw.php
+++ b/web/inc/i18n/tw.php
@@ -1,476 +1,11 @@
'方案設定',
- 'IP' => 'IP管理',
- 'Graphs' => '資源使用圖表',
- 'Statistics' => '統計資料',
- 'Log' => '系統紀錄',
- 'Services' => '服務',
- 'Firewall' => '防火牆',
- 'Updates' => '系統更新',
- 'Log in' => '登入',
- 'Log out' => '登出',
- 'USER' => '使用者管理',
- 'WEB' => '網站管理',
- 'DNS' => 'DNS管理',
- 'MAIL' => '信箱管理',
- 'DB' => '資料庫',
- 'CRON' => 'CRON',
- 'BACKUP' => '備份',
- 'Add User' => '新增使用者',
- 'Add Domain' => '新增網域',
- 'Add Web Domain' => '新增網站網域',
- 'Add DNS Domain' => '新增DNS網域',
- 'Add DNS Record' => '新增DNS紀錄',
- 'Add Mail Domain' => '新增信箱網域',
- 'Add Mail Account' => '新增信箱帳號',
- 'Add Database' => '新增資料庫',
- 'Add Cron Job' => '新增Cron Job',
- 'Create Backup' => '建立備份',
- 'Configure' => '調整設定',
- 'Restore All' => '全部回復',
- 'Add Package' => '新增方案',
- 'Add IP' => '新增IP',
- 'Add Rule' => '新增規則',
- 'Ban IP Address' => '封鎖IP',
- 'Search' => '搜尋',
- 'Add one more FTP Account' => '增加一個FTP帳號',
- 'Overall Statistics' => '整理統計資料',
- 'Daily' => '每天',
- 'Weekly' => '每週',
- 'Monthly' => '每月',
- 'Yearly' => '每年',
- 'Add' => '新增',
- 'Back' => '返回',
- 'Save' => '儲存',
- 'Submit' => '送出',
- 'toggle all' => '批次執行',
- 'apply to selected' => '套用到所有已選擇的',
- 'rebuild' => '重建',
- 'rebuild web' => '重建網站',
- 'rebuild dns' => '重建DNS',
- 'rebuild mail' => '重建信箱',
- 'rebuild db' => '重建資料庫',
- 'rebuild cron' => '重建 Cron',
- 'update counters' => '更新計數器',
- 'suspend' => '封鎖',
- 'unsuspend' => '解除封鎖',
- 'delete' => '刪除',
- 'show per user' => 'show per user',
- 'login as' => '登入帳號',
- 'logout' => '登出',
- 'edit' => '編輯',
- 'open webstats' => '開啟網站統計資料',
- 'view logs' => '查看系統紀錄',
- 'list records' => '列出 %s 紀錄',
- 'add record' => '新增紀錄',
- 'list accounts' => '列出 %s 帳號',
- 'add account' => '新增帳號',
- 'open webmail' => '開啟網路信箱',
- 'list fail2ban' => '列出登入失敗遭封鎖名單',
- 'open %s' => '開啟 %s',
- 'download' => '下載',
- 'restore' => '回復',
- 'configure restore settings' => '調整回復設定',
- 'stop' => '停止',
- 'start' => '啟動',
- 'restart' => '重新啟動',
- 'update' => '更新',
- 'generate' => '產生',
- 'Generate CSR' => '產生 CSR',
- 'reread IP' => '重新取得IP',
- 'enable autoupdate' => '啟用自動更新',
- 'disable autoupdate' => '停用自動更新',
- 'turn on notifications' => '啟用通知',
- 'turn off notifications' => '停用通知',
- 'Adding User' => '新增使用者',
- 'Editing User' => '編輯使用者',
- 'Adding Domain' => '新增網域',
- 'Editing Domain' => '編輯網域',
- 'Adding DNS Domain' => '新增DNS網域',
- 'Editing DNS Domain' => '編輯DNS網域',
- 'Adding DNS Record' => '新增DNS紀錄',
- 'Editing DNS Record' => '編輯DNS紀錄',
- 'Adding Mail Domain' => '新增信箱網域',
- 'Editing Mail Domain' => '編輯信箱網域',
- 'Adding Mail Account' => '新增信箱帳號',
- 'Editing Mail Account' => '編輯信箱帳號',
- 'Adding database' => '新增資料庫',
- 'Editing Cron Job' => '編輯Cron Job',
- 'Adding Cron Job' => '新增Cron Job',
- 'Editing Database' => '編輯資料庫',
- 'Adding Package' => '新增方案',
- 'Editing Package' => '編輯方案',
- 'Adding IP address' => '新增IP',
- 'Editing IP Address' => '編輯IP',
- 'Editing Backup Exclusions' => '編輯備份排除項目',
- 'Generating CSR' => '產生CSR檔',
- 'Listing' => '列出',
- 'Search Results' => '搜尋結果',
- 'Adding Firewall Rule' => '新增防火牆規則',
- 'Editing Firewall Rule' => '編輯防火牆規則',
- 'Adding IP Address to Banlist' => '新增IP至黑名單',
- 'active' => '正常',
- 'spnd' => '封鎖',
- 'suspended' => '已封鎖',
- 'running' => '執行中',
- 'stopped' => '已停止',
- 'outdated' => '有新版本可升級',
- 'updated' => '已是最新版本',
- 'yes' => '是',
- 'no' => '否',
- 'none' => '無',
- 'pb' => 'PB',
- 'tb' => 'TB',
- 'gb' => 'GB',
- 'mb' => 'MB',
- 'minute' => '分鐘',
- 'hour' => '小時',
- 'day' => '天',
- 'days' => '天',
- 'hours' => '小時',
- 'minutes' => '分鐘',
- 'month' => '月',
- 'package' => '方案',
- 'Bandwidth' => '流量',
- 'Disk' => '磁碟空間',
- 'Web' => '網站',
- 'Mail' => '信箱',
- 'Databases' => '資料庫',
- 'User Directories' => '使用者目錄',
- 'Template' => '模板',
- 'Web Template' => 'Apache模板',
- 'Proxy Template' => 'Nginx模板',
- 'DNS Template' => 'DNS模板',
- 'Web Domains' => '網站網域',
- 'SSL Domains' => 'SSL網域',
- 'Web Aliases' => '網站次網域',
- 'per domain' => '(每網域)',
- 'DNS Domains' => 'DNS網域',
- 'DNS Domains' => 'DNS網域',
- 'DNS records' => 'DNS紀錄' ,
- 'Name Servers' => 'NS主機',
- 'Mail Domains' => '信箱網域',
- 'Mail Accounts' => '信箱使用者',
- 'Cron Jobs' => 'Cron Jobs',
- 'SSH Access' => 'SSH權限',
- 'IP Addresses' => 'IP位置',
- 'Backups' => '備份',
- 'Backup System' => '備份系統',
- 'backup exclusions' => '備份例外',
- 'template' => '模板',
- 'SSL Support' => 'SSL支援',
- 'SSL Home Directory' => 'SSL主目錄',
- 'Proxy Support' => 'Nginx支援',
- 'Proxy Extensions' => 'Nginx擴充',
- 'Web Statistics' => '網站統計',
- 'Additional FTP Account' => '其他FTP帳號',
- 'SOA' => 'SOA',
- 'TTL' => 'TTL',
- 'Expire' => '過期',
- 'Records' => '紀錄',
- 'Catchall email' => '收到所有郵件',
- 'AntiVirus Support' => '防毒支援',
- 'AntiSpam Support' => '防垃圾郵件支援',
- 'DKIM Support' => 'DKIM支援',
- 'Accounts' => '帳號',
- 'Quota' => '配額',
- 'Autoreply' => '自動回覆',
- 'Forward to' => '轉寄到',
- 'Do not store forwarded mail' => '不保留已轉發的郵件',
- 'database' => '資料庫',
- 'User' => '使用者',
- 'Host' => '主機',
- 'Charset' => '編碼',
- 'Min' => '分鐘',
- 'Hour' => '小時',
- 'Day' => '天',
- 'Month' => '月',
- 'Day of week' => '星期幾',
- 'local' => '本地',
- 'Run Time' => '運作時間',
- 'Backup Size' => '備份大小',
- 'SYS' => 'SYS',
- 'Domains' => '網域',
- 'Status' => '狀態',
- 'shared' => '共享',
- 'dedicated' => '獨立',
- 'Owner' => '擁有者',
- 'Users' => '使用者',
- 'Load Average' => '平均負載量',
- 'Memory Usage' => '記憶體使用量',
- 'HTTPD Usage' => 'Apache使用量',
- 'NGINX Usage' => 'NGINX使用量',
- 'MySQL Usage on localhost' => 'MySQL使用量 (localhost)',
- 'PostgreSQL Usage on localhost' => 'PostgreSQL使用量 (localhost)',
- 'Bandwidth Usage eth0' => '網路流量 (eth0)',
- 'FTP Usage' => 'FTP使用量',
- 'SSH Usage' => 'SSH使用量',
- 'reverse proxy' => '反向Proxy',
- 'web server' => '網站主機',
- 'dns server' => 'DNS主機',
- 'mail server' => '信箱主機',
- 'pop/imap server' => 'POP/IMAP主機',
- 'email antivirus' => '信箱防毒',
- 'email antispam' => '信箱防垃圾信',
- 'database server' => '資料庫主機',
- 'ftp server' => 'FTP主機',
- 'job scheduler' => '定時執行指令',
- 'CPU' => 'CPU',
- 'Memory' => '記憶體',
- 'Uptime' => '已啟動時間',
- 'core package' => '核心系統',
- 'php interpreter' => 'PHP讀取',
- 'internal web server' => '網路網站主機',
- 'Version' => '版本',
- 'Release' => '發佈號碼',
- 'Architecture' => 'Architecture',
- 'Object' => 'Object',
- 'Owner' => '擁有者',
- 'Username' => '使用者名稱',
- 'Password' => '密碼',
- 'Email' => '電子信箱',
- 'Package' => '方案',
- 'Language' => '語言',
- 'First Name' => '名字',
- 'Last Name' => '姓氏',
- 'Send login credentials to email address' => '傳送登入資訊至使用者的信箱',
- 'Default Template' => '預設模板',
- 'Default Name Servers' => '預設NS主機',
- 'Domain' => '網域',
- 'DNS Support' => 'DNS支援',
- 'Mail Support' => '信箱支援',
- 'Advanced options' => '進階選項',
- 'Aliases' => '次網域',
- 'SSL Certificate' => 'SSL證書',
- 'SSL Key' => 'SSL密鑰',
- 'SSL Certificate Authority / Intermediate' => 'SSL認證機構/中級',
- 'SSL CSR' => 'SSL CSR',
- 'optional' => '選用',
- 'internal' => '內部',
- 'Statistics Authorization' => '統計授權',
- 'Statistics Auth' => '統計驗證',
- 'Account' => '帳號',
- 'Prefix will be automaticaly added to username' => '前綴 %s 將會自動加到使用者名稱',
- 'Send FTP credentials to email' => '將FTP登入資料傳送到使用者信箱',
- 'Expiration Date' => '到期日期',
- 'YYYY-MM-DD' => 'YYYY-MM-DD',
- 'Name servers' => 'NS伺服器',
- 'Record' => '紀錄',
- 'IP or Value' => 'IP或值',
- 'Priority' => '優先順序',
- 'Record Number' => '記錄編號',
- 'in megabytes' => '以MB為單位',
- 'Message' => '訊息',
- 'use local-part' => '使用本地部分',
- 'one or more email addresses' => '一個或更多郵件地址',
- 'Prefix will be automaticaly added to database name and database user' => '前綴 %s 將會自動加入資料庫名稱及使用者名稱',
- 'Database' => '資料庫',
- 'Type' => '類型',
- 'Minute' => '分鐘',
- 'Command' => '指令',
- 'Package Name' => '方案名稱',
- 'Netmask' => '子網路遮罩',
- 'Interface' => '端口',
- 'Shared' => '共享',
- 'Assigned user' => '指定使用者',
- 'Assigned domain' => '指定網址',
- 'NAT IP association' => 'NAT IP連結',
- 'shell' => 'shell',
- 'web domains' => '網站網域',
- 'web aliases' => '網站次網域',
- 'dns records' => 'DNS記錄',
- 'mail domains' => '信箱網域',
- 'mail accounts' => '信箱帳號',
- 'accounts' => '帳號',
- 'databases' => '資料庫',
- 'cron jobs' => 'Cron Jobs',
- 'backups' => '備份',
- 'quota' => '配額',
- 'day of week' => '星期幾',
- 'cmd' => '指令',
- 'users' => '使用者',
- 'domains' => '網域',
- 'aliases' => '次網域',
- 'records' => '記錄',
- 'jobs' => 'Jobs',
- 'username' => '使用者名稱',
- 'password' => '密碼',
- 'type' => '類型',
- 'charset' => '編碼',
- 'domain' => '網域',
- 'ip' => 'IP',
- 'ip address' => 'IP位置',
- 'IP address' => 'IP位置',
- 'netmask' => '子網路遮罩',
- 'interface' => '端口',
- 'assigned user' => '指定使用者',
- 'ns1' => 'ns1',
- 'ns2' => 'ns2',
- 'user' => '使用者',
- 'email' => '信箱',
- 'first name' => '名字',
- 'last name' => '姓氏',
- 'account' => '帳號',
- 'ssl certificate' => 'SSL 證書',
- 'ssl key' => 'SSL密鑰',
- 'stats user password' => '統計使用者帳號密碼',
- 'stats username' => '統計使用者名稱',
- 'stats password' => '統計密碼',
- 'ftp user password' => 'FTP使用者帳號密碼',
- 'ftp user' => 'FTP使用者',
- 'Last 70 lines of %s.%s.log' => '最後70行的 %s.%s.記錄',
- 'Download AccessLog' => '下載存取記錄',
- 'Download ErrorLog' => '下載錯誤記錄',
- 'Country' => '國家',
- '2 letter code' => '國家簡碼(台灣是TW/香港是HK)',
- 'State / Province' => '州 / 省',
- 'City / Locality' => '市 / 地區',
- 'Organization' => '組織名稱',
- 'Action' => '動作',
- 'Protocol' => 'Protocol',
- 'Port' => 'Port',
- 'Comment' => '備註',
- 'Banlist' => '黑名單',
- 'ranges are acceptable' => '可使用範圍(例如:21-22)',
- 'CIDR format is supported' => '支援CIDR格式',
- 'Add one more Name Server' => 'Add one more Name Server',
-
- '1 account' => '1 帳號',
- '%s accounts' => '%s 帳號',
- '1 domain' => '1 網域',
- '%s domains' => '%s 網域',
- '1 record' => '1 記錄',
- '%s records' => '%s 記錄',
- '1 mail account' => '1 信箱帳號',
- '%s mail accounts' => '%s 信箱帳號',
- '1 database' => '1 資料庫',
- '%s databases' => '%s 資料庫',
- '1 cron job' => '1 Cron Job',
- '%s cron jobs' => '%s Cron Jobs',
- '1 archive' => '1 archive',
- '%s archives' => '%s archives',
- '1 package' => '1 方案',
- '%s packages' => '%s 方案',
- '1 IP address' => '1 IP位置',
- '%s IP addresses' => '%s IP位置',
- '1 month' => '1 月',
- '%s months' => '%s 月',
- '1 log record' => '1 系統記錄',
- '%s log records' => '%s 系統記錄',
- '1 object' => '1 object',
- '%s objects' => '%s objects',
- 'no exclusions' => '取消排除',
- '1 rule' => '1 規則',
- '%s rules' => '%s 規則',
- 'There are no currently banned IP' => '目前沒有任何已封鎖的IP',
- 'USER_CREATED_OK' => '使用者 %s has been 已加入成功!',
- 'WEB_DOMAIN_CREATED_OK' => '網域 %s 已加入成功!',
- 'DNS_DOMAIN_CREATED_OK' => 'DNS網域 %s 已加入成功!',
- 'DNS_RECORD_CREATED_OK' => '記錄 %s.%s 已加入成功!',
- 'MAIL_DOMAIN_CREATED_OK' => '信箱網域 %s 已加入成功!',
- 'MAIL_ACCOUNT_CREATED_OK' => '信箱帳號 %s@%s 已加入成功!',
- 'DATABASE_CREATED_OK' => '資料庫 %s 已加入成功!',
- 'CRON_CREATED_OK' => 'Cron Job 已加入成功!',
- 'IP_CREATED_OK' => 'IP位置 %s 已加入成功!',
- 'PACKAGE_CREATED_OK' => '方案 %s 已加入成功!',
- 'SSL_GENERATED_OK' => 'SSL證書 已加入成功!',
- 'RULE_CREATED_OK' => 'Rule 已加入成功!',
- 'Autoupdate has been successfully enabled' => '自動更新已成功啟動',
- 'Autoupdate has been successfully disabled' => '自動更新已成功關閉',
- 'Cronjob email reporting has been successfully enabled' => 'Cron Job 電子郵件回報已成功啟動',
- 'Cronjob email reporting has been successfully disabled' => 'Cron Job 電子郵件回報已成功關閉',
- 'Changes has been saved.' => '已儲存更改',
- 'Confirmation' => 'Confirmation',
- 'DELETE_USER_CONFIRMATION' => '確定要刪除使用者 %s 嗎?',
- 'SUSPEND_USER_CONFIRMATION' => '確定要封鎖使用者 %s 嗎?',
- 'UNSUSPEND_USER_CONFIRMATION' => '確定要解除封鎖使用者 %s 嗎?',
- 'DELETE_DOMAIN_CONFIRMATION' => '確定要刪除網域 %s 嗎?',
- 'SUSPEND_DOMAIN_CONFIRMATION' => '確定要封鎖網域 %s 嗎?',
- 'UNSUSPEND_DOMAIN_CONFIRMATION' => '確定要解除封鎖網域 %s 嗎?',
- 'DELETE_RECORD_CONFIRMATION' => '確定要刪除記錄 %s 嗎?',
- 'SUSPEND_RECORD_CONFIRMATION' => '確定要封鎖記錄 %s 嗎?',
- 'UNSUSPEND_RECORD_CONFIRMATION' => '確定要解除封鎖紀錄 %s 嗎?',
- 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '確定要刪除 %s 嗎?',
- 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要封鎖 %s 嗎?',
- 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要解除封鎖 %s 嗎?',
- 'DELETE_DATABASE_CONFIRMATION' => '確定要刪除資料庫 %s 嗎?',
- 'SUSPEND_DATABASE_CONFIRMATION' => '確定要封鎖資料庫 %s 嗎?',
- 'UNSUSPEND_DATABASE_CONFIRMATION' => '確定要解除封鎖資料庫 %s 嗎?',
- 'DELETE_CRON_CONFIRMATION' => '確定要刪除 Cron Job嗎?',
- 'SUSPEND_CRON_CONFIRMATION' => '確定要封鎖 Cron Job嗎?',
- 'UNSUSPEND_CRON_CONFIRMATION' => '確定要解除封鎖 Cron Job嗎?',
- 'DELETE_BACKUP_CONFIRMATION' => '確定要刪除 %s 備份嗎?',
- 'DELETE_EXCLUSION_CONFIRMATION' => '確定要刪除 %s 例外嗎?',
- 'DELETE_PACKAGE_CONFIRMATION' => '確定要方案 %s 嗎?',
- 'DELETE_IP_CONFIRMATION' => '確定要刪除IP地址 %s 嗎?',
- 'DELETE_RULE_CONFIRMATION' => '確定要刪除規則 #%s 嗎?',
- 'SUSPEND_RULE_CONFIRMATION' => '確定要封鎖規則 #%s 嗎?',
- 'UNSUSPEND_RULE_CONFIRMATION' => '確定要解除封鎖規則 #%s 嗎?',
- 'RESTART_CONFIRMATION' => '確定要重新啟動 %s 嗎?',
- 'Welcome' => '歡迎',
- 'LOGGED_IN_AS' => '以使用者身份 %s 登入',
- 'Error' => '錯誤',
- 'Invalid username or password' => '無效的使用者名稱或密碼',
- 'Invalid username or code' => '無效的使用者名稱或驗證碼.',
- 'Passwords not match' => '密碼錯誤',
- 'Please enter valid email address.' => '請輸入正確的信箱',
- 'Field "%s" can not be blank.' => '"%s" 不能為空白',
- 'Password is too short.' => '密碼太短 (是少要6個數字+字母)',
- 'Error code:' => '錯誤代碼: %s',
- 'SERVICE_ACTION_FAILED' => '"%s" "%s" 失敗',
- 'IP address is in use' => 'IP位置為使用中',
- 'BACKUP_SCHEDULED' => '您的要求已加入隊列中,備份完成後會再以電子郵件通知您',
- 'BACKUP_EXISTS' => '已經有一個備份正在執行中,請等待備份完成後在操作',
- 'RESTORE_SCHEDULED' => '您的要求已加入隊列中,回復完成後會再以電子郵件通知您',
- 'RESTORE_EXISTS' => '已經有一個回復正在執行中,請等待備份完成後在操作',
- 'WEB_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific dirs use following format: domain.com:public_html/cache:public_html/tmp",
- 'DNS_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *",
- 'MAIL_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific accounts use following format: domain.com:info:support:postmaster",
- 'DB_EXCLUSIONS' => "Type full database name, one per line. To exclude all databases use *",
- 'CRON_EXCLUSIONS' => "To exclude all jobs use *",
- 'USER_EXCLUSIONS' => "Type directory name, one per line. To exlude all dirs use *",
- 'Welcome to Vesta Control Panel' => '歡迎來到 Vesta 管理系統',
- 'MAIL_FROM' => 'Vesta 管理系統 ',
- 'GREETINGS_GORDON_FREEMAN' => "您好, %s %s,\n",
- 'GREETINGS' => "您好,\n",
- 'ACCOUNT_READY' => "您的帳號已成功建立,並可以開始使用了!\n\nhttps://%s/login/\n使用者名稱: %s\n密碼: %s\n\n--\nVesta Control Panel\n",
- '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 登入資料",
- 'DATABASE_READY' => "資料庫已加入成功!\n\n資料庫名稱: %s\n使用者名稱: %s\n密碼: %s\n%s\n\n--\nVesta Control Panel\n",
- 'forgot password' => '忘記密碼',
- 'Confirm' => '確認',
- 'New Password' => '新密碼',
- 'Confirm Password' => '確認密碼',
- 'Reset' => '重設',
- 'Reset Code' => '重設代碼',
- 'RESET_NOTICE' => '',
- 'RESET_CODE_SENT' => '密買重設代碼已發送到您的信箱
',
- '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',
-);
-
-/**
- * Vesta language file
- * 吳汝剛 (ak6783@gmail.com)
->>>>>>> serghey-rodin/master
*/
$LANG['tw'] = array(
'Packages' => '方案設定',
@@ -820,7 +355,6 @@ $LANG['tw'] = array(
'City / Locality' => '市 / 地區',
'Organization' => '組織名稱',
'Action' => '動作',
-<<<<<<< HEAD
'Protocol' => '協議',
'Port' => '端口',
'Comment' => '備註',
@@ -828,16 +362,6 @@ $LANG['tw'] = array(
'ranges are acceptable' => '可使用範圍(例如:21-22)',
'CIDR format is supported' => '支援CIDR格式',
'Add one more Name Server' => '新增域名服務器',
-=======
- 'Protocol' => '通訊協定',
- 'Port' => '連接埠',
- 'Comment' => '註解',
- 'Banlist' => '封鎖清單',
- 'ranges are acceptable' => '可使用範圍',
- 'CIDR format is supported' => 'CIDR 格式是支援的',
- 'Add one more Name Server' => 'Add one more Name Server',
->>>>>>> serghey-rodin/master
-
'1 account' => '1 帳號',
'%s accounts' => '%s 帳號',
'1 domain' => '1 網域',
@@ -865,7 +389,6 @@ $LANG['tw'] = array(
'no exclusions' => '取消排除',
'1 rule' => '1 規則',
'%s rules' => '%s 規則',
-<<<<<<< HEAD
'There are no currently banned IP' => '目前沒有任何已封鎖的IP',
'USER_CREATED_OK' => '使用者 %s has been 已加入成功!',
'WEB_DOMAIN_CREATED_OK' => '網域 %s 已加入成功!',
@@ -911,55 +434,6 @@ $LANG['tw'] = array(
'SUSPEND_RULE_CONFIRMATION' => '確定要封鎖規則 #%s 嗎?',
'UNSUSPEND_RULE_CONFIRMATION' => '確定要解除封鎖規則 #%s 嗎?',
'RESTART_CONFIRMATION' => '確定要重新啟動 %s 嗎?',
-=======
- 'There are no currently banned IP' => '現在沒有被封鎖的 IP',
-
- 'USER_CREATED_OK' => '使用者 %s 已經建立成功。',
- 'WEB_DOMAIN_CREATED_OK' => '網域 %s 已經建立成功。',
- 'DNS_DOMAIN_CREATED_OK' => 'DNS 網域 %s 已經建立成功。',
- 'DNS_RECORD_CREATED_OK' => '紀錄 %s.%s 已經建立成功。',
- 'MAIL_DOMAIN_CREATED_OK' => '電子郵件網域 %s 已經建立成功。',
- 'MAIL_ACCOUNT_CREATED_OK' => '電子郵件帳號 %s@%s 已經建立成功。',
- 'DATABASE_CREATED_OK' => '資料庫 %s 已經建立成功。',
- 'CRON_CREATED_OK' => '排程工作已經建立成功。',
- 'IP_CREATED_OK' => 'IP 位址 %s 已經建立成功。',
- 'PACKAGE_CREATED_OK' => '套件 %s 已經建立成功。',
- 'SSL_GENERATED_OK' => '憑證已經產生成功。',
- 'RULE_CREATED_OK' => '規則已經建立成功。',
- 'Autoupdate has been successfully enabled' => '自動更新已經成功啟用了。',
- 'Autoupdate has been successfully disabled' => '自動更新已經成功停用了。',
- 'Cronjob email reporting has been successfully enabled' => '排程工作的電子郵件回報已經成功啟用了',
- 'Cronjob email reporting has been successfully disabled' => '排程工作的電子郵件回報已經成功停用了',
- 'Changes has been saved.' => '變更已經儲存。',
- 'Confirmation' => '確認',
- 'DELETE_USER_CONFIRMATION' => '您確定要刪除使用者 %s 嗎?',
- 'SUSPEND_USER_CONFIRMATION' => '您確定要暫停使用者 %s 嗎?',
- 'UNSUSPEND_USER_CONFIRMATION' => '您確定要取消暫停使用者 %s 嗎?',
- 'DELETE_DOMAIN_CONFIRMATION' => '您確定要刪除網域 %s 嗎?',
- 'SUSPEND_DOMAIN_CONFIRMATION' => '您確定要暫停網域 %s 嗎?',
- 'UNSUSPEND_DOMAIN_CONFIRMATION' => '您確定要取消暫停網域 %s 嗎?',
- 'DELETE_RECORD_CONFIRMATION' => '您確定要刪除紀錄 %s 嗎?',
- 'SUSPEND_RECORD_CONFIRMATION' => '您確定要暫停紀錄 %s 嗎?',
- 'UNSUSPEND_RECORD_CONFIRMATION' => '您確定要取消暫停紀錄 %s 嗎?',
- 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '您確定要刪除 %s 嗎?',
- 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '您確定要暫停 %s 嗎?',
- 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '您確定要取消暫停 %s 嗎?',
- 'DELETE_DATABASE_CONFIRMATION' => '您確定要刪除資料庫 %s 嗎?',
- 'SUSPEND_DATABASE_CONFIRMATION' => '您確定要暫停資料庫 %s 嗎?',
- 'UNSUSPEND_DATABASE_CONFIRMATION' => '您確定要取消暫停資料庫 %s 嗎?',
- 'DELETE_CRON_CONFIRMATION' => '您確定要刪除排程工作嗎?',
- 'SUSPEND_CRON_CONFIRMATION' => '您確定要暫停排程工作嗎?',
- 'UNSUSPEND_CRON_CONFIRMATION' => '您確定要取消暫停排程工作嗎?',
- 'DELETE_BACKUP_CONFIRMATION' => '您確定要刪除 %s 備份嗎?',
- 'DELETE_EXCLUSION_CONFIRMATION' => '您確定要刪除 %s 例外清單嗎?',
- 'DELETE_PACKAGE_CONFIRMATION' => '您確定要刪除套件 %s 嗎?',
- 'DELETE_IP_CONFIRMATION' => '您確定要刪除 IP 位址 %s 嗎?',
- 'DELETE_RULE_CONFIRMATION' => '您確定要刪除規則 #%s 嗎?',
- 'SUSPEND_RULE_CONFIRMATION' => '您確定要暫停規則 #%s 嗎?',
- 'UNSUSPEND_RULE_CONFIRMATION' => '您確定要取消暫停規則 #%s 嗎?',
- 'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?',
- 'RESTART_CONFIRMATION' => '您確定您要重新啟動 %s 嗎?',
->>>>>>> serghey-rodin/master
'Welcome' => '歡迎',
'LOGGED_IN_AS' => '以使用者身份 %s 登入',
'Error' => '錯誤',
@@ -1001,7 +475,6 @@ $LANG['tw'] = array(
'RESET_CODE_SENT' => '密買重設代碼已發送到您的信箱
',
'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",
-
'Jan' => '1月',
'Feb' => '2月',
'Mar' => '3月',
@@ -1014,7 +487,6 @@ $LANG['tw'] = array(
'Oct' => '10月',
'Nov' => '11月',
'Dec' => '12月',
-
'Configuring Server' => '配置主機',
'Hostname' => '主機名稱',
'Time Zone' => '時區',
@@ -1028,12 +500,10 @@ $LANG['tw'] = array(
'Backup Migration Manager' => '備份轉移管理器',
'FileManager' => '檔案管理器',
'show: CPU / MEM / NET / DISK' => '顯示: 處理器 / 記憶體 / 網路 / 硬碟',
-
'sort by' => '排序按照',
'Date' => '日期',
'Starred' => '加註星號',
'Name' => '名稱',
-
'File Manager' => '檔案管理器',
'type' => '類型',
'size' => '大小',
@@ -1077,7 +547,6 @@ $LANG['tw'] = array(
'already exists' => '已經存在',
'Create file' => '新增檔案',
'Create directory' => '新增資料夾',
-
'Add New object' => '新增',
'Save Form' => '儲存設定',
'Cancel saving form' => '不要儲存設定',
@@ -1093,7 +562,6 @@ $LANG['tw'] = array(
'Move backward through top menu' => '在頂置選單中向左移動',
'Move forward through top menu' => '在頂置選單中向右移動',
'Enter focused element' => '進去選擇的選項',
-
'Upload' => '上傳',
'New File' => '新增檔案',
'New Folder' => '新增資料夾',
@@ -1121,8 +589,6 @@ $LANG['tw'] = array(
'shortcuts are inspired by magnificent GNU Midnight Commander file manager' =>
'快捷鍵是的想法是由 magnificent GNU Midnight Commander 檔案管理器 啟發的',
'Save' => '儲存',
-
-<<<<<<< HEAD
'Licence Key' => '授權金鑰',
'Enter License Key' => '輸入授權金鑰',
'Buy Licence' => '購買授權',
@@ -1133,122 +599,4 @@ $LANG['tw'] = array(
'Restrict users so that they cannot use SSH and access only their home directory.' => '限制使用者只能在SSH中使用他們自己的資料夾',
'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '瀏覽、複製、編輯、取得你所有的網站資料使用全能的檔案管理器',
'This is a commercial module, you would need to purchace license key to enable it.' => '這是一個付費模組,您需要購買授權金鑰才能啟動它。'
-=======
- 'Configuring Server' => 'Configuring Server',
- 'Hostname' => 'Hostname',
- 'Time Zone' => 'Time Zone',
- 'Default Language' => 'Default Language',
- 'FileSystem Disk Quota' => 'FileSystem Disk Quota',
- 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins',
- 'preview' => 'preview',
- 'Reseller Role' => 'Reseller Role',
- 'Web Config Editor' => 'Web Config Editor',
- 'Template Manager' => 'Template Manager',
- 'Backup Migration Manager' => 'Backup Migration Manager',
- 'FileManager' => 'FileManager',
- 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK',
->>>>>>> serghey-rodin/master
-
- 'sort by' => 'sort by',
- 'Date' => 'Date',
- 'Starred' => 'Starred',
- 'Name' => 'Name',
-
- 'File Manager' => 'File Manager',
- 'type' => 'type',
- 'size' => 'size',
- 'date' => 'date',
- 'name' => 'name',
- 'Initializing' => 'Initializing',
- 'UPLOAD' => 'UPLOAD',
- 'NEW FILE' => 'NEW FILE',
- 'NEW DIR' => 'NEW DIR',
- 'DELETE' => 'DELETE',
- 'RENAME' => 'RENAME',
- 'COPY' => 'COPY',
- 'ARCHIVE' => 'ARCHIVE',
- 'EXTRACT' => 'EXTRACT',
- 'DOWNLOAD' => 'DOWNLOAD',
- 'Hit' => 'Hit',
- 'to reload the page' => 'to reload the page',
- 'Directory name cannot be empty' => 'Directory name cannot be empty',
- 'File name cannot be empty' => 'File name cannot be empty',
- 'No file selected' => 'No file selected',
- 'No file or folder selected' => 'No file or folder selected',
- 'File type not supported' => 'File type not supported',
- 'Directory download not available in current version' => 'Directory download not available in current version',
- 'Directory not available' => 'Directory not available',
- 'Done' => 'Done',
- 'Close' => 'Close',
- 'Copy' => 'Copy',
- 'Cancel' => 'Cancel',
- 'Rename' => 'Rename',
- 'Delete' => 'Delete',
- 'Extract' => 'Extract',
- 'Create' => 'Create',
- 'Compress' => 'Compress',
- 'OK' => 'OK',
- 'Are you sure you want to copy' => 'Are you sure you want to copy',
- 'Are you sure you want to delete' => 'Are you sure you want to delete',
- 'into' => 'into',
- 'existing files will be replaced' => 'existing files will be replaced',
- 'Original name' => 'Original name',
- 'File' => 'File',
- 'already exists' => 'already exists',
- 'Create file' => 'Create file',
- 'Create directory' => 'Create directory',
-
- 'Add New object' => 'Add New object',
- 'Save Form' => 'Save Form',
- 'Cancel saving form' => 'Cancel saving form',
- 'Go to USER list' => 'Go to USER list',
- 'Go to WEB list' => 'Go to WEB list',
- 'Go to DNS list' => 'Go to DNS list',
- 'Go to MAIL list' => 'Go to MAIL list',
- 'Go to DB list' => 'Go to DB list',
- 'Go to CRON list' => 'Go to CRON list',
- 'Go to BACKUP list' => 'Go to BACKUP list',
- 'Focus on search' => 'Focus on search',
- 'Display/Close shortcuts' => 'Display/Close shortcuts',
- 'Move backward through top menu' => 'Move backward through top menu',
- 'Move forward through top menu' => 'Move forward through top menu',
- 'Enter focused element' => 'Enter focused element',
-
- 'Upload' => 'Upload',
- 'New File' => 'New File',
- 'New Folder' => 'New Folder',
- 'Download' => 'Download',
- 'Rename' => 'Rename',
- 'Copy' => 'Copy',
- 'Archive' => 'Archive',
- 'Delete' => 'Delete',
- 'Save File (in text editor)' => 'Save File (in text editor)',
- 'Close Popup / Cancel' => 'Close Popup / Cancel',
- 'Move Cursor Up' => 'Move Cursor Up',
- 'Move Cursor Dow' => 'Move Cursor Dow',
- 'Switch to Left Tab' => 'Switch to Left Tab',
- 'Switch to Right Tab' => 'Switch to Right Tab',
- 'Switch Tab' => 'Switch Tab',
- 'Go to the Top of File List' => 'Go to the Top of File List',
- 'Go to the Last File' => 'Go to the Last File',
- 'Open File/Enter Directory' => 'Open File/Enter Directory',
- 'Go to Parent Directory' => 'Go to Parent Directory',
- 'Select Current File' => 'Select Current File',
- 'Select Bunch of Files' => 'Select Bunch of Files',
- 'Append File to the Current Selection' => 'Append File to the Current Selection',
- 'Select All Files' => 'Select All Files',
- 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' =>
- 'shortcuts are inspired by magnificent GNU Midnight Commander file manager',
-
- 'Licence Key' => 'Licence Key',
- 'Enter License Key' => 'Enter License Key',
- 'Buy Licence' => 'Buy Licence',
- 'Buy Lifetime License' => 'Buy Lifetime License',
- 'Disable and Cancel Licence' => 'Disable and Cancel Licence',
- 'Licence Activated' => 'Licence Activated',
- 'Licence Deactivated' => 'Licence Deactivated',
- 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.',
- 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.',
- 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.'
-
);
\ No newline at end of file