am 5ed46db2: (-s ours) am c88b099d: Import translations. DO NOT MERGE

* commit '5ed46db21536d86eab824d9a8571341e8efb720c':
  Import translations. DO NOT MERGE