chanserv/op and friends: mark strings for translation
Merge remote-tracking branch 'upstream/master'