Automatic merge using stringmerge script.
Update .pot file
Update polish translation
Update spanish translation
Update french translation
Comment out orphaned translation
Correct installer version
Prevent a crash during the update of the macro or favourite list
Merge remote-tracking branch 'upstream/master'