am c846fcc2: (-s ours) am 1e73eb40: Import translations. DO NOT MERGE

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