Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 78 insertions, 78 deletions

diff --git a/NewsLog.txt b/NewsLog.txt
index 94229c5e3..f918f75eb 100644
--- a/NewsLog.txt
+++ b/NewsLog.txt
@@ -1642,15 +1642,15 @@ Problems addressed
 New functionality
 -------------------
 
-* prokde35-z Item 60: Merge of the attachments and recurrence tabs into the  main one, according to the usability suggestions and additional comments from the usability team. D'n'd and c'n'p support for attachments. (revision 742613)
+* protrinity5-z Item 60: Merge of the attachments and recurrence tabs into the  main one, according to the usability suggestions and additional comments from the usability team. D'n'd and c'n'p support for attachments. (revision 742613)
 
-* prokde35-z Item 65: Merge of the attendee and free-busy tabs into the  main one, according to the usability suggestions and additional comments from the usability team (revision 744005)
+* protrinity5-z Item 65: Merge of the attendee and free-busy tabs into the  main one, according to the usability suggestions and additional comments from the usability team (revision 744005)
 
-* prokde35-z Item 61: Implementation of the xfb concept (revision 744092)
+* protrinity5-z Item 61: Implementation of the xfb concept (revision 744092)
 
-* prokde35-z Item 203: implementation of the concept for better error messages for crypto operations (audit log) (revision 743026)
+* protrinity5-z Item 203: implementation of the concept for better error messages for crypto operations (audit log) (revision 743026)
 
-* prokde35-z Item 32: Separate the recipients editor with a splitter, so the number of visible recipients can be freely configured (revision 744676)
+* protrinity5-z Item 32: Separate the recipients editor with a splitter, so the number of visible recipients can be freely configured (revision 744676)
 
 
 Friday, November 23rd 2007
@@ -1662,15 +1662,15 @@ Problems addressed
 
 New functionality
 -------------------
-* prokde35-z Item 36: Clearer descriptions for search/filter criteria (738629)
-* prokde35-z Item 25: "Edit" for received mails. (739063)
-* prokde35-z Item 37: Make the splitters a bit more sensible, by preventing total collapsing, where it makes sense. (739069)
-* prokde35-z Item 26: per-account identities (739135)
-* prokde35-z Item 18: more and better configurable message actions on the main reader window (739157)
-* prokde35-z Item 53: Improved coloring of agenda view items (739603)
-* prokde35-z Item 50: Default colors for calendar resources (739689)
-* prokde35-z Item 79 (part 2): Statusbar indicator for active vacation scripts (740023)
-* prokde35-z Item 60 Allow files to be dropped onto the attachment view and ask whether they should be attached by link or by value. Implement dragging out of the view.
+* protrinity5-z Item 36: Clearer descriptions for search/filter criteria (738629)
+* protrinity5-z Item 25: "Edit" for received mails. (739063)
+* protrinity5-z Item 37: Make the splitters a bit more sensible, by preventing total collapsing, where it makes sense. (739069)
+* protrinity5-z Item 26: per-account identities (739135)
+* protrinity5-z Item 18: more and better configurable message actions on the main reader window (739157)
+* protrinity5-z Item 53: Improved coloring of agenda view items (739603)
+* protrinity5-z Item 50: Default colors for calendar resources (739689)
+* protrinity5-z Item 79 (part 2): Statusbar indicator for active vacation scripts (740023)
+* protrinity5-z Item 60 Allow files to be dropped onto the attachment view and ask whether they should be attached by link or by value. Implement dragging out of the view.
 
 Friday, November 16th 2007
 
@@ -1680,8 +1680,8 @@ Problems addressed
 
 New functionality
 -------------------
-* prokde35-z Item 75: Aggregated reminders (737035)
-* prokde35-z Item 3: Hide no-content folders only containing groupware folders (737469)
+* protrinity5-z Item 75: Aggregated reminders (737035)
+* protrinity5-z Item 3: Hide no-content folders only containing groupware folders (737469)
 
 Merges
 ---------
@@ -1703,9 +1703,9 @@ Problems addressed
 
 New functionality
 -------------------
