am ca6ee0a3: (-s ours) am e926ef2b: Import translations. DO NOT MERGE

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