am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'fbb100c437d52db818e6e57c18ffe1e969ba46b0': Import translations. DO NOT MERGE
This commit is contained in: