Merge latest green inbound changeset and mozilla-central

This commit is contained in:
Ed Morley 2014-02-03 15:27:38 +00:00
commit 81802ad632

View File

@ -35,6 +35,9 @@
<!ENTITY helpFeedbackPage.label "Submit Feedback…">
<!ENTITY helpFeedbackPage.accesskey "S">
<!ENTITY helpShowTour.label "&brandShortName; Tour">
<!ENTITY helpShowTour.accesskey "o">
<!ENTITY preferencesCmdMac.label "Preferences…">
<!ENTITY preferencesCmdMac.commandkey ",">