am 94723401: (-s ours) am 04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '94723401bdfaf2d1a5c792654fe18d7f6d21607e':
  Import translations. DO NOT MERGE