-* Prokde35-z Item 69 Allow comments to be given when reacting to invitations (733159)
-* Prokde35-z Item 68 (part 1) Make it configurable whether invitation emails are move to the trash once the reply to them has been sent and add gui for that to the groupware section of the main configuration dialog. (733883)
-* Prokde35-z Item 73: Show changes made by the organizer when showing invitation updates. (734580)
+* Protrinity5-z Item 69 Allow comments to be given when reacting to invitations (733159)
+* Protrinity5-z Item 68 (part 1) Make it configurable whether invitation emails are move to the trash once the reply to them has been sent and add gui for that to the groupware section of the main configuration dialog. (733883)
+* Protrinity5-z Item 73: Show changes made by the organizer when showing invitation updates. (734580)
 
 Merges
 ---------
@@ -1721,9 +1721,9 @@ Problems addressed
 
 New functionality
 ------------------
-* Prokde35-z Item 49: "Store Contact In" -> "Copy Contact To" and "Move Contact To" (729611)
-* Prokde35-z Item 201: Allow dragging of attachments from composer windows (729661)
-* Prokde35-z Item 203 (part 1): Port KMail from cryptplug to kleo (731701)
+* Protrinity5-z Item 49: "Store Contact In" -> "Copy Contact To" and "Move Contact To" (729611)
+* Protrinity5-z Item 201: Allow dragging of attachments from composer windows (729661)
+* Protrinity5-z Item 203 (part 1): Port KMail from cryptplug to kleo (731701)
 * Add the ability to associate keyboard shortcuts with snippets. (731716)
 * Add a GUI option for syncing groupware changes immediately (731653)
 
@@ -1738,8 +1738,8 @@ Problems addressed
 
 New functionality
 ------------------
-* Prokde35-z Item 16: Filter import/export (728541)
-* Prokde35-z Item 37: Open search results in standalone reader,
+* Protrinity5-z Item 16: Filter import/export (728541)
+* Protrinity5-z Item 37: Open search results in standalone reader,
   when preview pane is hidden (729306)
 
 
@@ -1764,9 +1764,9 @@ Problems addressed
 New functionality
 ------------------
 
-* Prokde35-Z Item 55d: Immediately sync groupware changes (revision 723653)
-* Prokde35-z Item 27: Softbreaking in the kmail editor when no hardbreak limit is set (724153)
-* Prokde35-z Item 19: Raise hardbreak limit from 78 to 255 (724155)
+* Protrinity5-Z Item 55d: Immediately sync groupware changes (revision 723653)
+* Protrinity5-z Item 27: Softbreaking in the kmail editor when no hardbreak limit is set (724153)
+* Protrinity5-z Item 19: Raise hardbreak limit from 78 to 255 (724155)
 * Change the default for what to select on entering a folder to "last selected" from "jump to new".
 
 Merges
@@ -1792,16 +1792,16 @@ Bugfixes
 Features
 --------
 
-* prokde35-z item 70: Check calendar link in invitations (714358)
-* prokde35-z item 30: Text snippet support in the kmail composer window (715206)
-* prokde35-z item 47: Support for read only contacts folders (715588)
-* prokde35-z item 67: Support for invitation counter proposals (716376)
-* prokde35-z item 21: D'n'D out of the folder view, removal of the "save encoded" menu entry (716393)
-* prokde35-z item 7: Close application despite presence of a system tray icon, configurably (716415)
-* prokde35-z item 40: Details on demand for pgp/smime signature status (716476)
-* prokde35-z item 79: Warn about active out-of-office scripts on startup (716765)
-* prokde35-z item 17: Better error reporting for quota errors (716771)
-* prokde35-z item 24: New attachment view in mail viewer (717292)
+* protrinity5-z item 70: Check calendar link in invitations (714358)
+* protrinity5-z item 30: Text snippet support in the kmail composer window (715206)
+* protrinity5-z item 47: Support for read only contacts folders (715588)
+* protrinity5-z item 67: Support for invitation counter proposals (716376)
+* protrinity5-z item 21: D'n'D out of the folder view, removal of the "save encoded" menu entry (716393)
+* protrinity5-z item 7: Close application despite presence of a system tray icon, configurably (716415)
+* protrinity5-z item 40: Details on demand for pgp/smime signature status (716476)
+* protrinity5-z item 79: Warn about active out-of-office scripts on startup (716765)
+* protrinity5-z item 17: Better error reporting for quota errors (716771)
+* protrinity5-z item 24: New attachment view in mail viewer (717292)
 
 
 Friday, September 21st 2007
