am 6e05caac: (-s ours) am 5b3f6a3a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '6e05caac2cd01479a284d5953658ef7f897715a7':
This commit is contained in: