am 1bc53e63: (-s ours) am e7a64624: (-s ours) am adff3f1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1bc53e6339c86602df12b8c14d82b51792712904':
  Import translations. DO NOT MERGE