add back loop2 for backward compatibility
update translations
Merge remote-tracking branch 'upstream/master'