[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: branches/KDE/4.2/kdelibs
From: Albert Astals Cid <tsdgeos () terra ! es>
Date: 2009-03-23 22:25:26
Message-ID: 1237847126.214598.23020.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 943483 by aacid:
Add some i18n to kdelibs
This adds some message that were previously untranslatable
CCMAIL: kde-i18n-doc@kde.org
M +4 -4 kdecore/network/klocalsocket.cpp
M +2 -2 kdecore/network/klocalsocket_p.h
M +22 -20 kdecore/network/klocalsocket_unix.cpp
M +4 -2 kdecore/network/klocalsocket_win.cpp
M +1 -1 kio/kio/slavebase.cpp
--- branches/KDE/4.2/kdelibs/kdecore/network/klocalsocket.cpp #943482:943483
@@ -26,19 +26,19 @@
//#define LocalSocket (QAbstractSocket::SocketType(int(QAbstractSocket::UdpSocket) + \
1))
-void KLocalSocketPrivate::emitError(QAbstractSocket::SocketError error, const char \
*errorString) +void KLocalSocketPrivate::emitError(QAbstractSocket::SocketError \
error, const QString &errorString) {
q->setSocketState(QAbstractSocket::UnconnectedState);
q->setSocketError(error);
- q->setErrorString(QLatin1String(errorString));
+ q->setErrorString(errorString);
emit q->stateChanged(QAbstractSocket::UnconnectedState);
emit q->error(error);
}
-void KLocalSocketServerPrivate::emitError(QAbstractSocket::SocketError an_error, \
const char *an_errorString) +void \
KLocalSocketServerPrivate::emitError(QAbstractSocket::SocketError an_error, const \
QString &an_errorString) {
error = an_error;
- errorString = QLatin1String(an_errorString);
+ errorString = an_errorString;
}
KLocalSocket::KLocalSocket(QObject *parent)
--- branches/KDE/4.2/kdelibs/kdecore/network/klocalsocket_p.h #943482:943483
@@ -42,7 +42,7 @@
void connectToPath(const QString &path, KLocalSocket::LocalSocketType type,
QAbstractSocket::OpenMode openMode);
- void emitError(QAbstractSocket::SocketError, const char *errorString);
+ void emitError(QAbstractSocket::SocketError, const QString &errorString);
static inline KLocalSocketPrivate *d(KLocalSocket *aq)
{ return aq->d; }
@@ -70,7 +70,7 @@
bool waitForNewConnection(int msec, bool *timedOut);
bool processSocketActivity();
void _k_newConnectionActivity();
- void emitError(QAbstractSocket::SocketError, const char *errorString);
+ void emitError(QAbstractSocket::SocketError, const QString &errorString);
};
#endif
--- branches/KDE/4.2/kdelibs/kdecore/network/klocalsocket_unix.cpp #943482:943483
@@ -29,6 +29,8 @@
#include <string.h>
#include <unistd.h>
+#include "klocale.h"
+
static inline int kSocket(int af, int socketype, int proto)
{
int ret;
@@ -173,7 +175,7 @@
// connect to Unix socket
KSockaddrUn addr(path, aType);
if (!addr.ok()) {
- emitError(QAbstractSocket::NetworkError, "Specified socket path is \
invalid"); + emitError(QAbstractSocket::NetworkError, i18n("Specified \
socket path is invalid")); return;
}
@@ -182,7 +184,7 @@
if (fd == -1) {
// failed
emitError(QAbstractSocket::UnsupportedSocketOperationError,
- "The socket operation is not supported");
+ i18n("The socket operation is not supported"));
return;
}
@@ -195,20 +197,20 @@
switch (error) {
case ECONNREFUSED:
- emitError(QAbstractSocket::ConnectionRefusedError, "Connection \
refused"); + emitError(QAbstractSocket::ConnectionRefusedError, \
i18n("Connection refused")); return;
case EACCES:
case EPERM:
- emitError(QAbstractSocket::SocketAccessError, "Permission denied");
+ emitError(QAbstractSocket::SocketAccessError, i18n("Permission \
denied")); return;
case ETIMEDOUT:
- emitError(QAbstractSocket::SocketTimeoutError, "Connection timed \
out"); + emitError(QAbstractSocket::SocketTimeoutError, \
i18n("Connection timed out")); return;
default:
- emitError(QAbstractSocket::UnknownSocketError, "Unknown error");
+ emitError(QAbstractSocket::UnknownSocketError, i18n("Unknown \
error")); return;
}
}
@@ -216,7 +218,7 @@
// if we got here, we succeeded in connecting
if (!setNonBlocking(fd)) {
::close(fd);
- emitError(QAbstractSocket::UnknownSocketError, "Could not set \
non-blocking mode"); + emitError(QAbstractSocket::UnknownSocketError, \
i18n("Could not set non-blocking mode")); return;
}
@@ -229,7 +231,7 @@
emit q->connected();
} else {
emitError(QAbstractSocket::UnsupportedSocketOperationError,
- "The socket operation is not supported");
+ i18n("The socket operation is not supported"));
}
}
@@ -241,7 +243,7 @@
if (aType == KLocalSocket::UnixSocket || aType == \
KLocalSocket::AbstractUnixSocket) { KSockaddrUn addr(path, aType);
if (!addr.ok()) {
- emitError(QAbstractSocket::NetworkError, "Specified socket path is \
invalid"); + emitError(QAbstractSocket::NetworkError, i18n("Specified \
socket path is invalid")); return false;
}
@@ -250,7 +252,7 @@
if (descriptor == -1) {
// failed
emitError(QAbstractSocket::UnsupportedSocketOperationError,
- "The socket operation is not supported");
+ i18n("The socket operation is not supported"));
return false;
}
@@ -263,32 +265,32 @@
switch (error) {
case EACCES:
- emitError(QAbstractSocket::SocketAccessError, "Permission denied");
+ emitError(QAbstractSocket::SocketAccessError, i18n("Permission \
denied")); return false;
case EADDRINUSE:
- emitError(QAbstractSocket::AddressInUseError, "Address is already in \
use"); + emitError(QAbstractSocket::AddressInUseError, i18n("Address \
is already in use")); return false;
case ELOOP:
case ENAMETOOLONG:
- emitError(QAbstractSocket::NetworkError, "Path cannot be used");
+ emitError(QAbstractSocket::NetworkError, i18n("Path cannot be \
used")); return false;
case ENOENT:
- emitError(QAbstractSocket::HostNotFoundError, "No such file or \
directory"); + emitError(QAbstractSocket::HostNotFoundError, i18n("No \
such file or directory")); return false;
case ENOTDIR:
- emitError(QAbstractSocket::HostNotFoundError, "Not a directory");
+ emitError(QAbstractSocket::HostNotFoundError, i18n("Not a \
directory")); return false;
case EROFS:
- emitError(QAbstractSocket::SocketResourceError, "Read-only \
filesystem"); + emitError(QAbstractSocket::SocketResourceError, \
i18n("Read-only filesystem")); return false;
default:
- emitError(QAbstractSocket::UnknownSocketError, "Unknown error");
+ emitError(QAbstractSocket::UnknownSocketError, i18n("Unknown \
error")); return false;
}
}
@@ -296,7 +298,7 @@
// if we got here, we succeeded in connecting
if (!setNonBlocking(descriptor)) {
close();
- emitError(QAbstractSocket::UnknownSocketError, "Could not set \
non-blocking mode"); + emitError(QAbstractSocket::UnknownSocketError, \
i18n("Could not set non-blocking mode")); return false;
}
@@ -349,7 +351,7 @@
continue;
} else if (code == -1) {
// error
- emitError(QAbstractSocket::UnknownSocketError, "Unknown socket error");
+ emitError(QAbstractSocket::UnknownSocketError, i18n("Unknown socket \
error")); close();
return false;
} else if (code == 0) {
@@ -381,7 +383,7 @@
return false; // no new socket
default:
- emitError(QAbstractSocket::UnknownSocketError, "Unknown socket error");
+ emitError(QAbstractSocket::UnknownSocketError, i18n("Unknown socket \
error")); // fall through
}
--- branches/KDE/4.2/kdelibs/kdecore/network/klocalsocket_win.cpp #943482:943483
@@ -23,15 +23,17 @@
#include "klocalsocket_p.h"
+#include "klocale.h"
+
void KLocalSocketPrivate::connectToPath(const QString &path, \
KLocalSocket::LocalSocketType aType,
QAbstractSocket::OpenMode openMode)
{
- emitError(QAbstractSocket::UnsupportedSocketOperationError, "Operation not \
supported"); + emitError(QAbstractSocket::UnsupportedSocketOperationError, \
i18n("Operation not supported")); }
bool KLocalSocketServerPrivate::listen(const QString &path, \
KLocalSocket::LocalSocketType aType) {
- emitError(QAbstractSocket::UnsupportedSocketOperationError, "Operation not \
supported"); + emitError(QAbstractSocket::UnsupportedSocketOperationError, \
i18n("Operation not supported")); return false;
}
--- branches/KDE/4.2/kdelibs/kio/kio/slavebase.cpp #943482:943483
@@ -1349,7 +1349,7 @@
if (result == -1) {
info.setError(QHostInfo::UnknownError);
- info.setErrorString("Unknown Error.");
+ info.setErrorString(i18n("Unknown Error."));
return result;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic