am c9a1a5d7: (-s ours) am 6df623eb: Import translations. DO NOT MERGE

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