@@ -1818,9 +1818,9 @@ Bugfixes
 Features
 --------
 
-* prokde35-z item 70: Check calendar link in invitations (714358)
+* protrinity5-z item 70: Check calendar link in invitations (714358)
 
-* prokde35-z item 30: Text snippet support in the kmail composer window (715206)
+* protrinity5-z item 30: Text snippet support in the kmail composer window (715206)
 
 
 Friday, September 14th 2007
@@ -1835,7 +1835,7 @@ Features
 Bugfixes
 --------
 
-* prokde35 W1-32 fixes for global profiling handling
+* protrinity5 W1-32 fixes for global profiling handling
 
 * kolab/issue896 Change the summary view title to "To-Do" from "To-do List" for consistency with the side bar.
 
@@ -1863,15 +1863,15 @@ Friday, September 7th 2007
 
 Features
 --------
-* prokde35-z item 58:  Rename "time associated" to "add-day event" and invert logic (706869)
+* protrinity5-z item 58:  Rename "time associated" to "add-day event" and invert logic (706869)
 * Limit attachment size to a sensible value (upstreaming old SUSE patches, this one originally by Waldo Bastian). (706920)
-* prokde35-z feature 46:  Rework distribution list integration in KAddressBook, add support for multiple active extensions (708034)
-* prokde35-z item 41: Decrypt messages only if requested (some prettification still pending) (708741)
-* prokde35-z item 9: third part: allow to disable local flags in read-only folders (708749)
-* prokde35-z item 2: Better and shorter resource folder names, showing the folder's owner (709038)
-* prokde35-z item 11: Message flags can be toggled by clicking into the corresponding header view columns (709066)
-* prokde35-z item 48: Allow adding LDAP entries to distribution lists from the LDAP search dialog. Add the ability to import LDAP contacts into the addressbook. (709092)
-* prokde35-z itme 42: Show colored indicators of signature and encryption state above the editor area (709142)
+* protrinity5-z feature 46:  Rework distribution list integration in KAddressBook, add support for multiple active extensions (708034)
+* protrinity5-z item 41: Decrypt messages only if requested (some prettification still pending) (708741)
+* protrinity5-z item 9: third part: allow to disable local flags in read-only folders (708749)
+* protrinity5-z item 2: Better and shorter resource folder names, showing the folder's owner (709038)
+* protrinity5-z item 11: Message flags can be toggled by clicking into the corresponding header view columns (709066)
+* protrinity5-z item 48: Allow adding LDAP entries to distribution lists from the LDAP search dialog. Add the ability to import LDAP contacts into the addressbook. (709092)
+* protrinity5-z itme 42: Show colored indicators of signature and encryption state above the editor area (709142)
 
 Bugfixes
 --------
@@ -1908,35 +1908,35 @@ Friday, 24th August 2007
 
 Features
 ----------
- - prokde35-z item 44: keep state of signing and encryption actions across drafts (fully implemented, ported to 3.5, trunk and proko2) (702320)
- - prokde35-z item 35: consistent behavior of pasting URLs via keyboard shortcut, d'n'd and menu (fully implemented, ported to trunk) (702342)
- - prokde35-z item 1:  favourite folders view in KMail (fully implemented, port to trunk pending, merge 36) (702804)
- - prokde35-z item 9:  first part of this item, concerning sync of SEEN flags in read only folders (issue1376) (703473)
-   prokde35-z item 9:  second part, ability to store custom flags on the server (704199) merges
-- prokde35 w1-20 (665722)
-- prokde35 w1-11: Let the navigator toolbar be always the last one, if it's in the top dockwindow ( 666073)
- - prokde35 W1-19 / kolab/issue1749 Since mail folders are not groupware folders, do a full sync, when
+ - protrinity5-z item 44: keep state of signing and encryption actions across drafts (fully implemented, ported to 3.5, trunk and proko2) (702320)
+ - protrinity5-z item 35: consistent behavior of pasting URLs via keyboard shortcut, d'n'd and menu (fully implemented, ported to trunk) (702342)
+ - protrinity5-z item 1:  favourite folders view in KMail (fully implemented, port to trunk pending, merge 36) (702804)
+ - protrinity5-z item 9:  first part of this item, concerning sync of SEEN flags in read only folders (issue1376) (703473)
+   protrinity5-z item 9:  second part, ability to store custom flags on the server (704199) merges
+- protrinity5 w1-20 (665722)
+- protrinity5 w1-11: Let the navigator toolbar be always the last one, if it's in the top dockwindow ( 666073)
+ - protrinity5 W1-19 / kolab/issue1749 Since mail folders are not groupware folders, do a full sync, when
   the mail part is already active. (668988)
