am bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGE
* commit 'bd74dff8b451a7099beb6cacc54f1062d58b5054': Import translations. DO NOT MERGE
This commit is contained in: