Partially revert 76e8ea835f1024beb52e2f260ddb4b5e12f05d1f

Apparently this doesn't work on Firefox 24. Sigh.
Disable argument unwrapping on Fx < 32

This apparently breaks on Fx 24
Missing word in comment from 8cb081a4e1aed5d6a0d0b1f5e679fd133036be8a
Use 11 instead of 6 on invalid note font size

Also don't validate font size until after pref field is blurred, to allow
numbers to be typed in properly
Update version
Update submodules and repotime
Fix startup errors in some non-English locales in Fx30 on OS X

nsICollation broke for some locales. (Testing requires changing the
language setting in Language & Region and then restarting the computer.
The change seems to not fully go into effect until then, even though the
UI changes.) This is fixed in Nightly, but we can work around it by
using the new Intl.Collator.
Ignore punctuation when sorting

This sorts "St. A" before "St B". I don't know if we want this.
Update versions
Don't use Intl until Fx30, since it's missing in Iceweasel 29

And nsICollation isn't broken on OS X until 30
Fix for startup error w/weird locale language tags ("de-CH@currency=EUR")

https://forums.zotero.org/discussion/37901

And just return a noop sorter on failure instead of breaking
Update version
Merge tag '4.0.21.5' into HEAD

(Note that previous merge was actually with
tag 4.0.21.2 despite the wrong commit message.)