- - prokde35 It's now possible to resize the magenta rectangle that represents the event in the freebusy
+ - protrinity5 It's now possible to resize the magenta rectangle that represents the event in the freebusy
  view, to change its start time, end time and duration (not only move it around, which preserved
   duration).
- - prokde35 w1-6 Implement a size column in the shared folder tree class and in kmail. Add the ability
+ - protrinity5 w1-6 Implement a size column in the shared folder tree class and in kmail. Add the ability
  to use a  configurable color for the folder name and size when it is close to a configurable quota
  threshold (provided the folder has quota info in the first place). Implement size retrieval for mbox
  and maildir storage.
- - prokde35 w1-23 Add a font family and size selector to the standalone readerwindow, which
+ - protrinity5 w1-23 Add a font family and size selector to the standalone readerwindow, which
 overrides the usual font for display and printing for that particular mail.
- - prokde35 w1-30 Add an option to show two agenda views (669438)
- - prokde35 W1-30 Start of a gantt-based view for korganizer (669557)
- - prokde35 W22: prepare printing of notes from Kontact, move existing KNotes printing code to a library
+ - protrinity5 w1-30 Add an option to show two agenda views (669438)
+ - protrinity5 W1-30 Start of a gantt-based view for korganizer (669557)
+ - protrinity5 W22: prepare printing of notes from Kontact, move existing KNotes printing code to a library
    shared by KNotes and the Notes plugin ( 670739)
- - prokde35 W1-32: add profile support for kontact, with global/user-specific profiles, and profile
+ - protrinity5 W1-32: add profile support for kontact, with global/user-specific profiles, and profile
    import/export (671800)
- - prokde35 w1-15 Show the delegator and delegate in the even preview.
+ - protrinity5 w1-15 Show the delegator and delegate in the even preview.
     ( related to kolab/issue1773 kolab/issue1774 kolab/issue1776) (670673).
- - prokde35 w1-10 Show plugins which failed to load their part as disabled,
+ - protrinity5 w1-10 Show plugins which failed to load their part as disabled,
 and make them not selectable.(670822)
- - prokde35 W1-19 (sync buttons): Add submenu with "All" and the single accounts, similar as in
+ - protrinity5 W1-19 (sync buttons): Add submenu with "All" and the single accounts, similar as in
 the check mail action
  - Drag and drop notes - (662503)
  - Implemented the ability to drag the current meeting time in the freebusy view, in order to visually
@@ -1968,15 +1968,15 @@ Bugfixes
  - kolab/issue1642 kontact crashed after moving some events (670485)
  - kolab/issue1738 (Kontact escapes part of content type of text/calendar messages, makes Outlook fail
    to directly recognise invitations)
