Merge branch 'translation' of git://git.workbuffer.org/git/koha into master