Merge branch 'pootle-import'