Success: editors/joe2 v2.9.8
chinese/joe2: resolve conflict
editors/joe: resolve conflict
Success: irc/bitchx v1.1.0.1_4,1
chinese/bitchx: resolve conflict