am 04769f32: (-s ours) am 8713e74c: am c36184a8: Import translations. DO NOT MERGE

* commit '04769f324f2945e11bdf35816fe53f385e3ff6fb':
  Import translations. DO NOT MERGE