am a4293a9b: (-s ours) am 7608492d: (-s ours) Import translations. DO NOT MERGE
automerge: da02921  -s ours

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