am 3ccce4c2: (-s ours) am 82839eca: (-s ours) Import translations. DO NOT MERGE

* commit '3ccce4c2deba5d49da4dfbb3e76b140a18f37dcd':
  Import translations. DO NOT MERGE