Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/lib/classes/tform_tpl_generator.inc.php

@@ -311,6 +311,8 @@
         $fp = fopen($lng_file, "w");
         fwrite($fp, "<?php\n");
         foreach($wb_out as $key => $val) {
            $val = str_replace("'", "\\'",$val);
            $key = str_replace("'", "\\'",$key);
            $new_line = '$wb["'.$key.'"] = '."'$val';\n";
            fwrite($fp, $new_line);