diff options
24 files changed, 80 insertions, 80 deletions
diff --git a/doc/themes.howto.txt b/doc/themes.howto.txt index 12054fe21..417332354 100644 --- a/doc/themes.howto.txt +++ b/doc/themes.howto.txt @@ -41,9 +41,9 @@ Each option starts with a prefix that defines the "type" of that option. pixmap: defines an image and thus should contain an image path (see below) -color: defines an user interface color and is an R,G,B triplet +color: defines a user interface color and is an R,G,B triplet -font: defines an user interface font: you usually need to change only the +font: defines a user interface font: you usually need to change only the first two values: font family and size. msgtype: defines the icon, text color, background color, log level and @@ -112,10 +112,10 @@ Review this block, is this applicable in 4.x/5.x? -What happens when an user installs a theme +What happens when a user installs a theme ----------------------------------------------------------------------------- -When an user attempts to install a theme from the options dialog, +When a user attempts to install a theme from the options dialog, KVIrc reads the themedata.kvc file and applies all the visual settings. This is an one-time action: the settings are applied only once from the themedata.kvc file and then are saved to the user's configuration files. diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp index 289694073..993b8c4b9 100644 --- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp +++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp @@ -94,7 +94,7 @@ On the other hand, if you dislike the users with the nickname Eddie that come from .org and you're implementing an auto-kick system, the correct mask to register is [i]Eddie!*@*.org[/i]. [br][br] - KVIrc tries to be smart, and always find the most correct match for an user: + KVIrc tries to be smart, and always find the most correct match for a user: If you have two masks registered: [b]Pragma!*xor@*.myisp.it[/b] and [b]*!*@*.myisp.it[/b], KVIrc will match [b]Pragma!~xor@233-dyn.myisp.it[/b] with the first one even if the second one also matches; the first one however, is a best match. @@ -106,7 +106,7 @@ KVIrc recognizes some of these properties and associates semantic actions to it; other properties are left for scripting extension. Property names are case insensitive.[br] One of the recognized properties is the [i][doc:notify_list]notify[/doc][/i] property.[br][br] - When an user is found to have this property set to a special value + When a user is found to have this property set to a special value KVIrc will attempt to track the user presence on IRC. Another one is the [doc:avatar]avatar[/doc] property. Its value should be the name of the [i]default[/i] [doc:avatar]avatar image file[/doc] for the specified user.[br] diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.h b/src/kvilib/ext/KviRegisteredUserDataBase.h index 75354764f..8fc884e68 100644 --- a/src/kvilib/ext/KviRegisteredUserDataBase.h +++ b/src/kvilib/ext/KviRegisteredUserDataBase.h @@ -70,7 +70,7 @@ public: bool removeGroup(const QString &name); KviRegisteredUser * findUserByName(const QString &name){ return m_pUserDict->find(name); }; // mask must be allocated on the heap and the ownership is transferred! - // returns non zero if there is already an user with this mask (returns the pointer to it!) + // returns non zero if there is already a user with this mask (returns the pointer to it!) KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * mask); bool removeMaskByPointer(KviIrcMask * mask); bool removeMask(const KviIrcMask &mask); diff --git a/src/kvilib/ext/KviSharedFilesManager.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp index cd910f2d7..cd4eda9cf 100644 --- a/src/kvilib/ext/KviSharedFilesManager.cpp +++ b/src/kvilib/ext/KviSharedFilesManager.cpp @@ -67,7 +67,7 @@ [big]Security issues[/big] This is a nice but unsecure method of sharing files.[br] The user mask is a good protection but you have to use it properly![br] - Setting the user mask to Nick!*@* can be easily exploited (just by making an user disconnect + Setting the user mask to Nick!*@* can be easily exploited (just by making a user disconnect in one of the well known ways and then by using his nickname).[br] On the other side, the remote end must know exactly the visible name of the offer to request and no one but you will tell him that name.[br] diff --git a/src/kvilib/irc/KviAvatarCache.h b/src/kvilib/irc/KviAvatarCache.h index bf641b5de..886d58292 100644 --- a/src/kvilib/irc/KviAvatarCache.h +++ b/src/kvilib/irc/KviAvatarCache.h @@ -105,7 +105,7 @@ public: void remove(const KviIrcMask & mask, const QString & szNetwork); /** - * \brief Search an user in the cache and returns the id of the avatar + * \brief Search a user in the cache and returns the id of the avatar * \param mask The mask of the user * \param szNetwork The network where the user is on * \return const QString & diff --git a/src/kvilib/irc/KviIrcMask.cpp b/src/kvilib/irc/KviIrcMask.cpp index abf95b40a..b7406b2d8 100644 --- a/src/kvilib/irc/KviIrcMask.cpp +++ b/src/kvilib/irc/KviIrcMask.cpp @@ -39,7 +39,7 @@ irc masks, nickname, username, hostname, wildcard @body: [big]Simple masks[/big][br] - An IRC mask is a string in a special format that identifies an user on IRC.[br] + An IRC mask is a string in a special format that identifies a user on IRC.[br] The standard basic format is:[br] [b]<nick>!<username>@<host>[/b][br] The <nick> part contains the nickname with that the user is widely known across the network.[br] @@ -79,7 +79,7 @@ [br] [big]Wildcard masks[/big][br] In some contexts the irc-masks can contain [b]*[/b] and [b]?[/b] wildcards.[br] - The wild masks are used to [i]match[/i] an user within a set of them.[br] + The wild masks are used to [i]match[/i] a user within a set of them.[br] [b]*[/b] matches any sequence (eventually empty) of characters and [b]?[/b] matches a single character.[br] Wildcards are allowed only in the <nick>, <user> and <host> part: so the [i]wildest[/i] mask possible is:[br] diff --git a/src/kvilib/irc/KviIrcUserEntry.h b/src/kvilib/irc/KviIrcUserEntry.h index 890ec56f7..2437d5c6c 100644 --- a/src/kvilib/irc/KviIrcUserEntry.h +++ b/src/kvilib/irc/KviIrcUserEntry.h @@ -61,7 +61,7 @@ public: * \brief Defines the user mode in a channel */ enum UserMode { - UserOp = 1, /**< the user is an userop of the channel */ + UserOp = 1, /**< the user is a userop of the channel */ Voice = 2, /**< the user is a voice of the channel */ HalfOp = 4, /**< the user is a halfop of the channel */ Op = 8, /**< the user is an operator of the channel */ diff --git a/src/kvirc/kernel/KviApplication_filesystem.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp index 5303432b4..a65382585 100644 --- a/src/kvirc/kernel/KviApplication_filesystem.cpp +++ b/src/kvirc/kernel/KviApplication_filesystem.cpp @@ -412,7 +412,7 @@ bool KviApplication::mapImageFile(QString &szRetPath,const QString &filename) bool KviApplication::findImage(QString &szRetPath,const QString &filename) { - // Find an user file... + // Find a user file... if(KviFileUtils::isAbsolutePath(filename)) { szRetPath=filename; diff --git a/src/kvirc/kernel/KviIrcSocket.cpp b/src/kvirc/kernel/KviIrcSocket.cpp index ca4496d23..567d76798 100644 --- a/src/kvirc/kernel/KviIrcSocket.cpp +++ b/src/kvirc/kernel/KviIrcSocket.cpp @@ -744,7 +744,7 @@ void KviIrcSocket::proxyLoginV4() m_pProxy->normalizeUserAndPass(); // the protocol does not specify the "userid" format... - // so build an userid from the pass and/or username... + // so build a userid from the pass and/or username... KviCString szUserAndPass = m_pProxy->user(); if(m_pProxy->hasPass()){ @@ -824,7 +824,7 @@ void KviIrcSocket::proxyLoginV5() m_pProxy->normalizeUserAndPass(); // the protocol does not specify the "userid" format... - // so build an userid from the pass and/or username... + // so build a userid from the pass and/or username... char cBufToSend[4]; cBufToSend[0] = (unsigned char)5; //use version 5 diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 2252fde83..288279754 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -620,13 +620,13 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) { if(KviUserListEntry * le = ch->findEntry(*s)) { - l.append(s); // ok...found on a channel...we don't need an userhost to match him + l.append(s); // ok...found on a channel...we don't need a userhost to match him KviIrcMask mk(*s,le->globalData()->user(),le->globalData()->host()); if(!doMatchUser(*s,mk))return true; // critical problems = have to restart!!! break; } } - } // else Only one ref...we need an userhost to be sure (don't remove from the list) + } // else Only one ref...we need a userhost to be sure (don't remove from the list) } else { // user wants no userhost for online users...we "hope" that everything will go ok. l.append(s); @@ -1278,7 +1278,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk); } else { - // This is a RPL_LOGOFF for an user that has not matched the reg-mask + // This is a RPL_LOGOFF for a user that has not matched the reg-mask notifyOffLine(dnk,dus,dho,__tr2qs("unmatched watch list entry")); } } diff --git a/src/kvirc/kernel/KviTheme.h b/src/kvirc/kernel/KviTheme.h index e26c9fda0..e62bfb1de 100644 --- a/src/kvirc/kernel/KviTheme.h +++ b/src/kvirc/kernel/KviTheme.h @@ -68,7 +68,7 @@ public: /// Builtin = 0, /// - /// Theme is an user theme. The subdirectory is inside the kvirc local theme directory. + /// Theme is a user theme. The subdirectory is inside the kvirc local theme directory. /// User = 1, /// diff --git a/src/kvirc/kvs/event/KviKvsEventTable.cpp b/src/kvirc/kvs/event/KviKvsEventTable.cpp index bd3cadf39..fc3d9f3a5 100644 --- a/src/kvirc/kvs/event/KviKvsEventTable.cpp +++ b/src/kvirc/kvs/event/KviKvsEventTable.cpp @@ -235,7 +235,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= The keys that actually work with KVIrc are:[br] F2 to F12, F1 to F12 with SHIFT key pressed, 0 to 9 with CTRL key pressed.[br] This means that you can set up 33 [i]quick[/i] aliases... that's really more than - an user can remember.[br] + a user can remember.[br] Note: this event won't be called for keys already bound to actions. If you need more keys, mail me, I'll see what I can do :)[br] */ @@ -502,7 +502,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: The window that the user has clicked in @description: - This event is triggered when an user has double clicked on a nickname in + This event is triggered when a user has double clicked on a nickname in the notify list (console window).[br] You should use this event to do some significant action associated with the double click.[br] A good example might be a [cmd]whois[/cmd] query or a [cmd]dcc.chat[/cmd] @@ -682,7 +682,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: console @description: - Triggered when KVIrc detects a netsplit by looking at an user's quit message. + Triggered when KVIrc detects a netsplit by looking at a user's quit message. The two parameters passed are the two servers that lost the link and were signaled in that particular quit message.[br] The actual netsplit detector in the KVIrc core uses the following rule @@ -899,7 +899,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @title: OnHostLinkPopupRequest @short: - Triggered when an user right clicks on a hostname link in the text view. + Triggered when a user right clicks on a hostname link in the text view. @parameters: $0 = actual name $1 - visible name @@ -907,7 +907,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: The window that the user has clicked in. @description: - This event is triggered when an user has right clicked on a hostname link in the text view. + This event is triggered when a user has right clicked on a hostname link in the text view. The double click link action is builtin and it causes KVIrc to perform a DNS query on the hostname. This is a good place to show a popup menu with some operations that can be done on the hostname like [i]telnet[/i], [i]traceroute[/i], some special kind of DNS lookup (maybe an xterm with nslookup or sth). @@ -935,7 +935,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has right clicked on an URL link in + This event is triggered when a user has right clicked on an URL link in the text view. The double click link action is builtin and it causes KVIrc to open the URL with a browser (typically your OS default browser).[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations @@ -965,7 +965,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has right clicked on an server name link in + This event is triggered when a user has right clicked on an server name link in the text view. The double click link action is builtin and it causes KVIrc to query the MOTD of the server.[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations @@ -997,7 +997,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has right clicked on an channel link in + This event is triggered when a user has right clicked on an channel link in the text view. The double click link action is builtin and it causes KVIrc to join the channel (unless the user is already on).[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations @@ -1027,7 +1027,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has right clicked on an [i]unknown[/i] nickname link in + This event is triggered when a user has right clicked on an [i]unknown[/i] nickname link in the text view.[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations that can be performed with the nickname like querying, sending a file by DCC or opening a dcc.chat. @@ -1060,7 +1060,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has right clicked on a set of nicknames in + This event is triggered when a user has right clicked on a set of nicknames in the query target list.[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations that can be performed with the nickname like sending a file by DCC, opening a dcc.chat or @@ -1086,7 +1086,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: This event is triggered when the user right-clicks in the channel user list or on a nickname link in the channel text view.[br] - The first parameter ($0) contains a comma separated list of selected nicknames (if it is an user list click) + The first parameter ($0) contains a comma separated list of selected nicknames (if it is a user list click) or a single nickname (if it is a link).[br] In both cases all the nicknames are currently on the channel.[br] You should popup a popup-menu with a set of possible channel-related actions, @@ -1110,7 +1110,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: The window that the user has clicked in @description: - This event is triggered when an user has right clicked on a list of nicknames in + This event is triggered when a user has right clicked on a list of nicknames in the notify list (console window).[br] This is a good place to show a [cmd]popup[/cmd] with some actions that can be performed on the nicknames like querying, performing a WHOIS lookup or something similar.[br] @@ -1736,7 +1736,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: Console @description: - Triggered when an user is quitting IRC.[br] + Triggered when a user is quitting IRC.[br] The QUIT message has already been processed by the server, so the user is effectively no longer on IRC. On the other side, it might be useful to access the user-related data from @@ -3716,7 +3716,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user). Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has double clicked on a text view and has not hit any link.[br] + This event is triggered when a user has double clicked on a text view and has not hit any link.[br] I have no idea what you can do in this event, maybe some sort of channel-central dialog? :) */ EVENT("OnTextViewDoubleClicked",""), @@ -3739,7 +3739,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has double clicked on a nickname link.[br] + This event is triggered when a user has double clicked on a nickname link.[br] You should use this event to perform some significant action associated with the double click.[br] A good example might be a [cmd]whois[/cmd] or a [cmq]query[/cmd] call.[br] Please note that [b]not all[/b] nickname links will cause this event to be triggered: some nickname @@ -3789,7 +3789,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. - This event is triggered when an user has double clicked on a nickname in + This event is triggered when a user has double clicked on a nickname in the query target list.[br] You should use this event to do some significant action associated with the double click.[br] A good example might be a [cmd]WHOIS[/cmd] query or a [cmd]dcc.chat[/cmd] diff --git a/src/kvirc/kvs/event/KviKvsEventTable.h b/src/kvirc/kvs/event/KviKvsEventTable.h index 0e914d972..86453f425 100644 --- a/src/kvirc/kvs/event/KviKvsEventTable.h +++ b/src/kvirc/kvs/event/KviKvsEventTable.h @@ -112,7 +112,7 @@ * \def KviEvent_OnConsolePopupRequest Triggered when the console text view is right-clicked * \def KviEvent_OnQueryPopupRequest Triggered when the query text view is right-clicked * \def KviEvent_OnWindowPopupRequest Triggered when the user middle-clicks in a text view (or right-clicks with the CTRL key pressed) -* \def KviEvent_OnHostLinkPopupRequest Triggered when an user right clicks on a hostname link in the text view +* \def KviEvent_OnHostLinkPopupRequest Triggered when a user right clicks on a hostname link in the text view * \def KviEvent_OnURLLinkPopupRequest URL link popup customization * \def KviEvent_OnServerLinkPopupRequest Server link popup customization * \def KviEvent_OnChannelLinkPopupRequest Channel link popup customization diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp index dbcbbbf93..7e6ec14ad 100644 --- a/src/kvirc/kvs/object/KviKvsObject.cpp +++ b/src/kvirc/kvs/object/KviKvsObject.cpp @@ -144,7 +144,7 @@ [/example] You can simulate C structures [i]on the fly[/i] by using objects and fields:[br] [example] - # Create an user description on the fly + # Create a user description on the fly %myobj = [fnc]$new[/fnc]([class]object[/class],0,userDescription) # Set the fields %myobj->%nickname = Pragma diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp index bcba08c21..f11a25d8f 100644 --- a/src/kvirc/kvs/parser/KviKvsParser.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser.cpp @@ -1084,7 +1084,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer @short: Aliases : user definable command sequences @body: - An alias is an user defined command. It can be used to rename the builtin KVIrc commands or functions, + An alias is a user defined command. It can be used to rename the builtin KVIrc commands or functions, to automatize complex tasks or as structured programming mean. Aliases can be created or destroyed by using the scriptcenter (graphic interface) or from the commandline (or script) by using the [cmd]alias[/cmd] command. @@ -1125,7 +1125,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer This will remove the alias [b]j[/b] defined above. [br] A common task in channel management is the kick & ban action. - You first ban an user from the channel and then eventually kick him + You first ban a user from the channel and then eventually kick him (obviously assuming that he is actually on the channel). This involves using two commands: ban and then kick. It could be a nice idea to have a single [b]kb[/b] command to perform this action. diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp index 725a1fde8..61a9ee7dc 100644 --- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp @@ -350,7 +350,7 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog; [br] [big]AVATAR (equivalent to ICON or FACE)[/big] [b]Syntax: <0x01>AVATAR<0x01>[/b][br] - The AVATAR tag is used to query an user's avatar.[br] + The AVATAR tag is used to query a user's avatar.[br] [br] [big]MULTIMEDIA (equivalent to MM or SOUND)[/big] [b]Syntax: <0x01>MULTIMEDIA <filename><0x01>[/b][br] diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index 2abaa9565..8d009a9b9 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -791,7 +791,7 @@ void KviConsoleWindow::outputPrivmsg(KviWindow *wnd, szNick.prepend(KviNickColors::getSmartColor(sum)); } else { /* - * Received a message from an user not in userDataBase: how can this happen? + * Received a message from a user not in userDataBase: how can this happen? * - services replaying some log * - user non joined msging a channel -n * anyway, better fallback than wrong diff --git a/src/kvirc/ui/KviUserListView.h b/src/kvirc/ui/KviUserListView.h index c93de6e28..b9aaddc7f 100644 --- a/src/kvirc/ui/KviUserListView.h +++ b/src/kvirc/ui/KviUserListView.h @@ -537,9 +537,9 @@ public: bool isVoice(const QString & szNick, bool bAtLeast = false); /** - * \brief Returns true if the user is an user operator + * \brief Returns true if the user is a user operator * \param szNick The nick to moderate - * \param bAtLeast Whether the user is at least an user operator + * \param bAtLeast Whether the user is at least a user operator * \return bool */ bool isUserOp(const QString & szNick, bool bAtLeast = false); @@ -595,7 +595,7 @@ public: /** * \brief Verifies the mask for a user action * - * This is called when an user "acts" in some visible way on the channel, + * This is called when a user "acts" in some visible way on the channel, * so we can keep track of his channel idle time. * This particular function version of userAction will return false if * there was a user or hostname change (unless they were not known at all) @@ -613,7 +613,7 @@ public: /** * \brief Verifies a user action * - * This is called when an user "acts" in some visible way on the channel + * This is called when a user "acts" in some visible way on the channel * In this way we can keep track of his channeel idle time. This will * also update the username and hostname if needed. * \param pUser The user by the irc mask @@ -625,7 +625,7 @@ public: /** * \brief Verifies a user action * - * This is called when an user "acts" in some visible way on the channel + * This is called when a user "acts" in some visible way on the channel * In this way we can keep track of his channeel idle time. This will * also update the username and hostname if needed. * \param szNick The nickname of the user @@ -639,7 +639,7 @@ public: /** * \brief Verifies a user action * - * This is called when an user "acts" in some visible way on the channel + * This is called when a user "acts" in some visible way on the channel * In this way we can keep track of his channeel idle time. This will * also update the username and hostname if needed. * \param szNick The nickname of the user @@ -657,7 +657,7 @@ public: bool nickChange(const QString & szOldNick, const QString & szNewNick); /** - * \brief Called when an user joins the channel + * \brief Called when a user joins the channel * \param szNick The nickname of the user * \param szUser The username of the user * \param szHost The hostname of the user diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 3d7bf9f10..893535cc3 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -622,7 +622,7 @@ static bool chan_kvs_fnc_maskcount(KviKvsModuleFunctionCall * c) @title: $chan.ison @short: - Checks if an user is on a channel + Checks if a user is on a channel @syntax: <boolean> $chan.ison(<nickname:string>[,<window_id:string>]) @description: @@ -650,11 +650,11 @@ static bool chan_kvs_fnc_ison(KviKvsModuleFunctionCall * c) @title: $chan.getflag @short: - Returns the channel-user mode flag of an user + Returns the channel-user mode flag of a user @syntax: <char> $chan.getflag(<nickname:string>[,<window_id:string>]) @description: - Returns the channel user mode flag of an user on the channel specified by <window_id>.[br] + Returns the channel user mode flag of a user on the channel specified by <window_id>.[br] If <window_id> is not passed, the current window is used.[br] If the specified window is not a channel, a warning is printed and an empty string is returned.[br] If the specified user is not on the channel identified by <window_id>, an empty string is returned.[br] @@ -710,7 +710,7 @@ static bool __clbkname(KviKvsModuleFunctionCall * c) \ @title: $chan.isowner @short: - Checks if an user is at least a channel owner + Checks if a user is at least a channel owner @syntax: <boolean> $chan.isowner(<nickname:string>[,<window_id:string>]) @description: @@ -729,7 +729,7 @@ IS_KVS_FUNC(chan_kvs_fnc_isowner,isChanOwner) @title: $chan.isadmin @short: - Checks if an user is at least channel administrator + Checks if a user is at least channel administrator @syntax: <boolean> $chan.isadmin(<nickname:string>[,<window_id:string>]) @description: @@ -748,7 +748,7 @@ IS_KVS_FUNC(chan_kvs_fnc_isadmin,isChanAdmin) @title: $chan.isop @short: - Checks if an user is at least an op on a channel + Checks if a user is at least an op on a channel @syntax: <boolean> $chan.isop(<nickname:string>[,<window_id:string>]) @description: @@ -767,7 +767,7 @@ IS_KVS_FUNC(chan_kvs_fnc_isop,isOp) @title: $chan.isvoice @short: - Checks if an user is at least voiced on a channel + Checks if a user is at least voiced on a channel @syntax: <boolean> $chan.isvoice(<nickname:string>[,<window_id:string>]) @description: @@ -786,7 +786,7 @@ IS_KVS_FUNC(chan_kvs_fnc_isvoice,isVoice) @title: $chan.ishalfop @short: - Checks if an user is at least halfop on a channel + Checks if a user is at least halfop on a channel @syntax: <boolean> $chan.ishalfop(<nickname:string>[,<window_id:string>]) @description: @@ -805,11 +805,11 @@ IS_KVS_FUNC(chan_kvs_fnc_ishalfop,isHalfOp) @title: $chan.isuserop @short: - Checks if an user is at least an userop on a channel + Checks if a user is at least a userop on a channel @syntax: <boolean> $chan.isuserop(<nickname:string>[,<window_id:string>]) @description: - Returns [b]1[/b] if <nickname> is at least an user-operator on the channel identified by <window_id>, and [b]0[/b] otherwise.[br] + Returns [b]1[/b] if <nickname> is at least a user-operator on the channel identified by <window_id>, and [b]0[/b] otherwise.[br] If <window_id> is not specified the current window is used (assuming that it is a channel at all).[br] If the window is not a channel, a warning is printed and an empty string is returned.[br] Note that if the user is not on the channel at all, you will get 0 as return value.[br] @@ -936,12 +936,12 @@ IS_ME_KVS_FUNC(chan_kvs_fnc_ismevoice,isMeVoice) @title: $chan.isMeUserOp @short: - Checks if the current user is at least an user operator on a channel + Checks if the current user is at least a user operator on a channel @syntax: <boolean> $chan.isMeUserOp <boolean> $chan.isMeUserOp(<window_id:String>) @description: - Returns [b]1[/b] if the current user is at least an user operator on the channel specified by <window_id>, and [b]0[/b] otherwise.[br] + Returns [b]1[/b] if the current user is at least a user operator on the channel specified by <window_id>, and [b]0[/b] otherwise.[br] If <window_id> is not passed, the current window is used (assuming it is a channel at all).[br] If the window is not a channel, a warning is printed and an empty string is returned.[br] This function is a [i]shortcut[/i] for [fnc]$chan.isuserop[/fnc]([fnc]$me[/fnc]).[br] @@ -1466,7 +1466,7 @@ static bool chan_kvs_fnc_masklist(KviKvsModuleFunctionCall * c) If no ban mask matches <complete_mask> an empty string is returned.[br] If [window_id] is empty, the current window is used.[br] If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br] - This function is useful to determine if a ban set on the channel matches an user.[br] + This function is useful to determine if a ban set on the channel matches a user.[br] */ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c) @@ -1520,7 +1520,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c) If no ban exception mask matches <complete_mask> an empty string is returned.[br] If [window_id] is empty, the current window is used.[br] If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br] - This function is useful to determine if a ban exception set on the channel matches an user.[br] + This function is useful to determine if a ban exception set on the channel matches a user.[br] */ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c) @@ -1574,7 +1574,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c) If no invite mask matches <complete_mask> an empty string is returned.[br] If [window_id] is empty, the current window is used.[br] If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br] - This function is useful to determine if a invite set on the channel matches an user.[br] + This function is useful to determine if a invite set on the channel matches a user.[br] */ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c) @@ -1628,13 +1628,13 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c) will probably be dropped in a future version.[br] Use [fnc]$chan.matchmask[/fnc] instead.[br] Some networks use +q channel mode to set [i]mute bans[/i].[br] - When an user mask matches such a ban, he won't be able to send messages to the channel.[br] + When a user mask matches such a ban, he won't be able to send messages to the channel.[br] The [i]mute bans[/i] masks will be inserted in the normal channel bans list, with a percent sign % prepended.[br] This function returns the [i]mute ban[/i] mask that matches <complete_mask> on channel identified by [window_id].[br] If no ban mask matches <complete_mask> an empty string is returned.[br] If [window_id] is empty, the current window is used.[br] If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br] - This function is useful to determine if a [i]mute ban[/i] set on the channel matches an user.[br] + This function is useful to determine if a [i]mute ban[/i] set on the channel matches a user.[br] */ static bool chan_kvs_fnc_matchqban(KviKvsModuleFunctionCall * c) @@ -1750,7 +1750,7 @@ static bool chan_kvs_fnc_matchmask(KviKvsModuleFunctionCall * c) users in order to determine the actions they can issue between each other.[br] For example it is granted that an op will have userModeLevel greater than a voiced user or that a simple [i]modeless[/i] user will have - an userModeLevel lower than a halfop.[br] + a userModeLevel lower than a halfop.[br] IRC allows multiple modes to be applied to a single user on a channel, in that case this function will return the level of the highest mode applied to the user.[br] @@ -1780,7 +1780,7 @@ static bool chan_kvs_fnc_usermodelevel(KviKvsModuleFunctionCall * c) @title: $chan.userJoinTime @short: - Returns the time that an user has joined the channel + Returns the time that a user has joined the channel @syntax: <integer> $chan.userJoinTime(<nickname:string>[,<window_id:string>]) @description: @@ -1816,7 +1816,7 @@ static bool chan_kvs_fnc_userjointime(KviKvsModuleFunctionCall * c) @title: $chan.userLastActionTime @short: - Returns the time that an user has last performed some kind of action on the channel + Returns the time that a user has last performed some kind of action on the channel @syntax: <integer> $chan.userLastActionTime(<nickname:string>[,<window_id:string>]) @description: diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index 4d34a8903..a719175d1 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -86,7 +86,7 @@ static void dcc_module_request_error(KviDccRequest * dcc,const QString& errText) if(KVI_OPTION_BOOL(KviOption_boolNotifyFailedDccHandshakes)) { QString szError = QString("Sorry, your DCC %1 request can't be satisfied: %2").arg(dcc->szType.ptr(), errText); - //since szError contains an user-suppplied string, we simplify it to avoid any kind of injection (bug #858) + //since szError contains a user-suppplied string, we simplify it to avoid any kind of injection (bug #858) dcc_module_reply_errmsg(dcc,szError.simplified()); } } diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 8e6fc4914..84a755c8e 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -562,7 +562,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) pPropertiesBoxLayout->addWidget(m_pUserEditor,0,1); KviTalToolTip::add(m_pUserEditor,__tr2qs_ctx("This is the <b>username</b> that KVIrc will use to login to this server.\n" \ - "If this field is left empty (most common case), KVIrc will first look if an username is specified " \ + "If this field is left empty (most common case), KVIrc will first look if a username is specified " \ "for the network that this server belongs to, and if that is empty then KVIrc will use the default username " \ "specified in the \"Identity\" options tab.","options")); diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index 63b8913c5..817a41055 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -66,12 +66,12 @@ RegisteredUsersDialog * g_pRegisteredUsersDialog = 0; @body: The reguser module is the scripting interface to the [doc:registered_users]registered users database[/doc].[br] It provides the following set of commands:[br] - [cmd]reguser.add[/cmd]: adds an user entry to the database[br] - [cmd]reguser.addmask[/cmd]: adds an user's mask to the database[br] - [cmd]reguser.remove[/cmd]: removes an user entry from the database[br] + [cmd]reguser.add[/cmd]: adds a user entry to the database[br] + [cmd]reguser.addmask[/cmd]: adds a user's mask to the database[br] + [cmd]reguser.remove[/cmd]: removes a user entry from the database[br] [fnc]$reguser.list[/fnc]: lists the entries[br] [cmd]reguser.setproperty[/cmd]: sets a property associated to an entry[br] - [cmd]reguser.edit[/cmd]: shows an editor for an user entry + [cmd]reguser.edit[/cmd]: shows an editor for a user entry [fnc]$reguser.match[/fnc](): finds an entry by matching masks[br] [fnc]$reguser.exactMatch[/fnc](): finds an entry by comparing masks[br] [fnc]$reguser.property[/fnc](): finds a property associated to an entry[br] @@ -147,7 +147,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c) @keyterms: registering users @short: - Registers an user + Registers a user @syntax: reguser.add [-r] [-f] [-q] [-g=group] <name> [mask] @description: @@ -1162,7 +1162,7 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c) @syntax: reguser.wizard [mask] @description: - Allows registering an user with an intuitive and easy to use interface. + Allows registering a user with an intuitive and easy to use interface. If [mask] is specified, it is used as initial mask in the dialog. @seealso: [module:reguser]Registered users database interface[/module], diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp index cd319d367..9a8cfce2d 100644 --- a/src/modules/theme/libkvitheme.cpp +++ b/src/modules/theme/libkvitheme.cpp @@ -96,13 +96,13 @@ static bool theme_kvs_cmd_install(KviKvsModuleCommandCall * c) !sw: -b | --builtin <theme> is the name of a builtin theme (a subdirectory of the KVIrc global themes directory) !sw: -u | --user - <theme> is the name of an user theme (a subdirectory of the KVIrc local themes directory) + <theme> is the name of a user theme (a subdirectory of the KVIrc local themes directory) @description: Attempts to apply the global theme specified by <theme>. If the -b switch is present then <theme> is assumed to be a name of a builtin installed theme (a subdirectory of the KVIrc global themes directory). If the -l switch is present then <theme> is assumed to be a name of - an user installed theme (a subdirectory of the KVIrc local themes directory). + a user installed theme (a subdirectory of the KVIrc local themes directory). If the -e switch is present then <theme> is assumed to be an absolute directory containing the theme data. If no switch is present then KVIrc tries to determine automatically the @@ -143,7 +143,7 @@ static bool theme_kvs_cmd_apply(KviKvsModuleCommandCall * c) @title: $theme.info @short: - Return info about an user defined theme. + Return info about a user defined theme. @description: Returns a hash with information about the global theme specified by <theme>. */ diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 8d931da67..a9c736126 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -1041,7 +1041,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) @title: window.setWindowTitle @short: - Sets the caption of an user window + Sets the caption of a user window @syntax: window.setWindowTitle [-q] <window_id> <plain_text_caption> @switches: |