am c95a338e: (-s ours) am a1467911: Import translations. DO NOT MERGE

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