.pot update and .po merge