Localize Ctrl/Cmd-Shift in Prefs
Localize Ctrl/Cmd-Shift in Prefs
Localize et al. in the middle pane
(Heromyth's PR #358, #360, #361)
Fix unnecessary reloading of session data

See https://forums.zotero.org/discussion/30740?page=1#Item_16
Merge pull request #375 from gracile-fr/4.0

4.0 - Localization
Fix "Invalid sync state '4'" error
Don't call done handler multiple times on import

Broken by ff0f649a4d8a7f3ebcd4aec0932667bac2a40f8a
Fix secondary function name
Fix updating translators and styles from unpacked build
Fix path for translators/styles directories in symlinked dev Standalone build
Fix saving advanced search

Fixes #379
Fix saving advanced search with no name

Addresses #379
Allow moving (instead of copying) files into Zotero

Cmd-drag on OS X, Shift on Windows and Linux

As requested in
https://forums.zotero.org/discussion/31717/delete-source-file-on-import/

Unfortunately due to https://bugzilla.mozilla.org/show_bug.cgi?id=911918
(and another issue on Windows) we can't show proper cursor feedback for
external file drags.
Fix cursor feedback for file drag-in on Linux, where we can set it
Fix merging of tags during sync conflict

If an item was added to a tag on one computer and another item was added
to the tag on a different computer, and then they both synced one of the
tags could be removed on the second computer to sync.
Use async storage mtime checking in Fx24 on Windows

https://bugzilla.mozilla.org/show_bug.cgi?id=899436 was backported to 24
Merge branch '4.0'

Conflicts:
	chrome/content/zotero/xpcom/storage.js