summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-02-13 12:06:43 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-13 16:25:13 +0100
commit7f6c4f7d590bc71ab45d208abcec94f32e61a9e4 (patch)
tree326e5592281dc9a1d24543437a4ddd06bf48830c
parent173d16efb54ccc152f19afb9b1c2a87915fb414b (diff)
Adjust strings for translation
This includes unification of error messages, fixes for spelling mistakes, hints for translators and other forms of simplifications. Change-Id: Idd0e01614b24ff2d19133f0d19d49649d59e3f57 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp10
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp2
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_android.cpp14
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp10
-rw-r--r--src/bluetooth/qbluetoothsocket_android.cpp4
-rw-r--r--src/bluetooth/qbluetoothsocket_bluez.cpp4
-rw-r--r--src/bluetooth/qbluetoothtransferreply_bluez.cpp2
-rw-r--r--src/bluetooth/qbluetoothtransferreply_qnx.cpp2
8 files changed, 24 insertions, 24 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
index 871e61e2..c2e1792d 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp
@@ -94,7 +94,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
if (!adapter.isValid()) {
qCWarning(QT_BT_ANDROID) << "Device does not support Bluetooth";
lastError = QBluetoothDeviceDiscoveryAgent::InputOutputError;
- errorString = QBluetoothDeviceDiscoveryAgent::tr("Device does not support Bluetooth.");
+ errorString = QBluetoothDeviceDiscoveryAgent::tr("Device does not support Bluetooth");
emit q->error(lastError);
return;
}
@@ -111,7 +111,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
const int state = adapter.callMethod<jint>("getState");
if (state != 12 ) { //BluetoothAdapter.STATE_ON
lastError = QBluetoothDeviceDiscoveryAgent::PoweredOffError;
- errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off.");
+ errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off");
emit q->error(lastError);
return;
}
@@ -130,7 +130,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
const bool success = adapter.callMethod<jboolean>("startDiscovery");
if (!success) {
lastError = QBluetoothDeviceDiscoveryAgent::InputOutputError;
- errorString = QBluetoothDeviceDiscoveryAgent::tr("Discovery cannot be started.");
+ errorString = QBluetoothDeviceDiscoveryAgent::tr("Discovery cannot be started");
emit q->error(lastError);
return;
}
@@ -152,7 +152,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::stop()
bool success = adapter.callMethod<jboolean>("cancelDiscovery");
if (!success) {
lastError = QBluetoothDeviceDiscoveryAgent::InputOutputError;
- errorString = QBluetoothDeviceDiscoveryAgent::tr("Discovery cannot be stopped.");
+ errorString = QBluetoothDeviceDiscoveryAgent::tr("Discovery cannot be stopped");
emit q->error(lastError);
return;
}
@@ -181,7 +181,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::processDiscoveryFinished()
const int state = adapter.callMethod<jint>("getState");
if (state != 12 ) { //BluetoothAdapter.STATE_ON
lastError = QBluetoothDeviceDiscoveryAgent::PoweredOffError;
- errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off.");
+ errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off");
emit q->error(lastError);
return;
}
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
index 69f09130..83b83fbd 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
@@ -130,7 +130,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
if (!propertiesReply.value().value(QStringLiteral("Powered")).toBool()) {
qCDebug(QT_BT_BLUEZ) << "Aborting device discovery due to offline Bluetooth Adapter";
lastError = QBluetoothDeviceDiscoveryAgent::PoweredOffError;
- errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off.");
+ errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off");
delete adapter;
adapter = 0;
emit q->error(lastError);
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
index 72a4d03b..caed88e5 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
@@ -108,7 +108,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
if (!btAdapter.isValid()) {
error = QBluetoothServiceDiscoveryAgent::UnknownError;
- errorString = QBluetoothServiceDiscoveryAgent::tr("Platform does not support Bluetooth.");
+ errorString = QBluetoothServiceDiscoveryAgent::tr("Platform does not support Bluetooth");
//abort any outstanding discoveries
discoveredDevices.clear();
@@ -130,7 +130,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
qCWarning(QT_BT_ANDROID) << "Aborting SDP enquiry due to too low Android API version (requires v15+)";
error = QBluetoothServiceDiscoveryAgent::UnknownError;
- errorString = QBluetoothServiceDiscoveryAgent::tr("Android API below v15 does not support SDP discovery.");
+ errorString = QBluetoothServiceDiscoveryAgent::tr("Android API below v15 does not support SDP discovery");
//abort any outstanding discoveries
sdpCache.clear();
@@ -154,7 +154,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
//if it was only device then its error -> otherwise go to next device
if (singleDevice) {
error = QBluetoothServiceDiscoveryAgent::InputOutputError;
- errorString = QBluetoothServiceDiscoveryAgent::tr("Cannot create Android BluetoothDevice.");
+ errorString = QBluetoothServiceDiscoveryAgent::tr("Cannot create Android BluetoothDevice");
qCWarning(QT_BT_ANDROID) << "Cannot start SDP for" << discoveredDevices.at(0).name()
<< "(" << address.toString() << ")";
@@ -176,7 +176,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
if (!parcelUuidArray.isValid()) {
if (singleDevice) {
error = QBluetoothServiceDiscoveryAgent::InputOutputError;
- errorString = QBluetoothServiceDiscoveryAgent::tr("Cannot obtain service uuids.");
+ errorString = QBluetoothServiceDiscoveryAgent::tr("Cannot obtain service uuids");
emit q->error(error);
}
qCWarning(QT_BT_ANDROID) << "Cannot retrieve SDP UUIDs for" << discoveredDevices.at(0).name()
@@ -314,7 +314,7 @@ static QString serviceNameForClassUuid(const uint value)
case QBluetoothUuid::HeadsetAG: return QBluetoothServiceDiscoveryAgent::tr("Headset AG");
case QBluetoothUuid::PANU: return QBluetoothServiceDiscoveryAgent::tr("Personal Area Networking (PANU)");
case QBluetoothUuid::NAP: return QBluetoothServiceDiscoveryAgent::tr("Personal Area Networking (NAP)");
- case QBluetoothUuid::GN: return QBluetoothServiceDiscoveryAgent::tr("Personak Area Networking (GN)");
+ case QBluetoothUuid::GN: return QBluetoothServiceDiscoveryAgent::tr("Personal Area Networking (GN)");
case QBluetoothUuid::DirectPrinting: return QBluetoothServiceDiscoveryAgent::tr("Basic Printing (DP)");
//case QBluetoothUuid::ReferencePrinting: return QBluetoothServiceDiscoveryAgent::tr("");
case QBluetoothUuid::ImagingResponder: return QBluetoothServiceDiscoveryAgent::tr("Basic Imaging Responder");
@@ -337,7 +337,7 @@ static QString serviceNameForClassUuid(const uint value)
case QBluetoothUuid::HeadsetHS: return QBluetoothServiceDiscoveryAgent::tr("Headset HS");
case QBluetoothUuid::MessageAccessServer: return QBluetoothServiceDiscoveryAgent::tr("Message Access Server");
case QBluetoothUuid::MessageNotificationServer: return QBluetoothServiceDiscoveryAgent::tr("Message Notification Server");
- case QBluetoothUuid::MessageAccessProfile: return QBluetoothServiceDiscoveryAgent::tr("Message Accress");
+ case QBluetoothUuid::MessageAccessProfile: return QBluetoothServiceDiscoveryAgent::tr("Message Access");
case QBluetoothUuid::PnPInformation: return QBluetoothServiceDiscoveryAgent::tr("Navigation Satellite System");
//case QBluetoothUuid::GenericNetworking: return QBluetoothServiceDiscoveryAgent::tr("");
//case QBluetoothUuid::GenericFileTransfer: return QBluetoothServiceDiscoveryAgent::tr("");
@@ -498,7 +498,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_hostModeStateChanged(QBluetoothL
discoveredDevices.clear();
sdpCache.clear();
error = QBluetoothServiceDiscoveryAgent::PoweredOffError;
- errorString = QBluetoothServiceDiscoveryAgent::tr("Device is powered off.");
+ errorString = QBluetoothServiceDiscoveryAgent::tr("Device is powered off");
//kill receiver to limit load of signals
receiver->deleteLater();
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
index 7af2590a..59551451 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
@@ -73,7 +73,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::deviceServicesDiscoveryCallback(bt_
QBluetoothServiceDiscoveryAgentPrivate *p = classPointer->data();
if ( result == 0) {
qCDebug(QT_BT_QNX) << "Result received in callback is null.";
- p->errorString = QBluetoothServiceDiscoveryAgent::tr("Result received in callback is null.");
+ p->errorString = QBluetoothServiceDiscoveryAgent::tr("Result received in callback is null");
p->error = QBluetoothServiceDiscoveryAgent::InputOutputError;
p->q_ptr->error(p->error);
p->_q_serviceDiscoveryFinished();
@@ -154,9 +154,9 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
errno = 0;
if (!m_btInitialized) {
if (bt_device_init( 0 ) < 0) {
- qCWarning(QT_BT_QNX) << "Failed to initialize bluetooth stack.";
+ qCWarning(QT_BT_QNX) << "Failed to initialize Bluetooth stack.";
error = QBluetoothServiceDiscoveryAgent::InputOutputError;
- errorString = QBluetoothServiceDiscoveryAgent::tr("Failed to open to initialize bluetooth stack");
+ errorString = QBluetoothServiceDiscoveryAgent::tr("Failed to initialize Bluetooth stack");
q->error(error);
_q_serviceDiscoveryFinished();
return;
@@ -167,9 +167,9 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
bt_remote_device_t *remoteDevice = bt_rdev_get_device(address.toString().toLocal8Bit().constData());
int deviceType = bt_rdev_get_type(remoteDevice);
if (deviceType == -1) {
- qCWarning(QT_BT_QNX) << "Could not retrieve remote device (address is 00:00:00:00:00:00).";
+ qCWarning(QT_BT_QNX) << "Could not retrieve remote device address (address is 00:00:00:00:00:00).";
error = QBluetoothServiceDiscoveryAgent::InputOutputError;
- errorString = QBluetoothServiceDiscoveryAgent::tr("Could not retrieve remote device (address is 00:00:00:00:00:00).");
+ errorString = QBluetoothServiceDiscoveryAgent::tr("Could not retrieve remote device address");
q->error(error);
_q_serviceDiscoveryFinished();
return;
diff --git a/src/bluetooth/qbluetoothsocket_android.cpp b/src/bluetooth/qbluetoothsocket_android.cpp
index 0b6fd9c6..93089182 100644
--- a/src/bluetooth/qbluetoothsocket_android.cpp
+++ b/src/bluetooth/qbluetoothsocket_android.cpp
@@ -109,7 +109,7 @@ void QBluetoothSocketPrivate::connectToServiceConc(const QBluetoothAddress &addr
const int state = adapter.callMethod<jint>("getState");
if (state != 12 ) { //BluetoothAdapter.STATE_ON
qCWarning(QT_BT_ANDROID) << "Bt device offline";
- errorString = QBluetoothSocket::tr("Device is powered off.");
+ errorString = QBluetoothSocket::tr("Device is powered off");
q->setSocketError(QBluetoothSocket::NetworkError);
q->setSocketState(QBluetoothSocket::UnconnectedState);
return;
@@ -124,7 +124,7 @@ void QBluetoothSocketPrivate::connectToServiceConc(const QBluetoothAddress &addr
env->ExceptionDescribe();
env->ExceptionClear();
- errorString = QBluetoothSocket::tr("Cannot access address %1").arg(address.toString());
+ errorString = QBluetoothSocket::tr("Cannot access address %1", "%1 = Bt address e.g. 11:22:33:44:55:66").arg(address.toString());
q->setSocketError(QBluetoothSocket::HostNotFoundError);
q->setSocketState(QBluetoothSocket::UnconnectedState);
return;
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index 7b1046c4..235f21d3 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -201,7 +201,7 @@ void QBluetoothSocketPrivate::_q_writeNotify()
int size = txBuffer.read(buf, 1024);
if (::write(socket, buf, size) != size) {
- errorString = QBluetoothSocket::tr("Network error");
+ errorString = QBluetoothSocket::tr("Network Error");
q->setSocketError(QBluetoothSocket::NetworkError);
}
else {
@@ -444,7 +444,7 @@ qint64 QBluetoothSocketPrivate::writeData(const char *data, qint64 maxSize)
Q_Q(QBluetoothSocket);
if (q->openMode() & QIODevice::Unbuffered) {
if (::write(socket, data, maxSize) != maxSize) {
- errorString = QBluetoothSocket::tr("Network error");
+ errorString = QBluetoothSocket::tr("Network Error");
q->setSocketError(QBluetoothSocket::NetworkError);
}
diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp
index 891fb012..8b271789 100644
--- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp
+++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp
@@ -113,7 +113,7 @@ bool QBluetoothTransferReplyBluez::start()
}
else {
if (!file->exists()) {
- m_errorStr = QBluetoothTransferReply::tr("File does not exist");
+ m_errorStr = QBluetoothTransferReply::tr("Source file does not exist");
m_error = QBluetoothTransferReply::FileNotFoundError;
m_finished = true;
m_running = false;
diff --git a/src/bluetooth/qbluetoothtransferreply_qnx.cpp b/src/bluetooth/qbluetoothtransferreply_qnx.cpp
index a0fada75..bc15fbde 100644
--- a/src/bluetooth/qbluetoothtransferreply_qnx.cpp
+++ b/src/bluetooth/qbluetoothtransferreply_qnx.cpp
@@ -114,7 +114,7 @@ bool QBluetoothTransferReplyQnx::start()
} else {
if (!file->exists()) {
- m_errorStr = QBluetoothTransferReply::tr("File does not exist");
+ m_errorStr = QBluetoothTransferReply::tr("Source file does not exist");
m_error = QBluetoothTransferReply::FileNotFoundError;
m_finished = true;
m_running = false;