am 986c267b: (-s ours) am 235e727e: (-s ours) Import translations. DO NOT MERGE

* commit '986c267bd035edff4b457a002b4e2010bc8a78da':
  Import translations. DO NOT MERGE