am ff1f1c45: (-s ours) am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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