am 711a12f9: (-s ours) am 73a43617: (-s ours) am 007cbcbb: (-s ours) am 3163d3c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '711a12f9': Import translations. DO NOT MERGE