[Bug 825503] Localize shortcuts [r=crdlc]
[Bug 829308] Added support.json to .gitignore [r=vingtetun]
Merge pull request #7530 from EverythingMe/gitignore-support-json

[Bug 829308] Added support.json to .gitignore [r=vingtetun]
Merge pull request #7321 from EverythingMe/folders-l10n

[Bug 825503] Localize shortcuts [r=crdlc]
Auto-merge from branch 'master'