[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Konversation] 7329efa: spelling
From: eli mackenzie <argonel () gmail ! com>
Date: 2010-03-31 23:12:02
Message-ID: 201003312312.o2VNC2HJ005693 () kore ! kollide ! net
[Download RAW message or body]
commit 7329efa765b39d59177fbec5943aa9e9c53e7099
Author: eli mackenzie <argonel@gmail.com>
Date: Wed Mar 31 18:59:40 2010 -0400
spelling
diff --git a/src/commit.h b/src/commit.h
index df55c87..d1253c6 100644
--- a/src/commit.h
+++ b/src/commit.h
@@ -1,4 +1,4 @@
// This COMMIT number is added to version string to be used as "patch level"
#ifndef COMMIT
-#define COMMIT 4032
+#define COMMIT 4033
#endif
diff --git a/src/dcc/chat.cpp b/src/dcc/chat.cpp
index cc5d15a..4952cb1 100644
--- a/src/dcc/chat.cpp
+++ b/src/dcc/chat.cpp
@@ -100,7 +100,7 @@ namespace Konversation
kDebug() << "could not retrieve the instance of Server. Connection id: " << \
m_connectionId; failed(i18nc("%1=dcc extension like Chat or Whiteboard",
"Could not send a DCC %1 request to the partner via the IRC server.",
- localizedExtentionString()));
+ localizedExtensionString()));
return;
}
@@ -149,8 +149,8 @@ namespace Konversation
if (!Preferences::self()->dccChatAutoAccept())
{
int ret = KMessageBox::questionYesNo(0,
- i18nc("%1=partnerNick, %2=Servername, %3=dcc \
extension as chat or wboard", "%1 (on %2) offers to DCC %3 with you", m_partnerNick, \
server->getServerName(), localizedExtentionString()),
- i18nc("%1=dcc extension as Chat or Whiteboard, \
%2=partnerNick", "DCC %1 offer from %2", localizedExtentionString(), m_partnerNick), + \
i18nc("%1=partnerNick, %2=Servername, %3=dcc extension as chat or wboard", "%1 (on %2) offers to DCC %3 \
with you", m_partnerNick, server->getServerName(), localizedExtensionString()), + \
i18nc("%1=dcc extension as Chat or Whiteboard, %2=partnerNick", "DCC %1 offer from %2", \
localizedExtensionString(), m_partnerNick),
KGuiItem(i18n("Accept")),
KGuiItem(i18n("Reject"))
);
@@ -159,7 +159,7 @@ namespace Konversation
{
setStatus(Aborted, i18nc("%1=dcc extension like Chat or Whiteboard",
"You rejected the DCC %1 offer.",
- localizedExtentionString()));
+ localizedExtensionString()));
server->dccRejectChat(m_partnerNick, extensionString());
return;
}
@@ -198,7 +198,7 @@ namespace Konversation
{
failed(i18nc("%1=dcc extension as Chat or Whiteboard",
"DCC %1 request was rejected",
- localizedExtentionString()));
+ localizedExtensionString()));
}
void Chat::removedFromView()
@@ -285,7 +285,7 @@ namespace Konversation
{
failed(i18nc("%1=dcc extension like Chat or Whiteboard",
"Could not send Reverse DCC %1 acknowledgement to the partner via the IRC \
server.",
- localizedExtentionString()));
+ localizedExtensionString()));
return;
}
@@ -316,7 +316,7 @@ namespace Konversation
{
failed(i18nc("%1=extension like Chat or Whiteboard",
"Could not send Reverse DCC %1 acknowledgement to the partner via the IRC \
server.",
- localizedExtentionString()));
+ localizedExtensionString()));
return;
}
@@ -368,7 +368,7 @@ namespace Konversation
setStatus(Chat::WaitingRemote, i18nc("%1=dcc extension like Chat or \
Whiteboard,%2=partnerNick, %3=port",
"Offering DCC %1 connection to %2 on port \
<numid>%3</numid>...",
- localizedExtentionString(), m_partnerNick, m_ownPort));
+ localizedExtensionString(), m_partnerNick, m_ownPort));
kDebug() << "[END]";
}
@@ -423,7 +423,7 @@ namespace Konversation
}
}
- QString Chat::localizedExtentionString() const
+ QString Chat::localizedExtensionString() const
{
switch (extension())
{
@@ -462,7 +462,7 @@ namespace Konversation
kDebug() << "partnerIP: " << m_partnerIp << " partnerport: " << m_partnerPort << " nick: " \
<< m_partnerNick;
setStatus(Chat::Connecting, i18nc("%1=extension like Chat or Whiteboard ,%2 = nickname, %3 = \
IP, %4 = port",
- "Establishing DCC %1 connection to %2 \
(%3:<numid>%4</numid>)...", localizedExtentionString(), + \
"Establishing DCC %1 connection to %2 (%3:<numid>%4</numid>)...", \
localizedExtensionString(),
m_partnerNick, m_partnerIp, m_partnerPort));
m_dccSocket = new QTcpSocket(this);
@@ -481,7 +481,7 @@ namespace Konversation
m_textStream.setDevice(m_dccSocket);
setStatus(Chat::Chatting, i18nc("%1=extension like Chat or Whiteboard, %2 = partnerNick",
"Established DCC %1 connection to %2.",
- localizedExtentionString(), m_partnerNick));
+ localizedExtensionString(), m_partnerNick));
emit connected();
}
@@ -575,7 +575,7 @@ namespace Konversation
m_textStream.setDevice(m_dccSocket);
setStatus(Chat::Chatting, i18nc("%1=dcc extension as Chat or Whiteboard, %2=partnerNick",
"Established DCC %1 connection to %2.",
- localizedExtentionString(), m_partnerNick));
+ localizedExtensionString(), m_partnerNick));
}
void Chat::socketClosed()
diff --git a/src/dcc/chat.h b/src/dcc/chat.h
index d5f1d5e..04c9b22 100644
--- a/src/dcc/chat.h
+++ b/src/dcc/chat.h
@@ -84,7 +84,7 @@ namespace Konversation
void setExtension(Extension extension);
Extension extension() const;
QString extensionString() const;
- QString localizedExtentionString() const;
+ QString localizedExtensionString() const;
int connectionId() const;
diff --git a/src/dcc/chatcontainer.cpp b/src/dcc/chatcontainer.cpp
index 96ecb8d..80d0eb3 100644
--- a/src/dcc/chatcontainer.cpp
+++ b/src/dcc/chatcontainer.cpp
@@ -126,14 +126,14 @@ namespace Konversation
case Chat::WaitingRemote:
m_topicLabel->setText(i18nc("%1=extension like Chat or Whiteboard, %2=partnerNick, \
%3=port",
"DCC %1 with %2 on port <numid>%3</numid>.",
- m_chat->localizedExtentionString(), \
m_chat->partnerNick(), m_chat->ownPort())); + \
m_chat->localizedExtensionString(), m_chat->partnerNick(), m_chat->ownPort()));
getTextView()->appendServerMessage(i18n("DCC"), m_chat->statusDetails());
break;
case Chat::Connecting:
m_topicLabel->setText(i18nc("%1=extension like Chat or Whiteboard, %2 = nickname, %3 \
= IP, %4 = port",
"DCC %1 with %2 on %3:<numid>%4</numid>.",
- m_chat->localizedExtentionString(), \
m_chat->partnerNick(), m_chat->partnerIp(), m_chat->partnerPort())); + \
m_chat->localizedExtensionString(), m_chat->partnerNick(), m_chat->partnerIp(), \
m_chat->partnerPort()));
getTextView()->appendServerMessage(i18n("DCC"), m_chat->statusDetails());
break;
@@ -197,9 +197,9 @@ namespace Konversation
result = KMessageBox::warningContinueCancel(this,
i18nc("%1=extension like Chat or Whiteboard, \
%2=partnerNick",
"Do you want to close your DCC %1 with \
%2?",
- m_chat->localizedExtentionString(), \
m_chat->partnerNick()), + \
m_chat->localizedExtensionString(), m_chat->partnerNick()),
i18nc("%1=extension like Chat or \
Whiteboard",
- "Close DCC %1", \
m_chat->localizedExtentionString()), + \
"Close DCC %1", m_chat->localizedExtensionString()),
KStandardGuiItem::close(),
KStandardGuiItem::cancel(),
"QuitDCCChatTab");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic