am 8e9d4735: (-s ours) am f334376f: (-s ours) Import translations. DO NOT MERGE

* commit '8e9d47355ec9208e089a2b784aea5da95c8fca21':
  Import translations. DO NOT MERGE