am 9387ca53: (-s ours) am bbc9e48d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9387ca53f6faa4eab4ac681a87eef768cdc28046':
  Import translations. DO NOT MERGE