aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/action/libkviaction.cpp10
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp6
-rw-r--r--src/modules/chan/libkvichan.cpp2
-rw-r--r--src/modules/dcc/DccBroker.cpp2
-rw-r--r--src/modules/dcc/DccFileTransfer.cpp2
-rw-r--r--src/modules/dialog/libkvidialog.cpp4
-rw-r--r--src/modules/objects/KvsObject_dialog.cpp4
-rw-r--r--src/modules/objects/KvsObject_xmlreader.cpp2
8 files changed, 16 insertions, 16 deletions
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 67a9f9366..df1f8c03f 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -289,7 +289,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
!sw: -l | --enable-at-login
Specifies that the action needs to be enabled at login time, that is
- when a link to the server has been estabilished but the login
+ when a link to the server has been established but the login
operations haven't been carried out yet (and thus there is no real IRC connection).
This switch requires -c to work.
@@ -302,11 +302,11 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
!sw: -s | --selected-only
Specifies that the action will be activated only if the active window
has selected users in the userlist. This switch requires -w with a combination
- of flags 'q','c' and 'x' (it doesn't work for dcc chat).
+ of flags 'q','c' and 'x' (it doesn't work for DCC chat).
!sw: -t=<category> | --category=<category>
Causes the action to belong to the specified category.
- <category> can be one of "irc","scripting","settings","gui","channel","tools" and "generic".
+ <category> can be one of "IRC","scripting","settings","GUI","channel","tools" and "generic".
If this switch is omitted the "generic" category is automatically assumed.
The actions failing in the "tools" category will appear in the "Tools" KVIrc menu too.
@@ -321,7 +321,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
[/p]
[p]
Each action has an unique <name> that must not collide with any core action
- (i.e. don't use the "kvirc." prefix).
+ (i.e. don't use the "KVIrc." prefix).
At any time you can check [cmd]action.list[/cmd] to verify that no core action
is already using your <name>. If the <name> was already used for a script action
then this action is simply replaced by the new one.
@@ -350,7 +350,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
[p]
<action body> is the callback code snippet that will be triggered when this action is activated
either by the means of [cmd]action.trigger[/cmd], a toolbar button or a menu item selection.
- An empty <action body> causes this command to behave like [cmd]action.destoy[/cmd] <name>.
+ An empty <action body> causes this command to behave like [cmd]action.destroy[/cmd] <name>.
[/p]
@seealso:
[cmd]action.destroy[/cmd], [cmd]action.trigger[/cmd]
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 014ba1db4..6d66ad82e 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -195,7 +195,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
m_pNeedsContextCheck = new QCheckBox(__tr2qs_ctx("Needs IRC Context","editor"),tab);
connect(m_pNeedsContextCheck,SIGNAL(toggled(bool)),this,SLOT(needsContextCheckToggled(bool)));
m_pNeedsContextCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window belongs to an irc context","editor"));
+ "the active window belongs to an IRC context","editor"));
gl->addWidget(m_pNeedsContextCheck,0,0,1,4);
@@ -216,7 +216,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
m_pEnableAtLoginCheck = new QCheckBox(__tr2qs_ctx("Enable at Login","editor"),tab);
m_pEnableAtLoginCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled also during " \
- "the login operations (so when the logical IRC connection hasn't been estabilished yet)","editor"));
+ "the login operations (so when the logical IRC connection hasn't been established yet)","editor"));
gl->addWidget(m_pEnableAtLoginCheck,2,2,1,2);
m_pSpecificWindowsCheck = new QCheckBox(__tr2qs_ctx("Enable Only in Specified Windows","editor"),tab);
@@ -261,7 +261,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
m_pWindowDccChatCheck = new QCheckBox(__tr2qs_ctx("Enable in DCC Chat Windows","editor"),tab);
m_pWindowDccChatCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window is a dcc chat","editor"));
+ "the active window is a DCC chat","editor"));
gl->addWidget(m_pWindowDccChatCheck,10,1,1,2);
l = new QLabel(tab);
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 881c19fb2..4da273514 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1090,7 +1090,7 @@ static bool chan_kvs_fnc_modeParam(KviKvsModuleFunctionCall * c)
[example]
[comment]# Get the nickname list[/comment]
%test[] = $chan.users
- [comment]# And loop thru the items[/comment]
+ [comment]# And loop through the items[/comment]
%i = 0
[comment]# %test[]# returns the number of elements in the array[/comment]
%count = %test[]#
diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index 029eaa962..be7dea7fa 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -781,7 +781,7 @@ void DccBroker::renameOverwriteResume(DccDialog *box,DccDescriptor * dcc)
"and is larger than the offered one.<br>" \
"Do you wish to<br>" \
"<b>auto-rename</b> the new file, or<br>" \
- "<b>overwrite</b> the existing file ?" \
+ "<b>overwrite</b> the existing file?" \
,"dcc" \
).arg(dcc->szLocalFileName);
}
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 468976ea1..ddd54ae5d 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -155,7 +155,7 @@ bool DccRecvThread::sendAck(int filePos,bool bTolerateErrors)
#ifdef COMPILE_SSL_SUPPORT
if(m_pSSL)
{
- // dropping ack when no serious ssl error occured
+ // dropping ack when no serious ssl error occurred
switch(m_pSSL->getProtocolError(iRet))
{
case KviSSL::ZeroReturn:
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index f9e39d386..82c7a8833 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -170,7 +170,7 @@ void KviKvsCallbackMessageBox::done(int code)
@examples:
[example]
[comment]# Just a warning dialog[/comment]
- dialog.message("Warning","You're being <b>warned</b>",warning,"Ok"){ echo The user clicked OK; }
+ dialog.message("Warning","You're being <b>warned</b>",warning,"OK"){ echo The user clicked OK; }
[comment]# A question[/comment]
dialog.message("And now ?","What do you want to do ?",information,"Go home","Watch TV","Scream")
{
@@ -468,7 +468,7 @@ void KviKvsCallbackTextInput::showEvent(QShowEvent *e)
@examples:
[example]
[comment]# We need a single line "reason"[/comment]
- dialog.textinput -d="Working !" (Away,<center>Please enter the <h1>away message</h1></center>,"Ok","Cancel")
+ dialog.textinput -d="Working!" (Away,<center>Please enter the <h1>away message</h1></center>,"OK","Cancel")
{
switch($0)
{
diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp
index 3752490d9..8b5d30b27 100644
--- a/src/modules/objects/KvsObject_dialog.cpp
+++ b/src/modules/objects/KvsObject_dialog.cpp
@@ -44,10 +44,10 @@
[class]object[/class]
[class]widget[/class]
@description:
- Rappresents a dialog object. The class is really
+ Represents a dialog object. The class is really
similar to the widget class, it has only a couple of minor differences.
A dialog is always a top-level widget, but if it has a parent, its default
- location is centered on top of the parent. It will also share the parent's windowlist entry.
+ location is centered on top of the parent. It will also share the parent's window list entry.
!fn; setModal (<boolean>)
If you call $setModal(1) then the dialog will have non-blocking modal behaviour:
it will appear above its parent widget and block its input until it's closed.
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 0038f1c01..f0f05528d 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -66,7 +66,7 @@
obtain a descriptive error message.
!fn: <string> $lastError()
- Returns the last error occured inside the parser.
+ Returns the last error occurred inside the parser.
You will typically call this function when $parse() above returns $false.
!fn: <boolean> $onDocumentStart()