am 167a5f5c: (-s ours) am 5fbf5614: (-s ours) Import translations. DO NOT MERGE

* commit '167a5f5c630bcea4b79e91a9347ee9e6daed316b':
  Import translations. DO NOT MERGE