am a2a960b4: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

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