Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
7
<?php
$wb['confirm_action_txt'] = 'Conferma operazione';
$wb['delete_explanation'] = 'Questa operazione cancellerà i seguenti record associati a questo cliente';
$wb['btn_save_txt'] = 'Cancella cliente';
$wb['btn_cancel_txt'] = 'Annulla senza cancellare il cliente';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
?>