am c74ec672: (-s ours) am 13ec7b20: (-s ours) Import translations. DO NOT MERGE

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