am 63c0e12b: (-s ours) am 41c3cb38: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '63c0e12ba03e6aba207cf006d2a883343553b399':
  Import translations. DO NOT MERGE