am dcb83484: (-s ours) am 6164b166: (-s ours) am 840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'dcb83484644fe212345b6f5f1689480fa4a624b8':
  Import translations. DO NOT MERGE