am bba150b6: (-s ours) am febf1b9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

* commit 'bba150b6fc733847a04014abb22624c2c9456025':
  Import translations. DO NOT MERGE