am 3d1d7a77: (-s ours) am 66838ce1: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE
automerge: 0b9aa50  -s ours

* commit '0b9aa50d2b36c68d92abcdddd8ae529911053c46':
  Import translations. DO NOT MERGE