scripts/update_translations.php now pulls updated files from TranslateWiki and merges them to an updated master.
Note that the .po files exported from TranslateWiki do lose some of the old manual comments for now.
We sometimes need to specify a country when setting a locale but the system knows how to grab the generic dir, and that seems to play better with translation tools such as transifex