am f4f14efc: (-s ours) am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit 'f4f14efc79b82b7f99d311ae59ec394d60ae81c1': Import translations. DO NOT MERGE
This commit is contained in: