Automatic merge using stringmerge script.
Update .pot file