am cdca8c8e: (-s ours) am f9c3be4d: (-s ours) am c85dde47: Import translations. DO NOT MERGE

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