Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

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

@@ -6,4 +6,3 @@
$wb['btn_cancel_txt'] = 'Zpět';
?>