am 1606dcc9: (-s ours) am 59b2307e: am ea631334: (-s ours) am 92a90a31: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '1606dcc982d51c4966340dc7d888b976c9791266'

* commit '1606dcc982d51c4966340dc7d888b976c9791266':