Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -8,5 +8,6 @@
$wb['db_server_txt'] = 'БД';
$wb['vserver_server_txt'] = 'VСервер';
$wb['add_new_record_txt'] = 'Добавить новый сервер';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>