Commit from Mozilla Verbatim by user amir.farsi.: 312 of 3007 strings translated (1 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia