am 9dc9b7be: (-s ours) am 3d6a6e4d: (-s ours) Import translations. DO NOT MERGE

* commit '9dc9b7beebaf35b3cdc983491a1fcb31afcc42e0':
  Import translations. DO NOT MERGE