am bb69c0d8: (-s ours) am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE
* commit 'bb69c0d85cdfa60f7b62a35e26c361777aaedb60': Import translations. DO NOT MERGE
This commit is contained in: