Merge remote-tracking branch 'intrigeri/po-long-language-codes'