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 2012-08-29 18:09:53 +02:00
commit 732a23fdaa
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/dialogs/smartdevice.py
View File

@ -5,8 +5,6 @@ from __future__ import (unicode_literals, division, absolute_import,
__license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import netifaces
from PyQt4.Qt import (QDialog, QLineEdit, Qt, QPushButton, QDialogButtonBox)
from calibre.gui2 import error_dialog
@ -69,8 +67,7 @@ class SmartdeviceDialog(QDialog, Ui_Dialog):
self.ip_addresses.setToolTip('<p>' +
_('These are the IP addresses detected by calibre for the computer '
'running calibre. If you decide to have your device connect to '
_('These are the IP addresses for this computer. If you decide to have your device connect to '
'calibre using a fixed IP address, one of these addresses should '
'be the one you use. It is unlikely but possible that the correct '
'IP address is not listed here, in which case you will need to go '

2
src/calibre/gui2/dialogs/smartdevice.ui
View File

@ -41,7 +41,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>Calibre's IP addresses:</string>
<string>Calibre IP addresses:</string>
</property>
</widget>
</item>