@Nick: OK. How can I merge the 4.8 .po files into master? I assume that it's not simply *uploading* the 4.8 po files to their corresponding master packages, because some strings will be different....