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

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