am 13ca31dc: (-s ours) am d18a7b47: (-s ours) Import translations. DO NOT MERGE

* commit '13ca31dcf258d139fc514ee5b55194495d352b0d':
  Import translations. DO NOT MERGE