am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE
am: e2b5070c10  -s ours

* commit 'e2b5070c1096e546ff1e1429732b25c1af7d16f5':