am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours
am: eb8ce94244 -s ours
* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':
This commit is contained in: