Skip to content

Commit 522ef8b

Browse files
committed
Merged language files.
1 parent cb8ae5d commit 522ef8b

File tree

1,047 files changed

+7595
-4162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,047 files changed

+7595
-4162
lines changed

install/dist/conf/centos52.conf.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,7 @@
202202
$conf['cron']['crontab_dir'] = '/etc/cron.d';
203203
$conf['cron']['wget'] = '/usr/bin/wget';
204204

205+
//* OpenVZ
206+
$conf['openvz']['installed'] = false;
207+
205208
?>

install/dist/conf/centos53.conf.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,7 @@
202202
$conf['cron']['crontab_dir'] = '/etc/cron.d';
203203
$conf['cron']['wget'] = '/usr/bin/wget';
204204

205+
//* OpenVZ
206+
$conf['openvz']['installed'] = false;
207+
205208
?>

install/dist/conf/debian40.conf.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,5 +224,8 @@
224224
$conf['cron']['crontab_dir'] = '/etc/cron.d';
225225
$conf['cron']['wget'] = '/usr/bin/wget';
226226

227+
//* OpenVZ
228+
$conf['openvz']['installed'] = false;
229+
227230

228231
?>

install/dist/conf/debian60.conf.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,8 @@
206206
$conf['nginx']['php_fpm_start_port'] = 9010;
207207
$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
208208

209-
//* Ufw
210-
$conf['ufw']['installed'] = false;
211-
$conf['squid']['config_dir'] = '/etc/ufw';
212-
$conf['squid']['init_script'] = 'ufw';
209+
//* OpenVZ
210+
$conf['openvz']['installed'] = false;
213211

214212
//*Bastille-Firwall
215213
$conf['bastille']['installed'] = false;

install/dist/conf/fedora9.conf.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,7 @@
202202
$conf['cron']['crontab_dir'] = '/etc/cron.d';
203203
$conf['cron']['wget'] = '/usr/bin/wget';
204204

205+
//* OpenVZ
206+
$conf['openvz']['installed'] = false;
207+
205208
?>

install/dist/conf/gentoo.conf.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,7 @@
219219
$conf['cron']['group'] = 'cron';
220220
$conf['cron']['wget'] = '/usr/bin/wget';
221221

222+
//* OpenVZ
223+
$conf['openvz']['installed'] = false;
224+
222225
?>

install/dist/conf/opensuse110.conf.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,7 @@
202202
$conf['cron']['crontab_dir'] = '/etc/cron.d';
203203
$conf['cron']['wget'] = '/usr/bin/wget';;
204204

205+
//* OpenVZ
206+
$conf['openvz']['installed'] = false;
207+
205208
?>

install/dist/conf/opensuse112.conf.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,7 @@
202202
$conf['cron']['crontab_dir'] = '/etc/cron.d';
203203
$conf['cron']['wget'] = '/usr/bin/wget';
204204

205+
//* OpenVZ
206+
$conf['openvz']['installed'] = false;
207+
205208
?>

