am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE

* commit '22c930457a3f5848ec699fc79e38c4c0d2e5963a':
  Import translations. DO NOT MERGE