am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '221849b6d68704340754200492329f19cef7979b':
  Import translations. DO NOT MERGE