am b287fd3b: (-s ours) am 96a440d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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