summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeL10n.txt1
-rw-r--r--CMakeLists.txt7
-rw-r--r--doc/kmail/configure.docbook6
-rw-r--r--doc/kmail/using-kmail.docbook4
-rw-r--r--doc/knode/introduction.docbook2
-rw-r--r--doc/knode/journey.docbook4
-rw-r--r--doc/knode/using-morefeatures.docbook2
-rw-r--r--doc/kontact/index.docbook2
-rw-r--r--doc/korganizer/index.docbook8
-rw-r--r--kmail/configuredialog.cpp4
-rw-r--r--kmail/kmail.antispamrc-HOWTO2
-rw-r--r--kmail/kmfolderdia.cpp4
-rw-r--r--libkpimexchange/core/exchangedownload.cpp2
13 files changed, 25 insertions, 23 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 8deb0dcd..af2a7034 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -14,7 +14,6 @@ cmake_minimum_required( VERSION 3.1 )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEL10n )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83e56af6..0330dbb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,6 @@ cmake_minimum_required( VERSION 3.1 )
project( tdepim )
set( PACKAGE tdepim )
-set( VERSION R14.0.13 )
##### include essential cmake modules ###########
@@ -33,10 +32,14 @@ enable_testing( )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
+##### set version number ########################
+
+tde_set_project_version( )
+
+
##### setup install paths #######################
include( TDESetupPaths )
diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook
index 7ca07262..b48c7150 100644
--- a/doc/kmail/configure.docbook
+++ b/doc/kmail/configure.docbook
@@ -1053,7 +1053,7 @@ of key words can be modified.</para>
<quote>read receipt</quote>. The message author requests
a disposition notification to be sent and the receiver's
mail program generates a reply from which the author can
- learn what happened to his message. Common disposition
+ learn what happened to their message. Common disposition
types include <quote>displayed</quote> (&ie; read),
<quote>deleted</quote> and <quote>dispatched</quote>
(&eg; forwarded).
@@ -1099,7 +1099,7 @@ of key words can be modified.</para>
notification. This is only
<emphasis>slightly</emphasis> better than always
sending &mdn;s. The author will still know that
- the messages has been acted upon, he just cannot
+ the messages has been acted upon, they just cannot
tell whether it was deleted or read &etc;
</para>
</listitem>
@@ -1145,7 +1145,7 @@ of key words can be modified.</para>
message-id and the original recipient is included
in the &mdn; reply. This preserves enough
information for the sender to find the message in
- his sent messages for which this &mdn; was
+ their sent messages for which this &mdn; was
generated.
</para>
</listitem>
diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook
index 999bd6d9..8609f2e6 100644
--- a/doc/kmail/using-kmail.docbook
+++ b/doc/kmail/using-kmail.docbook
@@ -344,7 +344,7 @@ choose from the list of common &MIME; types. You can also select an encoding
method for your file from the list of encoding options (normally, the default
value works fine). Check the <guilabel>Suggest automatic display</guilabel> option
if you want to suggest to the recipient the automatic (inline) display of this attachment. Whether this works or not depends on the recipient's email client
-and on his settings.</para>
+and on their settings.</para>
<para>You can also attach public keys to the message by using the appropriate options in the
<menuchoice><guimenu>Attach</guimenu></menuchoice> menu. <application>PGP</application>
@@ -2014,7 +2014,7 @@ defined for the current identity to the message. Now you can send the message.</
that the receiver will get the correct key: there can be a man-in-the-middle
attack, as somebody can change the key and sign the message with that other
key. That is why the recipient should verify the attached key by checking the
-key's fingerprint against the one he received in a secure way from you; have a look
+key's fingerprint against the one they received in a secure way from you; have a look
at the <application>PGP</application> documentation for further details.</para>
</sect2>
diff --git a/doc/knode/introduction.docbook b/doc/knode/introduction.docbook
index db14ec3a..91cda142 100644
--- a/doc/knode/introduction.docbook
+++ b/doc/knode/introduction.docbook
@@ -37,7 +37,7 @@ is not answered in this manual.</para>
Usenet</link> chapter is recommended; it is not so much about &knode; as how to
move about in the Usenet with its help. In general, it is not
sufficient to just master a news reader for writing news
-articles: imagine a car driver who masters his car perfectly but does
+articles: imagine a car driver who masters a car perfectly but does
not know about the traffic rules or signs; do you want to encounter
such a driver when out in traffic? So please take your time to learn
at least a little about the <quote>traffic rules</quote> of the
diff --git a/doc/knode/journey.docbook b/doc/knode/journey.docbook
index 54dc82a3..15a4905f 100644
--- a/doc/knode/journey.docbook
+++ b/doc/knode/journey.docbook
@@ -158,7 +158,7 @@ newsgroup. It stands for: (R)ead (T)he (F)...ing
<para>Wait, what is <acronym>BTW</acronym> now? Another often-seen
acronym which means (B)y (T)he (W)ay. It is easy when you know
it; to avoid you having to continuously speculate over the meaning of
-acronyms there is table at he end of this section containing the
+acronyms there is table at the end of this section containing the
most-often-used acronyms.</para>
<para>This table does not try to be complete and is based on a list by
@@ -519,7 +519,7 @@ head and think of a face.</para>
<title>PLONK!</title>
<para>This PLONK! looks like some comic-sound, does it not? And that is
-exactly what it is used for. The one who reads it knows he was just
+exactly what it is used for. The one who reads it knows they were just
added to the killfile of a newsreader; normally this means the
recipient of the PLONK! annoyed the sender. The PLONK! is meant to
play back the sound of the recipients name hitting the ground in the
diff --git a/doc/knode/using-morefeatures.docbook b/doc/knode/using-morefeatures.docbook
index 28d3142c..62e769ab 100644
--- a/doc/knode/using-morefeatures.docbook
+++ b/doc/knode/using-morefeatures.docbook
@@ -688,7 +688,7 @@ examples.</para>
Test; to do this choose the
<guilabel>From</guilabel> header line from the first drop-down
list, choose <guilabel>is exactly the same as</guilabel> from the second
-drop-down list, and enter his name in the text field.
+drop-down list, and enter their name in the text field.
But, before doing this you should have a
look at the <glossterm>header</glossterm> of one of Theodor's
articles and see what is in the <quote>From</quote> line.</para>
diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook
index 13fdb815..7829e674 100644
--- a/doc/kontact/index.docbook
+++ b/doc/kontact/index.docbook
@@ -972,7 +972,7 @@ The settings stored in the profile include typical Look&amp;Feel related options
<para>
Two default profiles are provided by Kontact: &quot;&kontact; Style&quot;, which contains the default &kontact; settings, and &quot;Outlook Style&quot;, adapting &kontact; to Microsoft Outlook Look&amp;Feel.
-The user can adapt existing profiles, create new profiles from his current settings, and import and export profiles.
+The user can adapt existing profiles, create new profiles from their current settings, and import and export profiles.
</para>
<para>
diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook
index 39e0eee7..b9dcf212 100644
--- a/doc/korganizer/index.docbook
+++ b/doc/korganizer/index.docbook
@@ -403,7 +403,7 @@ want to use another resource, especially if you use a supported groupware
server. Please ask the server administrator for the information required to
configure the groupware resource, including free/busy information publishing
and retrieving. Access to free/busy information allows an event organizer to
-take the attendee's calendar in consideration when adding him to the event's
+take the attendee's calendar in consideration when adding them to the event's
attendee list.</para>
<note><para>Besides calendar storage, groupware servers typically offer contacts,
@@ -694,7 +694,7 @@ and do not reload the file at regular intervals.</para>
the same remote file at the same time, because the remote file resource does not
offer a conflict resolution mechanism. For instance, if someone else changes
(and saves) the remote file, after you loaded it, and a some time later you save
-the file, his changes will be lost.
+the file, their changes will be lost.
</para></warning>
</listitem>
@@ -1734,7 +1734,7 @@ requested from the attendee.</para></listitem>
<varlistentry>
<term><guibutton>Select Addressee</guibutton></term>
<listitem><para>If the attendee(s) are in your Address Book, you do not have to
-remember or type his email address to add it to the attendee list. Just click
+remember or type their email address to add it to the attendee list. Just click
the <guibutton>Select Addressee...</guibutton> button and choose the attendee(s)
from the list. Please note that this is the standard &kde; address book, which
is also used by &kmail; and can also be called as a separate application
@@ -1821,7 +1821,7 @@ by dragging it with the mouse, or resize it by moving the edges of the highlight
area with the mouse.</para>
<para>The free/busy information is only available if the
-attendee publishes his free/busy schedule, and if &korganizer; is correctly
+attendee publishes their free/busy schedule, and if &korganizer; is correctly
configured to retrieve it. For more information about configuring &korganizer;
to publish and retrieve free/busy information, please check the
<xref linkend="config" />. Double-clicking on an attendee entry in the list
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 7dcf8ce2..3f5d3fa5 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -3770,7 +3770,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
"receipt</b>. The message author requests a disposition "
"notification to be sent and the receiver's mail program "
"generates a reply from which the author can learn what "
- "happened to his message. Common disposition types include "
+ "happened to their message. Common disposition types include "
"<b>displayed</b> (i.e. read), <b>deleted</b> and <b>dispatched</b> "
"(e.g. forwarded).</p>"
"<p>The following options are available to control KMail's "
@@ -3785,7 +3785,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This "
"is only <em>slightly</em> better than always sending MDNs. "
"The author will still know that the messages has been acted "
- "upon, he just cannot tell whether it was deleted or read etc.</li>"
+ "upon, they just cannot tell whether it was deleted or read etc.</li>"
"<li><em>Always send</em>: Always sends the requested "
"disposition notification. That means that the author of the "
"message gets to know when the message was acted upon and, "
diff --git a/kmail/kmail.antispamrc-HOWTO b/kmail/kmail.antispamrc-HOWTO
index 9edcabb0..a107d81c 100644
--- a/kmail/kmail.antispamrc-HOWTO
+++ b/kmail/kmail.antispamrc-HOWTO
@@ -49,7 +49,7 @@ General options
- Priority: Specifies the priority of the filter. This value is used to
place faster filters before the slower ones in the selection list. If the
- user chooses the top item, he gets the fastest filter. Provider sided
+ user chooses the top item, they get the fastest filter. Provider sided
"filters" (which produce headers tough) like the GMX filter have a prio
at about 70, they are very fast as they don't consume time on the client
side. Since CRM114 is almost as fast it gets 65 ;-).
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index da4671bf..d34c731b 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -541,8 +541,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
"and should see the alarms for the events or tasks in this folder. "
"The setting applies to Calendar and Task folders only "
"(for tasks, this setting is only used for alarms).\n\n"
- "Example use cases: if the boss shares a folder with his secretary, "
- "only the boss should be marked as busy for his meetings, so he should "
+ "Example use cases: if the boss shares a folder with their secretary, "
+ "only the boss should be marked as busy for their meetings, so they should "
"select \"Admins\", since the secretary has no admin rights on the folder.\n"
"On the other hand if a working group shares a Calendar for "
"group meetings, all readers of the folders should be marked "
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 58bf236e..de7da39b 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
if ( mCalendar ) {
KCal::Event *oldEvent = mCalendar->event( event->uid() );
if ( oldEvent ) {
- kdWarning() << "Already got his event, replace it..." << endl;
+ kdWarning() << "Already got the event, replace it..." << endl;
mCalendar->deleteEvent( oldEvent );
}
kdDebug() << "ADD EVENT" << endl;