Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/tools/lib/lang/cz_resync.lng

@@ -12,4 +12,3 @@
$wb['btn_cancel_txt'] = 'Zrušit';
?>