Commit from Mozilla Verbatim by user upwinxp.: 2844 of 3015 strings translated (1 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Merge branch 'master' of github.com:mozilla/olympia
Merge branch 'master' of github.com:mozilla/olympia