am 688cd80c: (-s ours) am deb0189c: (-s ours) am 4b67a56b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '688cd80ca66fc872cc10b6ad51facf332d66ab0d':
  Import translations. DO NOT MERGE