am 22bc9f43: (-s ours) am dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '22bc9f4381e4b058124095abf50209c475c02908':
  Import translations. DO NOT MERGE