am c3d9d48b: (-s ours) am e6f46829: (-s ours) Import translations. DO NOT MERGE

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