am 60638629: (-s ours) am 5885a734: Import translations. DO NOT MERGE

* commit '6063862966c8988dc94f9bcf8e01ed6a817b9e01':
  Import translations. DO NOT MERGE