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

* commit '56985a1867525557fd15a1b74fc768945ebc56c6':