am 4bbce856: (-s ours) Import translations. DO NOT MERGE

* commit '4bbce8561fa19a3935f4d294d6b31cdf54771165':
  Import translations. DO NOT MERGE