am 874ae43c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
  Import revised translations.  DO NOT MERGE