am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin authored
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588  -s ours am: eb8ce942  -s ours
am: 56985a18  -s ours

* commit '56985a18':
a03da71a