am 63c30c50: (-s ours) am 7b8bf370: (-s ours) Import translations. DO NOT MERGE

* commit '63c30c50216606a9ce8dd73f58b78096585d41d8':
  Import translations. DO NOT MERGE