aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--cmake/kvirc-config.cmake2
-rw-r--r--data/config/preinstalled.kvc.win32-example2
-rw-r--r--data/defscript/CMakeLists.txt2
-rw-r--r--data/doctemplates/ircintro.template28
-rw-r--r--data/doctemplates/kvircintro.template28
-rw-r--r--data/man/kvirc.en.16
-rw-r--r--doc/hackers.guide.txt4
-rw-r--r--scripts/config/kvirc4-config.in2
9 files changed, 40 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index bb50312a1..e3abe6264 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -259,7 +259,7 @@ February 2010
- Readded the theme choice on first setup
[Noldor]
- Rewrote the aliaseditor module
- - kvirc theme manager script
+ - KVIrc theme manager script
- Created classeditor module
[HelLViS69]
- Readded the ability to customize CTCP version reply
@@ -482,7 +482,7 @@ October 2009
- Splitted locale stuff for object classes
[HelLViS69]
- - Splitted locale stuff for kvirc target
+ - Splitted locale stuff for KVIrc target
04 November 2008
[CtrlAltCa]
@@ -2652,7 +2652,7 @@ Christmas Eve (Western Hemisphere) 2003:
- Preliminary rearrangements of code for KviConsole.... the header is
becoming a mess need to order the code syntactically and then maybe extract
some code to be put in external classes. KviIrcConnection could be an idea.
- - Beginning of code for the toolbar button management... need a module ?
+ - Beginning of code for the toolbar button management... need a module?
29 Mar 2002:
[Pragma]
diff --git a/cmake/kvirc-config.cmake b/cmake/kvirc-config.cmake
index 3005023c2..ce88eb98f 100644
--- a/cmake/kvirc-config.cmake
+++ b/cmake/kvirc-config.cmake
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# A script for retrieving the latest kvirc build configuration
+# A script for retrieving the latest KVIrc build configuration
# Mainly used for building plugins out of the source tree
# The idea is "stolen" from the gtk-config and xmms-config scripts :)
#
diff --git a/data/config/preinstalled.kvc.win32-example b/data/config/preinstalled.kvc.win32-example
index f825cc2be..d21471d42 100644
--- a/data/config/preinstalled.kvc.win32-example
+++ b/data/config/preinstalled.kvc.win32-example
@@ -6,7 +6,7 @@
## for Windows with custom preferences. You can tell
## KVIrc to skip some pages in setup wizard. For
## example, you can use custom serverlist, or tell
-## KVIrc to not show directody selection dialog, if
+## KVIrc to not show directory selection dialog, if
## you think, that it is confusing users.
#[Setup]
diff --git a/data/defscript/CMakeLists.txt b/data/defscript/CMakeLists.txt
index 572e76a09..71a46a5c1 100644
--- a/data/defscript/CMakeLists.txt
+++ b/data/defscript/CMakeLists.txt
@@ -6,7 +6,7 @@ if(UNIX)
if(APPLE)
install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/defscript/)
else()
- # Assume linux
+ # Assume Linux
install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/defscript/)
endif()
elseif(WIN32)
diff --git a/data/doctemplates/ircintro.template b/data/doctemplates/ircintro.template
index 0cd9e7157..99da21a09 100644
--- a/data/doctemplates/ircintro.template
+++ b/data/doctemplates/ircintro.template
@@ -9,29 +9,29 @@
@body:
[big]What is IRC ?[/big][br]
Internet Relay Chat (IRC) is one of the most popular and most interactive services on the Internet.
- When you've been wondering 'where the others are?', then IRC is what you're looking for.
+ When you've been wondering [i]where the others are?[/i], then IRC is what you're looking for.
IRC allows real-time conversations with people from the whole planet, 24-hours a day, worldwide.
[br]
[big]How does it work ?[/big][br]
- IRC consists of various separate networks (or "nets") of IRC servers: machines that allow users to connect to IRC.
+ IRC consists of various separate networks (or [i]nets[/i]) of IRC servers: machines that allow users to connect to IRC.
The largest nets are EFnet (the original IRC net, often having more than 32,000 people at once), Undernet, IRCnet, DALnet, and NewNet.
- Generally, the user (such as you) runs a program (called "irc client") to connect to a server on one of the IRC nets.
- The server will relay the information between you and the "rest" of the network (obviously including the other irc users).
- Each user is known on IRC by a nickname (or "nick"), such as smartgal or FunGuy.
- To avoid conflicts with other users, it is best to use a nick that is not too common, e.g., "john" is a poor choice.
- Some networks allow the registration of nicknames: once you have registered a nickname noone else will be able to use it.
- Once connected to an IRC server on an IRC network, you will usually join one or more [b]channels[/b] and converse with other irc users.
+ Generally, the user (such as you) runs a program (called IRC client) to connect to a server on one of the IRC nets.
+ The server will relay the information between you and the [i]rest[/i] of the network (obviously including the other IRC users).
+ Each user is known on IRC by a nickname or [i]nick[/i], such as smartgal or FunGuy.
+ To avoid conflicts with other users, it is best to use a nick that is not too common, e.g., [i]john[/i] is a poor choice.
+ Some networks allow the registration of nicknames: once you have registered a nickname no one else will be able to use it.
+ Once connected to an IRC server on an IRC network, you will usually join one or more [b]channels[/b] and converse with other IRC users.
On EFnet, there often are more than 12,000 channels, each one devoted to a different topic.
[br]
[big]Channels[/big][br]
Channel names usually begin with a #, as in #irchelp.
The same channels are shared among all IRC servers on the same net, so you do not have to be on the same IRC server as your friends.
- Each channel can be joined by a "virtually" unlimited number of users and every word spoken "to the channel" is
+ Each channel can be joined by a virtually unlimited number of users and every word spoken to the channel is
seen by all the users that have joined it.
Each channel has a topic that usually describes the ideas being exchanged between users in that moment.
- It is a good idea to take a look at the topic before starting to talk "randomly" :).
- Channels are run by channel operators, or just "ops" for short, who can control the channel by choosing who may join (by "banning" some users),
- who must leave (by "kicking" them out), and even who may speak (by making the channel "moderated")!
+ It is a good idea to take a look at the topic before starting to talk [i]randomly[/i] :).
+ Channels are run by channel operators, or just [i]ops[/i] for short, who can control the channel by choosing who may join (by [i]banning[/i] some users),
+ who must leave (by [i]kicking[/i] them out), and even who may speak (by making the channel [i]moderated[/i])!
Channel ops have complete control over their channel, and their decisions are final.
If you are banned from a channel, send a /msg to a channel op and ask nicely to be let in
(see the /who command in the next section to learn how to find ops).
@@ -46,10 +46,10 @@
When you join a channel, say hello. Don't expect to get hello's back from everyone,
especially when there are lots of people on the channel.
If you've never visited the channel before and have no idea what to expect,
- just sit back and watch for awhile to get a feel for the flow of the channel (thats called "lurking").
+ just sit back and watch for awhile to get a feel for the flow of the channel (thats called lurking).
[br]
[big]Finding more info[/big][br]
- The web is full of information about IRC: it's just a matter of typing "IRC" in a search engine.
+ The web is full of information about IRC: it's just a matter of typing [i]IRC[/i] in a search engine.
An user-friendly site to start from might be www.irchelp.org: you will find a huge list of
documents and links that will hopefully answer to all your questions.
You may also give a short read to the [doc:kvircintro]Introduction to KVIrc[/doc] which will
diff --git a/data/doctemplates/kvircintro.template b/data/doctemplates/kvircintro.template
index 3cc0bf059..c7cc5e937 100644
--- a/data/doctemplates/kvircintro.template
+++ b/data/doctemplates/kvircintro.template
@@ -11,7 +11,7 @@
In really simple words KVIrc is a Chat client: you use it to talk to other
people over the internet. More specifically KVIrc is an IRC client
- and if you haven't readed it yet please take a look at the [doc:ircintro]IRC introduction[/doc]
+ and if you haven't read it yet please take a look at the [doc:ircintro]IRC introduction[/doc]
then come back here. Now that you know what IRC is then you already know
that an IRC client acts as a relay for the information that you
exchange with your IRC server. KVIrc also acts as a filter and provides
@@ -20,28 +20,28 @@
KVIrc also contains a sophisticated scripting language that allows you to
implement automated reactions to the network events. This is something similar
to creating a robot that acts spontaneously after you have told him what to do.
- The scripting language allows you to enchance the KVIrc's interface and
+ The scripting language allows you to enhance the KVIrc's interface and
to handle special IRC network features that KVIrc itself isn't aware of.
[big]History[/big]
- The original meaning of the name "KVIrc" was, more or less, "K Visual IRC Client".
+ The original meaning of the name KVIrc was, more or less, [i]K Visual IRC Client[/i].
The initial K is a common prefix for the applications written for the KDE
desktop environment: this was the case of the initial versions of KVIrc.
- Starting from version 2.0.0 the absolute KDE dependancy has been dropped (for several
+ Starting from version 2.0.0 the absolute KDE dependency has been dropped (for several
valid reasons) and the support became optional.[br]
- "Visual" was (and is) one of the client goals: having an user-friendly interface to the IRC world.
- Many extreme-unix users have misinterpreted the "user-friendly" interface and have tagged
- KVIrc as a client for "newbies". Well... that is partially true: KVIrc is ALSO a client for newbies:
- A total IRC novice should be able to "chat" in few minutes after installing the program,
- preferably without bothering to read any manual. Yes ,I know that it is not in "unix"-style.
- On the other side, KVIrc contains a whole bunch of compex features that can be discovered
+ [i]Visual[/i] was (and is) one of the client goals: having an user-friendly interface to the IRC world.
+ Many extreme UNIX users have misinterpreted the [i]user-friendly[/i] interface and have tagged
+ KVIrc as a client for newbies. Well... that is partially true: KVIrc is ALSO a client for newbies:
+ A total IRC novice should be able to chat in few minutes after installing the program,
+ preferably without bothering to read any manual. Yes, I know that it is not in [i]UNIX[/i] style.
+ On the other side, KVIrc contains a whole bunch of complex features that can be discovered
only by reading the documentation and experimenting. I bet that you can also
find a lot of undocumented tricks :)
- [big]A bit of "philosophy"[/big]
+ [big]A bit of [i]philosophy[/i][/big]
- At the time of writing (Feb 2005) KVIrc approaches release 3.2.0. The small
+ At the time of writing (Feb 2005) KVIrc approaches release 3.2.6. The small
[b]one-man-project[/b] has grown to the level of a small [b]community[/b].
People from around the world have joined our development efforts and are
constantly donating their time, eyes and bandwidth in order to make KVIrc
@@ -49,9 +49,9 @@
program for chatting, they are giving you the great opportunity to see what's behind
the scenes: you have the source code for the whole application.
In practical terms this means more or less 300.000 lines of tested, debugged and
- commented C++ code, several perl scripts, dozens of makefiles and all the means
+ commented C++ code, several PERL scripts, dozens of makefiles and all the means
that you need to produce a working KVIrc executable on all the supported platforms.
- There is a lot of knowledge (some people call it "technology" because it sells better)
+ There is a lot of knowledge (some people call it [i]technology[/i] because it sells better)
inside, ready to be acquired by an attentive reader. Don't forget that the freedom of
building your own executable from the sources gives you the opportunity
of verifying the source itself: for example you might be interested in verifying
diff --git a/data/man/kvirc.en.1 b/data/man/kvirc.en.1
index 1b28ec949..74801b499 100644
--- a/data/man/kvirc.en.1
+++ b/data/man/kvirc.en.1
@@ -64,14 +64,14 @@ Use this port for connection.
This option requires also a server name.
.TP 8
.B [ircurl]
-An url in the following form:
+An URL in the following form:
irc[6]://<server>[:<port>][/<channel>[?<pass>]]
-For each url on the commandline create a new irc-context
+For each URL on the commandline create a new irc-context
and attempt to connect to <server> on the specified <port>.
The optional <channel> is joined just after the connection
-has been estabilished.
+has been established.
.SH ENVIRONMENT
.PP
diff --git a/doc/hackers.guide.txt b/doc/hackers.guide.txt
index d14b78430..ee54c435e 100644
--- a/doc/hackers.guide.txt
+++ b/doc/hackers.guide.txt
@@ -205,12 +205,12 @@ The source tree
| | to be loaded by the winamp program in order to make
| | communications with KVIrc possible.
| |
-| |-- mircimport A server entry importer from the mirc's servers.ini
+| |-- mircimport A server entry importer from the mIRC's servers.ini
| |
| |-- my my.* scripting stuff
| |
| |-- notifier the notifier module creates a dialog that keeps you
-| | informed about new messages when kvirc is minimized
+| | informed about new messages when KVIrc is minimized
| |
| |-- objects All the object oriented scripting stuff
| |
diff --git a/scripts/config/kvirc4-config.in b/scripts/config/kvirc4-config.in
index b60864d98..bbb158c54 100644
--- a/scripts/config/kvirc4-config.in
+++ b/scripts/config/kvirc4-config.in
@@ -89,7 +89,7 @@ print_syntax()
echo "Syntax : kvirc-config [OPTIONS]"
echo " options:"
echo " --version : KVIrc version"
- echo " --prefix : Intallation prefix"
+ echo " --prefix : Installation prefix"
echo " --include_dir : KVIrc include directory (where headers are stored)"
echo " --exec_prefix : Binaries installation prefix"
echo " --rpath_flags : Rpath flags used in the KVIrc compilation"