Merge from trunk

This commit is contained in:
Charles Haley 2013-01-15 11:35:59 +01:00
commit 8354ed8cf2

View File

@ -300,9 +300,9 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
'particular IP address. The driver will listen only on the ' 'particular IP address. The driver will listen only on the '
'entered address, and this address will be the one advertized ' 'entered address, and this address will be the one advertized '
'over mDNS (bonjour).') + '</p>', 'over mDNS (bonjour).') + '</p>',
_('Overwrite books with same UUID') + ':::<p>' + _('Replace books with the same calibre identifier') + ':::<p>' +
_('Use this option to overwrite a book on the device if that book ' _('Use this option to overwrite a book on the device if that book '
'has the same UUID as the book being sent. The file name of the ' 'has the same calibre identifier as the book being sent. The file name of the '
'book will not change even if the save template produces a ' 'book will not change even if the save template produces a '
'different result. Using this option in most cases prevents ' 'different result. Using this option in most cases prevents '
'having multiple copies of a book on the device.') + '</p>', 'having multiple copies of a book on the device.') + '</p>',