am f7a20d53: (-s ours) am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE
* commit 'f7a20d5349288f5efb7c94c60d7459b335fb9f98': Import translations. DO NOT MERGE
This commit is contained in: