summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/bluetooth/qbluetoothtransferreply_bluez.cpp2
-rw-r--r--src/bluetooth/qbluetoothtransferreply_qnx.cpp4
-rw-r--r--src/bluetooth/qbluetoothuuid.cpp3
3 files changed, 5 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp
index 9a9ad38f..61bfb90d 100644
--- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp
+++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp
@@ -123,7 +123,7 @@ bool QBluetoothTransferReplyBluez::start()
m_tempfile->open();
qCDebug(QT_BT_BLUEZ) << "Not a QFile, making a copy" << m_tempfile->fileName();
if (!m_source->isReadable()) {
- m_errorStr = QBluetoothTransferReply::tr("QIODevice cannot be read."
+ m_errorStr = QBluetoothTransferReply::tr("QIODevice cannot be read. "
"Make sure it is open for reading.");
m_error = QBluetoothTransferReply::IODeviceNotReadableError;
m_finished = true;
diff --git a/src/bluetooth/qbluetoothtransferreply_qnx.cpp b/src/bluetooth/qbluetoothtransferreply_qnx.cpp
index 5b40073c..fa8992d2 100644
--- a/src/bluetooth/qbluetoothtransferreply_qnx.cpp
+++ b/src/bluetooth/qbluetoothtransferreply_qnx.cpp
@@ -112,7 +112,7 @@ bool QBluetoothTransferReplyQnx::start()
file.remove();
}
else if (directory.exists(appName) && busy) {
- m_errorStr = QBluetoothTransferReply::tr("Resurce busy.");
+ m_errorStr = QBluetoothTransferReply::tr("Resource busy.");
m_error = QBluetoothTransferReply::ResourceBusyError;
m_finished = true;
m_running = false;
@@ -121,7 +121,7 @@ bool QBluetoothTransferReplyQnx::start()
return false;
}
if (!source->isReadable()) {
- m_errorStr = QBluetoothTransferReply::tr("QIODevice cannot be read."
+ m_errorStr = QBluetoothTransferReply::tr("QIODevice cannot be read. "
"Make sure it is open for reading.");
m_error = QBluetoothTransferReply::IODeviceNotReadableError;
m_finished = true;
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index ec0cd13a..bbb9f652 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -812,6 +812,7 @@ QString QBluetoothUuid::serviceClassToString(QBluetoothUuid::ServiceClassUuid uu
case QBluetoothUuid::BodyComposition: return QBluetoothServiceDiscoveryAgent::tr("Body Composition");
case QBluetoothUuid::UserData: return QBluetoothServiceDiscoveryAgent::tr("User Data");
case QBluetoothUuid::WeightScale: return QBluetoothServiceDiscoveryAgent::tr("Weight Scale");
+ //: Connection management (Bluetooth)
case QBluetoothUuid::BondManagement: return QBluetoothServiceDiscoveryAgent::tr("Bond Management");
case QBluetoothUuid::ContinuousGlucoseMonitoring: return QBluetoothServiceDiscoveryAgent::tr("Continuous Glucose Monitoring");
default:
@@ -855,7 +856,7 @@ QString QBluetoothUuid::protocolToString(QBluetoothUuid::ProtocolUuid uuid)
case QBluetoothUuid::Avdtp: return QBluetoothServiceDiscoveryAgent::tr("Audio/Video Distribution Transport Protocol");
case QBluetoothUuid::Cmtp: return QBluetoothServiceDiscoveryAgent::tr("Common ISDN Access Protocol");
case QBluetoothUuid::UdiCPlain: return QBluetoothServiceDiscoveryAgent::tr("UdiCPlain");
- case QBluetoothUuid::McapControlChannel: return QBluetoothServiceDiscoveryAgent::tr("Multi-Channel Adaptation Protocol -Control");
+ case QBluetoothUuid::McapControlChannel: return QBluetoothServiceDiscoveryAgent::tr("Multi-Channel Adaptation Protocol - Control");
case QBluetoothUuid::McapDataChannel: return QBluetoothServiceDiscoveryAgent::tr("Multi-Channel Adaptation Protocol - Data");
case QBluetoothUuid::L2cap: return QBluetoothServiceDiscoveryAgent::tr("Layer 2 Control Protocol");
default: