am 696175c8: (-s ours) am e40dff3d: (-s ours) am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit '696175c8473af962e08990007d582b831b74ccc7': Import translations. DO NOT MERGE
This commit is contained in: