am 040cfe56: (-s ours) am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '040cfe56112326d470a58b2f55642a234ff3fce2':
  Import translations. DO NOT MERGE