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

* commit '0ada814a36a86e87af1b03de8482620684c4b17c':
  Import translations. DO NOT MERGE