diff --git a/README.Kolab b/README.Kolab index a3cde687..97e2c5ba 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 95b13562..7ca07262 100644 --- a/doc/kmail/configure.docbook +++ b/doc/kmail/configure.docbook @@ -1944,7 +1944,7 @@ option is selected. Enable IMAP resource functionality -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 TDE Kolab client. This option being enabled you will also need to add the appropriate resources from the TDE Control Center (kcontrol) in the TDE Resources Configuration section. Kolab resources have to be added in case the resource functionality applies to a TDE Kolab client set-up. +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 TDE Kolab client. This option being enabled you will also need to add the appropriate resources from the Trinity Control Center (kcontrol) in the TDE Resources Configuration section. Kolab resources have to be added in case the resource functionality applies to a TDE Kolab client set-up. diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index b68f45ba..faf3e5c3 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 2525139f..22346afa 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 c6080eb4..0b73f2f2 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -230,7 +230,7 @@ - <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> + <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> false diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 6345ae62..4ef9d38d 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 01ff6b2e..c9c6dd67 100644 --- a/korganizer/korganizer.kcfg +++ b/korganizer/korganizer.kcfg @@ -101,7 +101,7 @@ - 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. + 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. true diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index 4a07cb4b..ea640bb9 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -541,7 +541,7 @@ void ResourceView::removeResource() this, i18n( "You may not delete your standard calendar resource.

" "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." ) ); return; } diff --git a/korganizer/tips b/korganizer/tips index aa2929cc..1dbc8c1e 100644 --- a/korganizer/tips +++ b/korganizer/tips @@ -21,7 +21,7 @@ -

...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 Settings, +

...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 Settings, Configure Date & Time... from the menu bar. Select the Time & Dates tab.