resolving repo conflicts

This commit is contained in:
Serghey Rodin 2016-06-25 11:07:06 +03:00
commit 704bf770f7
9 changed files with 963 additions and 375 deletions

View file

@ -129,85 +129,86 @@ $LANG['cn'] = array(
'outdated' => '过期',
'updated' => '更新',
'yes' => '是',
'no' => '否',
'none' => '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' => 'Web模板',
'Backend Template' => 'Backend模板',
'Proxy Template' =>'Proxy模板',
'DNS Template' => 'DNS模板',
'Web Domains' => '网站域名',
'SSL Domains' => 'SSL域名',
'Web Aliases' => '网站别名',
'per domain' => '个域名',
'DNS Domains' => 'DNS域名',
'DNS Domains' => 'DNS域名',
'DNS records' => 'DNS记录' ,
'Name Servers' => 'Name Servers',
'Mail Domains' => '邮局域名',
'Mail Accounts' => '邮箱账户',
'Cron Jobs' => '定时任务',
'SSH Access' => 'SSH权限',
'IP Addresses' => 'IP地址',
'Backups' => '备份',
'Backup System' => '备份系统',
'backup exclusions' => '排除',
'template' => '模板',
'SSL Support' => 'SSL支持',
'SSL Home Directory' => 'SSL主目录',
'Proxy Support' => 'Proxy代理支持',
'Proxy Extensions' => 'Proxy扩展',
'Web Statistics' => 'Web统计',
'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' => '独立',
'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' => 'Web模板',
'Backend Template' => '后台模板',
'Proxy Template' => '代理模板',
'DNS Template' => 'DNS模板',
'Web Domains' => '网站域名',
'SSL Domains' => 'SSL域名',
'Web Aliases' => '网站别名',
'per domain' => '每域名',
'DNS domains' => 'DNS域名',
'DNS Domains' => 'DNS域名',
'DNS records' => 'DNS记录' ,
'Name Servers' => 'DNS服务器',
'Mail Domains' => '邮箱域名',
'Mail Accounts' => '邮箱账户',
'Cron Jobs' => '定时任务',
'SSH Access' => 'SSH权限',
'IP Addresses' => 'IP地址',
'Backups' => '备份',
'Backup System' => '备份系统',
'backup exclusions' => '备份排除项目',
'template' => '模板',
'SSL Support' => 'SSL支持',
'SSL Home Directory' => 'SSL主目录',
'Proxy Support' => '代理支持',
'Proxy Extensions' => '代理扩展名',
'Proxy Extentions' => '代理扩展名',
'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' => '平均负载',
@ -642,4 +643,4 @@ $LANG['cn'] = array(
'Hour' => 'Hour',
'Minute' => 'Minute'
);
);