am c60a5923: (-s ours) am 149ceebc: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
* commit 'c60a59235d0805e2f18c15956c3520f587a29e32':
This commit is contained in: