am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am: ab474588ce  -s ours

* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':