Merge change 6630 into donut

* changes:
  Remove "no" locale strings.xml file that duplicates "nb" locale file.