am aebe3dfe: (-s ours) am 874ae43c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit 'aebe3dfe61ba889962174cf9e24783770af31e02':
  Import revised translations.  DO NOT MERGE