Merge change Ia245b1c4 into eclair-mr2

* changes:
  Add a string for upload file button.