am 233692b0: (-s ours) am f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '233692b051050faf37931ac8013839de7785f0f2': Import translations. DO NOT MERGE
This commit is contained in: