am e2dd0564: (-s ours) am 01444335: (-s ours) Import translations. DO NOT MERGE

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