am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '61c9706bac583a1cf95be12d7f5e96f652669d72':