Import translations. DO NOT MERGE am: 6aad762039  -s ours
am: 2688e29689  -s ours

* commit '2688e2968933c0031c6d85fced2b0841b0667d32':
  Import translations. DO NOT MERGE