am 1c0d716d: (-s ours) am 07f447c0: (-s ours) Import translations. DO NOT MERGE

* commit '1c0d716d14e29c018821c9f64ad19cf37b9bad46':
  Import translations. DO NOT MERGE