Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

 interface/lib/lang/en.lng

@@ -26,7 +26,7 @@
$wb['filter_txt'] = "Filter";
$wb['add_new_record_txt'] = "Add new record";
$wb['btn_save_txt'] = "Save";
$wb['btn_cancel_txt'] = "Back";
$wb['btn_cancel_txt'] = "Cancel";
$wb['top_menu_system'] = 'System';
$wb['top_menu_client'] = 'Client';
$wb['top_menu_email'] = 'Email';