- - kolab/issue864  prokde35 freebusy display takes internal or does not honor "nobody" annotation(
+ - kolab/issue864  protrinity5 freebusy display takes internal or does not honor "nobody" annotation(
  669428)
  - kolab/issue1759 (Dragging emails onto tasks does not enable reminders by default.)
- - kolab/issue1766 prokde35 Kontact crashes after moving event in a free/busy list (TQListViewItem)
- - kolab/issue1784 prokde35 Kontact sometimes crashes by creating a new event.
+ - kolab/issue1766 protrinity5 Kontact crashes after moving event in a free/busy list (TQListViewItem)
+ - kolab/issue1784 protrinity5 Kontact sometimes crashes by creating a new event.
  - kolab/issue1780 i18n of "Agenda View Calender Display" missing
  - kolab/issue1773 (Delegate an event back to the organizator shows strange effects.)
  - kolab/issue1769 (editing attachment of a new mail stops with couldn't write error)
- - prokde35 issue1768 - Percentage symbol missing
+ - protrinity5 issue1768 - Percentage symbol missing
  - kolab/issue1529, start date is set correctly when recurrence date is set
  - kolab/issue1792 (email duplication occurs when using client-side filters and disconnected imap)
  - kolab/issue1786 (moving folder shows error message)
diff --git a/doc/api/Doxyfile.pim b/doc/api/Doxyfile.pim
index a2bc93361..96e93c7d7 100644
--- a/doc/api/Doxyfile.pim
+++ b/doc/api/Doxyfile.pim
@@ -791,7 +791,7 @@ MAN_OUTPUT             =
 # The MAN_EXTENSION tag determines the extension that is added to 
 # the generated man pages (default is the subroutine's section .3)
 
-MAN_EXTENSION          = .kde3
+MAN_EXTENSION          = .trinity
 
 # If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
 # then it will generate one additional man file for each entity 
diff --git a/doc/konsolekalendar/index.docbook b/doc/konsolekalendar/index.docbook
index 93871fb29..d3c7b26a4 100644
--- a/doc/konsolekalendar/index.docbook
+++ b/doc/konsolekalendar/index.docbook
@@ -823,7 +823,7 @@ packages.</para>
 <title>Compilation and installation</title>
 
 <para>This section provides a quick overview of the build process.
-Please read <ulink url="http://developer.kde.org/build/compile_kde3_2.html">
+Please read <ulink url="http://developer.kde.org/build/compile_trinity_2.html">
 Compiling &kde; 3.2.x</ulink> for complete instructions.</para>
 
 <para>If you cannot obtain a suitable precompiled binary package, you
@@ -841,10 +841,10 @@ change to the folder which has been created.</para>
 wrong &kde; folder. If necessary, you can give the &kde; folder
 as a parameter to
 <userinput><command>./configure</command></userinput>. For example,
-if your &kde; is installed in <filename>/opt/kde3</filename>:
+if your &kde; is installed in <filename>/opt/trinity</filename>:
 </para>
 
-<para><userinput><command>./configure</command> --prefix=<replaceable>/opt/kde3</replaceable></userinput></para></note>
+<para><userinput><command>./configure</command> --prefix=<replaceable>/opt/trinity</replaceable></userinput></para></note>
 
 </sect1>
 
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index c2edd2380..8590e00d4 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -184,7 +184,7 @@ set( ${target}_SRCS
 
 tde_save( KDE3_DCOPIDL_EXECUTABLE )
 set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} )
-kde3_add_dcop_skels( ${target}_SRCS kmailIface.h kmailicalIface.h )
+trinity_add_dcop_skels( ${target}_SRCS kmailIface.h kmailicalIface.h )
 tde_restore( KDE3_DCOPIDL_EXECUTABLE )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt
index 40549adda..b3ae2459a 100644
--- a/korganizer/CMakeLists.txt
+++ b/korganizer/CMakeLists.txt
@@ -147,7 +147,7 @@ set( ${target}_SRCS
 
 tde_save( KDE3_DCOPIDL_EXECUTABLE )
 set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} )
-kde3_add_dcop_stubs( ${target}_SRCS ${CMAKE_SOURCE_DIR}/kmail/kmailIface.h )
+trinity_add_dcop_stubs( ${target}_SRCS ${CMAKE_SOURCE_DIR}/kmail/kmailIface.h )
 tde_restore( KDE3_DCOPIDL_EXECUTABLE )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/translate b/translate
index 0a19b1bf1..8db80f94e 100644
--- a/translate
+++ b/translate
@@ -27,8 +27,8 @@ if test -z "$XGETTEXT"; then
   if test -f /usr/bin/kde-xgettext; then
     xgettext=kde-xgettext
     export XGETTEXT=kde-xgettext
-  elif test -f /opt/kde3/bin/kde-xgettext; then
-    xgettext=/opt/kde3/bin/kde-xgettext
+  elif test -f /opt/trinity/bin/kde-xgettext; then
+    xgettext=/opt/trinity/bin/kde-xgettext
     export XGETTEXT=$xgettext
   else
     xgettext=xgettext