am 68a179cd: (-s ours) am c9f90deb: (-s ours) Import translations. DO NOT MERGE

* commit '68a179cd970fea0f9c15a80bb46f1f3e052b371e':
  Import translations. DO NOT MERGE