am fd3f7cc5: (-s ours) am 46466fcb: (-s ours) Import translations. DO NOT MERGE

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