am 6ed30705: (-s ours) Import translations. DO NOT MERGE

* commit '6ed30705f468b2eb036899acf944bda523399fd2':
  Import translations. DO NOT MERGE