am 4f2ff756: (-s ours) am 082c7dbc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4f2ff756e169984abf955fc02e060b681d1f0f20':
  Import translations. DO NOT MERGE