Marius Cramer
2015-05-07 c2470177339f1db5bb5750dd955285b1b63c25e3
Merge branch 'master' into 'master'

Master

See merge request !186
46 files modified
92 ■■■■ changed files
interface/web/vm/lib/lang/ar_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ar_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/bg_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/bg_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/br_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/br_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/cz_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/cz_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/de_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/de_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/en_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/en_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/es_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/es_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fi_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fi_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hr_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hr_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hu_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hu_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/id_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/id_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/it_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/it_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ja_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ja_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/nl_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/nl_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pl_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pl_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pt_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pt_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ro_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ro_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ru_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ru_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/se_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/se_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/sk_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/sk_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/tr_openvz_template.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/tr_openvz_vm.lng 2 ●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ar_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/ar_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/bg_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/bg_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/br_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/br_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -91,6 +91,6 @@
$wb['Template'] = 'Šablona';
$wb['Advanced'] = 'Pokročilý';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -38,6 +38,6 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Pokročilý';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/de_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Erweitert';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/de_openvz_vm.lng
@@ -37,5 +37,5 @@
$wb['template_nameserver_error_empty'] = 'Nameserver ist leer.';
$wb['Virtual server'] = 'Virtueller Server';
$wb['Advanced'] = 'Erweitert';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/el_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/el_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Εικονικός server';
$wb['Advanced'] = 'Για προχωρημένους';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/en_openvz_template.lng
@@ -92,5 +92,5 @@
$wb["Advanced"] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb['features_txt'] = 'iptables';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/en_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb["Virtual server"] = 'Virtual server';
$wb["Advanced"] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/es_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Plantilla';
$wb['Advanced'] = 'Avanzado';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/es_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Servidor virtual';
$wb['Advanced'] = 'Avanzado';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/fi_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/fi_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/fr_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Modèle';
$wb['Advanced'] = 'Avancé';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/fr_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Serveur virtuel';
$wb['Advanced'] = 'Avancé';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/hr_openvz_template.lng
@@ -91,7 +91,7 @@
$wb['Template'] = 'Predložak';
$wb['Advanced'] = 'Napredno';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/hr_openvz_vm.lng
@@ -38,7 +38,7 @@
$wb['Virtual server'] = 'Virtualni server';
$wb['Advanced'] = 'Napredno';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/hu_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/hu_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/id_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/id_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/it_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/it_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/ja_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/ja_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/nl_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/nl_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/pl_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/pl_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/pt_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/pt_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/ro_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/ro_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/ru_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/ru_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/se_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/se_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/sk_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/sk_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/tr_openvz_template.lng
@@ -91,5 +91,5 @@
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>
interface/web/vm/lib/lang/tr_openvz_vm.lng
@@ -38,5 +38,5 @@
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb[iptables_txt] = iptables;
$wb["iptables_txt"] = "iptables";
?>