Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 interface/web/admin/lib/lang/ro_server.lng

@@ -8,5 +8,8 @@
$wb['db_server_txt'] = 'DB-Server';
$wb['vserver_server_txt'] = 'VServer-Server';
$wb['active_txt'] = 'Active';
$wb['mirror_server_id_txt'] = 'Is mirror of Server';
$wb['- None -'] = '- None -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>