am a2880fdc: (-s ours) am 4fdb052f: Import translations. DO NOT MERGE

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