am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE

* commit '4487e0aac4270f3ab429d27f454d4eb1efb19a6b':
  Import translations. DO NOT MERGE