am 3d58e229: (-s ours) am bd44640c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '3d58e2292d5133db7efe3367b75e61245460ca06': Import translations. DO NOT MERGE
This commit is contained in: