am 6ece629c: (-s ours) am 4f439baf: am 490be2c2: (-s ours) am 999477f9: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '6ece629c8dce3cb772020d07d0f0bb800747da0f'

* commit '6ece629c8dce3cb772020d07d0f0bb800747da0f':