am 3adaf780: (-s ours) am 02ef7720: (-s ours) Import translations. DO NOT MERGE

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