diff options
| -rw-r--r-- | README.Kolab | 4 | ||||
| -rw-r--r-- | doc/kmail/configure.docbook | 2 | ||||
| -rw-r--r-- | kalarm/kamail.cpp | 2 | ||||
| -rw-r--r-- | kalarm/prefdlg.cpp | 6 | ||||
| -rw-r--r-- | kmail/kmail.kcfg | 2 | ||||
| -rw-r--r-- | korganizer/koattendeeeditor.cpp | 2 | ||||
| -rw-r--r-- | korganizer/korganizer.kcfg | 2 | ||||
| -rw-r--r-- | korganizer/resourceview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/tips | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/README.Kolab b/README.Kolab index a3cde687f..97e2c5ba9 100644 --- a/README.Kolab +++ b/README.Kolab @@ -25,7 +25,7 @@ to the kolab wizard. KAddressBook: -1. Start TDE Control Center and go to TDE Components, page TDE +1. Start Trinity Control Center and go to TDE Components, page TDE Resources Configuration. Choose the contact resource. Add an IMAP resource and set it to standard. Optional: Delete others or set them to readonly. @@ -47,7 +47,7 @@ KAddressBook: KOrganizer: -1. Start TDE Control Center and go to TDE Components, page TDE +1. Start Trinity Control Center and go to TDE Components, page TDE Resources Configuration. Choose the calendar resource. Add an IMAP resource and set it to standard. Optional: Delete others or set them to readonly. diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook index 95b135623..7ca072621 100644 --- a/doc/kmail/configure.docbook +++ b/doc/kmail/configure.docbook @@ -1944,7 +1944,7 @@ option is selected.</para> <varlistentry> <term><guilabel>Enable IMAP resource functionality</guilabel></term> <listitem> -<para>Makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook and KNotes). This option has to be set whenever you are configuring Kontact as a <guilabel>TDE Kolab client</guilabel>. This option being enabled you will also need to add the appropriate resources from the <guilabel>TDE Control Center</guilabel> (kcontrol) in the <guilabel>TDE Resources Configuration</guilabel> section. <guilabel>Kolab</guilabel> resources have to be added in case the resource functionality applies to a <guilabel>TDE Kolab client</guilabel> set-up.</para> +<para>Makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook and KNotes). This option has to be set whenever you are configuring Kontact as a <guilabel>TDE Kolab client</guilabel>. This option being enabled you will also need to add the appropriate resources from the <guilabel>Trinity Control Center</guilabel> (kcontrol) in the <guilabel>TDE Resources Configuration</guilabel> section. <guilabel>Kolab</guilabel> resources have to be added in case the resource functionality applies to a <guilabel>TDE Kolab client</guilabel> set-up.</para> </listitem> </varlistentry> <varlistentry id="configure-misc-format-groupware-folders"> diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index b68f45ba5..faf3e5c3c 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -134,7 +134,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) errmsgs = errors(i18n("No 'From' email address is configured (no default KMail identity found)\nPlease set it in KMail or in the KAlarm Preferences dialog.")); break; case Preferences::MAIL_FROM_CONTROL_CENTRE: - errmsgs = errors(i18n("No 'From' email address is configured.\nPlease set it in the TDE Control Center or in the KAlarm Preferences dialog.")); + errmsgs = errors(i18n("No 'From' email address is configured.\nPlease set it in the Trinity Control Center or in the KAlarm Preferences dialog.")); break; case Preferences::MAIL_FROM_ADDR: default: diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 2525139f7..22346afa0 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -658,7 +658,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) radio->setFixedSize(radio->sizeHint()); mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); TQWhatsThis::add(radio, - i18n("Check to use the email address set in the TDE Control Center, to identify you as the sender when sending email alarms.")); + i18n("Check to use the email address set in the Trinity Control Center, to identify you as the sender when sending email alarms.")); grid->addMultiCellWidget(radio, 2, 2, 1, 2, TQt::AlignAuto); // 'From' email address to be picked from KMail's identities when the email alarm is configured @@ -699,7 +699,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) radio->setFixedSize(radio->sizeHint()); mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); TQWhatsThis::add(radio, - i18n("Check to use the email address set in the TDE Control Center, for blind copying email alarms to yourself.")); + i18n("Check to use the email address set in the Trinity Control Center, for blind copying email alarms to yourself.")); grid->addMultiCellWidget(radio, 6, 6, 1, 2, TQt::AlignAuto); group->setFixedHeight(group->sizeHint().height()); @@ -799,7 +799,7 @@ TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const case Preferences::MAIL_FROM_CONTROL_CENTRE: if (!KAMail::controlCentreAddress().isEmpty()) return TQString(); - errmsg = i18n("No email address is currently set in the TDE Control Center. %1").arg(errmsg); + errmsg = i18n("No email address is currently set in the Trinity Control Center. %1").arg(errmsg); break; case Preferences::MAIL_FROM_KMAIL: if (KAMail::identitiesExist()) diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index c6080eb49..0b73f2f25 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -230,7 +230,7 @@ <group name="IMAP Resource"> <entry name="TheIMAPResourceEnabled" type="Bool"> - <whatsthis><p>Enabling this makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to set this option you must also set the applications to use the IMAP resource; this is done in the TDE Control Center.</p></whatsthis> + <whatsthis><p>Enabling this makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to set this option you must also set the applications to use the IMAP resource; this is done in the Trinity Control Center.</p></whatsthis> <default>false</default> </entry> diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 6345ae622..4ef9d38d3 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -75,7 +75,7 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * lay "Identities can be set in the 'Personal' " "section of the KOrganizer configuration, or in the " "'Security & Privacy'->'Password & User Account' " - "section of the TDE Control Center. In addition, " + "section of the Trinity Control Center. In addition, " "identities are gathered from your KMail settings " "and from your address book. If you choose " "to set it globally for KDE in the Control Center, " diff --git a/korganizer/korganizer.kcfg b/korganizer/korganizer.kcfg index 01ff6b2e7..c9c6dd676 100644 --- a/korganizer/korganizer.kcfg +++ b/korganizer/korganizer.kcfg @@ -101,7 +101,7 @@ </entry> <entry type="Bool" key="Use Control Center Email" name="EmailControlCenter"> <label>Use email settings from Control Center</label> - <whatsthis>Check this box to use the TDE-wide e-mail settings, which are defined using the TDE Control Center "Password & User Account" Module. Uncheck this box to be able to specify your full name and e-mail.</whatsthis> + <whatsthis>Check this box to use the TDE-wide e-mail settings, which are defined using the Trinity Control Center "Password & User Account" Module. Uncheck this box to be able to specify your full name and e-mail.</whatsthis> <default>true</default> </entry> <entry type="String" key="user_name" name="UserName"> diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index 4a07cb4b7..ea640bb9e 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -541,7 +541,7 @@ void ResourceView::removeResource() this, i18n( "<qt>You may not delete your standard calendar resource.<p>" "You can change the standard calendar resource in the " - "TDE Control Center using the TDE Resource settings under the " + "Trinity Control Center using the TDE Resource settings under the " "TDE Components area.</qt>" ) ); return; } diff --git a/korganizer/tips b/korganizer/tips index aa2929ccf..1dbc8c1ef 100644 --- a/korganizer/tips +++ b/korganizer/tips @@ -21,7 +21,7 @@ <tip category="KOrganizer|General"> <html> -<p>...that you can select whether the week starts on Monday or on Sunday in the TDE Control Center? KOrganizer uses this setting. Look at Regional & Accessibility->Country/Region & Languages in the TDE Control Center, or select <b>Settings</b>, +<p>...that you can select whether the week starts on Monday or on Sunday in the Trinity Control Center? KOrganizer uses this setting. Look at Regional & Accessibility->Country/Region & Languages in the Trinity Control Center, or select <b>Settings</b>, <b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates tab. </p> </html> |