install/lib/installer_base.lib.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ public function find_installed_apps() {
134134
if(is_installed('nginx')) $conf['nginx']['installed'] = true;
135135
if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
136136
if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
137+
if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
137138
if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
138139

139140
if ($conf['services']['web'] && $conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) $this->ispconfig_interface_installed = true;
@@ -263,7 +264,7 @@ public function add_database_server_record() {
263264
$dns_server_enabled = ($conf['services']['dns'])?1:0;
264265
$file_server_enabled = ($conf['services']['file'])?1:0;
265266
$db_server_enabled = ($conf['services']['db'])?1:0;
266-
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
267+
$vserver_server_enabled = ($conf['openvz']['installed'])?1:0;
267268
$proxy_server_enabled = ($conf['services']['proxy'])?1:0;
268269
$firewall_server_enabled = ($conf['services']['firewall'])?1:0;
269270

interface/lib/lang/bg.lng

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
<?php
2-
$wb['conf_format_dateshort'] = "Y-m-d";
3-
$wb['conf_format_datelong'] = "l dS of F Y";
4-
$wb['conf_format_timeshort'] = "H:i";
5-
$wb['conf_format_timelong'] = "H:i:s";
6-
$wb['conf_format_datetime'] = "Y-m-d H:i";
7-
$wb['number_format_decimals'] = "2";
8-
$wb['number_format_dec_point'] = ".";
9-
$wb['number_format_thousands_sep'] = "";
10-
$wb['error_301'] = "Този модул не е разрешен за текущия потреител.";
11-
$wb['error_302'] = "Невалиден модул.";
12-
$wb['error_1001'] = "Потребителското име и паролата не могат да бъдат празни!";
13-
$wb['error_1002'] = "Грешно потребителско име и/или парола!";
14-
$wb['error_1003'] = "Потребителят не е активен!";
15-
$wb['delete_confirmation'] = "Наистина ли желате да изтриете този запис?";
16-
$wb['error_no_view_permission'] = "Нямате право да видите този запис или записът не съществува!";
17-
$wb['error_no_delete_permission'] = "Нямате право да изтриете този запис!";
18-
$wb['page_txt'] = "Page";
19-
$wb['page_of_txt'] = "of";
20-
$wb['page_next_txt'] = "Next";
21-
$wb['page_back_txt'] = "Back";
22-
$wb['delete_txt'] = "Delete";
23-
$wb['filter_txt'] = "Filter";
24-
$wb['add_new_record_txt'] = "Add new record";
25-
$wb['btn_save_txt'] = "Save";
26-
$wb['btn_cancel_txt'] = "Cancel";
27-
$wb['toolsarea_head_txt'] = "Tools";
28-
$wb['page_and_txt'] = "and";
29-
$wb['top_menu_system'] = "System";
30-
$wb['top_menu_client'] = "Client";
31-
$wb['top_menu_email'] = "Email";
32-
$wb['top_menu_monitor'] = "Monitor";
33-
$wb['top_menu_sites'] = "Сайтове";
34-
$wb['top_menu_dns'] = "DNS";
35-
$wb['top_menu_tools'] = "Инструменти";
36-
$wb['top_menu_help'] = "Помощ";
37-
$wb['top_menu_billing'] = "Billing";
38-
$wb['top_menu_domain'] = "Domains";
39-
$wb['top_menu_dashboard'] = "Начало";
40-
$wb['latest_news_txt'] = "Последни новини";
2+
$wb['conf_format_dateshort'] = 'Y-m-d';
3+
$wb['conf_format_datelong'] = 'l dS of F Y';
4+
$wb['conf_format_timeshort'] = 'H:i';
5+
$wb['conf_format_timelong'] = 'H:i:s';
6+
$wb['conf_format_datetime'] = 'Y-m-d H:i';
7+
$wb['number_format_decimals'] = '2';
8+
$wb['number_format_dec_point'] = '.';
9+
$wb['number_format_thousands_sep'] = '';
10+
$wb['error_301'] = 'Този модул не е разрешен за текущия потреител.';
11+
$wb['error_302'] = 'Невалиден модул.';
12+
$wb['error_1001'] = 'Потребителското име и паролата не могат да бъдат празни!';
13+
$wb['error_1002'] = 'Грешно потребителско име и/или парола!';
14+
$wb['error_1003'] = 'Потребителят не е активен!';
15+
$wb['delete_confirmation'] = 'Наистина ли желате да изтриете този запис?';
16+
$wb['error_no_view_permission'] = 'Нямате право да видите този запис или записът не съществува!';
17+
$wb['error_no_delete_permission'] = 'Нямате право да изтриете този запис!';
18+
$wb['page_txt'] = 'Page';
19+
$wb['page_of_txt'] = 'of';
20+
$wb['page_next_txt'] = 'Next';
21+
$wb['page_back_txt'] = 'Back';
22+
$wb['delete_txt'] = 'Delete';
23+
$wb['filter_txt'] = 'Filter';
24+
$wb['add_new_record_txt'] = 'Add new record';
25+
$wb['btn_save_txt'] = 'Save';
26+
$wb['btn_cancel_txt'] = 'Cancel';
27+
$wb['toolsarea_head_txt'] = 'Tools';
28+
$wb['page_and_txt'] = 'and';
29+
$wb['top_menu_system'] = 'System';
30+
$wb['top_menu_client'] = 'Client';
31+
$wb['top_menu_email'] = 'Email';
32+
$wb['top_menu_monitor'] = 'Monitor';
33+
$wb['top_menu_sites'] = 'Сайтове';
34+
$wb['top_menu_dns'] = 'DNS';
35+
$wb['top_menu_tools'] = 'Инструменти';
36+
$wb['top_menu_help'] = 'Помощ';
37+
$wb['top_menu_billing'] = 'Billing';
38+
$wb['top_menu_domain'] = 'Domains';
39+
$wb['top_menu_dashboard'] = 'Начало';
40+
$wb['latest_news_txt'] = 'Последни новини';
41+
$wb['top_menu_vm'] = 'VServer';
4142
?>
42-

0 commit comments

Comments
 (0)