Commit from Mozilla Verbatim by user m.araldi.: 3373 of 3373 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Commit from Mozilla Verbatim by user auzelac91.: 2336 of 3373 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
World Cup promo: change link according to locale (bug 1004632)
Merge pull request #108 from yohanboniface/bug-1004632-people-opium-2014-2

World Cup promo: change link according to locale (bug 1004632)
Merge branch 'master' of github.com:mozilla/olympia