Comment 11 for bug 81681

After discussion with mpt, this is what we think would work best.

Instead of the current layout, use the following:

  English:
      Original string
  Current Serbian:
      So-so translation
  Upstream:
      Good translation
  Suggestions:
    - Blah-blah
      Coming from: <Somebody New>
    - Foo
      Coming from: used in Ubuntu Hoary package "evolution" by <Somebody Old>
    - Bar
      Coming from: suggested in Ubuntu Hoary package "evolution" by <Somebody Fresh>

Basically, the changes would be:
 1. separate out 'upstream' suggestion (if there is one) into another section called 'Upstream'
 2. Merge all other suggestions into one section and add some text to indicate whether they are used somewhere or just suggestions elsewhere
 3. Remove template name from the description in 'Coming from', but keep the link pointing directly to that template