am 47d2db68: (-s ours) am f1c6f1d3: Import translations. DO NOT MERGE

* commit '47d2db689d52ead99799272b104cf6c8cd8a889a':
  Import translations. DO NOT MERGE