am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521  -s ours automerge: ecd9daa  -s ours

* commit 'dc9dc7fa9499b279571c7256815448014b1696ed':
  Import translations. DO NOT MERGE