Merge remote-tracking branch 'origin/translate-library-annotationlib' into translate-library-annotationlib

# Conflicts:
#	library/annotationlib.po

Author: vadal