Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-05-07 09:42:51 +01:00
commit 8d4298ca86
3 changed files with 882 additions and 1335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/devices/hanlin/driver.py
View File

@ -64,7 +64,7 @@ class HANLINV3(USBMS):
return names return names
def linux_swap_drives(self, drives): def linux_swap_drives(self, drives):
if len(drives) < 2: return drives if len(drives) < 2 or not drives[1] or not drives[2]: return drives
drives = list(drives) drives = list(drives)
t = drives[0] t = drives[0]
drives[0] = drives[1] drives[0] = drives[1]
@ -95,7 +95,6 @@ class HANLINV5(HANLINV3):
gui_name = 'Hanlin V5' gui_name = 'Hanlin V5'
description = _('Communicate with Hanlin V5 eBook readers.') description = _('Communicate with Hanlin V5 eBook readers.')
VENDOR_ID = [0x0492] VENDOR_ID = [0x0492]
PRODUCT_ID = [0x8813] PRODUCT_ID = [0x8813]
BCD = [0x319] BCD = [0x319]

2
src/calibre/gui2/metadata/basic_widgets.py
View File

@ -208,7 +208,7 @@ class AuthorsEdit(MultiCompleteComboBox):
for i in all_authors: for i in all_authors:
id, name = i id, name = i
name = name.strip().replace('|', ',') name = name.strip().replace('|', ',')
self.addItem(authors_to_string(name)) self.addItem(name)
self.set_separator('&') self.set_separator('&')
self.set_space_before_sep(True) self.set_space_before_sep(True)

2212
src/calibre/translations/calibre.pot
View File

File diff suppressed because it is too large Load Diff