am 949ed903: am 6fe22531: (-s ours) am b655d545: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '949ed90320462fa502c534293f602ea9ed257fee':
  Import revised translations.  DO NOT MERGE