am 823a3181: (-s ours) Translations for bug 2067035.  DO NOT MERGE

Merge commit '823a318197cf9e838a5ee16c8878cb23bfed1c43' into eclair

* commit '823a318197cf9e838a5ee16c8878cb23bfed1c43':
  Translations for bug 2067035.  DO NOT MERGE