Fix typos in strings
E-book viewer: Add a keyboard shortcut to bookmark current location. Fixes #1326198 [Enhancement to Reader– single keystroke bookmark.](https://bugs.launchpad.net/calibre/+bug/1326198)
Merge branch 'master' of https://github.com/pgarst/calibre
Check Book: Fix combination of mismatching font family names and a font-family declaration with an invalid value (such as a dimension) causing auto fixing of errors to fail. Fixes #1325070 [Private bug](https://bugs.launchpad.net/calibre/+bug/1325070)
Check Book: Fix empty (zero byte) XML files causing check book to fail. Fixes #1326073 [Private bug](https://bugs.launchpad.net/calibre/+bug/1326073)
Edit book: Fix changing underline style to none when creating a custom color scheme causes error.
pep8
Linux build: Fix regression that caused opening PDF files (or any externally viewed files) preventing calibre from being restarted as long as the external viewer is not shutdown. Fixes #1326453 [Calibre will not reopen once closed if pdf files have been opened through calibre and left open](https://bugs.launchpad.net/calibre/+bug/1326453)
Fix #1325709 [Private bug](https://bugs.launchpad.net/calibre/+bug/1325709)
Update Instapaper
pep8
pep8
Sony driver: Fix SONY annotation app not working with files sent to the device by calibre
Fix date column not showing date added when adding zip/rar files that contain an OPF with a calibre timestamp in its metadata
...
More robust host IP detection when building calibre
Fix err strings
Portable installer: Fix a crash if the user selects a destination for the portable install that does not have enough disk space. Fixes #1324575 [Portable install crashes on low disk space](https://bugs.launchpad.net/calibre/+bug/1324575)
More accurate progress while decompressing the portable installer
Proper fix for incorrect progress in portable installer