Some fixes to Gaia plurals

With those commits we do successful round-trip conversion of the entire repository of Gaia  `.properties` files (sans a couple of files that has duplicated keys which `po2prop` chocks on, but this is IMO is an upstream bug).