am fd8f5459: (-s ours) am 0d8c3df4: (-s ours) Import translations. DO NOT MERGE

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