7461c297
Conflicts: the language catalogs (both sides' rows kept), ATTRIBUTION.toml's checksums (recomputed from the merged files), and tests both sides appended at the same place. Upstream's new Vietnamese catalog gets this change's labels.