Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated Catalan translation
Merge pull request #741 from josepvm/master

Updated Catalan translation (fixed fuzzy translations due to recent code changes)