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-03-22 17:04:41 +00:00
commit fddc52a735
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/preferences/create_custom_column.ui
View File

@ -126,8 +126,7 @@ Everything else will show nothing.</string>
<string>Contains names</string> <string>Contains names</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Check this box if the field contains names that are <string>Check this box if this column contains names, like the authors column.</string>
to be separated by ampersands instead of commas.</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/calibre/library/server/browse.py
View File

@ -15,7 +15,7 @@ from calibre import isbytestring, force_unicode, fit_image, \
prepare_string_for_xml prepare_string_for_xml
from calibre.utils.ordered_dict import OrderedDict from calibre.utils.ordered_dict import OrderedDict
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
from calibre.utils.config import prefs, tweaks from calibre.utils.config import prefs
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key
from calibre.utils.magick import Image from calibre.utils.magick import Image
from calibre.library.comments import comments_to_html from calibre.library.comments import comments_to_html

1
src/calibre/library/server/opds.py
View File

@ -22,7 +22,6 @@ from calibre.library.server.utils import format_tag_string, Offsets
from calibre import guess_type, prepare_string_for_xml as xml from calibre import guess_type, prepare_string_for_xml as xml
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key
from calibre.utils.ordered_dict import OrderedDict from calibre.utils.ordered_dict import OrderedDict
from calibre.utils.config import tweaks
BASE_HREFS = { BASE_HREFS = {
0 : '/stanza', 0 : '/stanza',