Merge branch 'master' into 'master'

Marius Cramer

2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44

 interface/web/sites/lib/lang/es_web_folder_list.lng

@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Carpeta';
$wb['active_txt'] = 'Activar';
$wb['list_head_txt'] = 'Carpetas Protegidas';
$wb['active_txt'] = 'Activa';
$wb['server_id_txt'] = 'Servidor';
$wb['parent_domain_id_txt'] = 'Sitio web';
$wb['path_txt'] = 'Ruta';