am cbdce695: (-s ours) Import translations. DO NOT MERGE

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