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

* commit '554b43a066b6a084dbb9b7dba014de4b12ba1175':
  Import translations. DO NOT MERGE