am 2690ccc4: (-s ours) am ede1ab8e: (-s ours) Import revised translations.  DO NOT MERGE

* commit '2690ccc41b9d3d48705cd2b507d85671f7a19ef7':
  Import revised translations.  DO NOT MERGE