TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Rebranding: TDE Control Center --> Trinity Control Center

Browse Source
pull/21/head
Michele Calgaro 11 years ago
parent cb52ffbf91
commit 93aee1b625
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
README.Kolab
Unescape View File

@ -25,7 +25,7 @@ to the kolab wizard.
KAddressBook: 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 Resources Configuration. Choose the contact resource. Add an
IMAP resource and set it to standard. IMAP resource and set it to standard.
Optional: Delete others or set them to readonly. Optional: Delete others or set them to readonly.
@ -47,7 +47,7 @@ KAddressBook:
KOrganizer: 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 Resources Configuration. Choose the calendar resource. Add an
IMAP resource and set it to standard. IMAP resource and set it to standard.
Optional: Delete others or set them to readonly. Optional: Delete others or set them to readonly.

2
doc/kmail/configure.docbook
Unescape View File

@ -1944,7 +1944,7 @@ option is selected.</para>
<varlistentry> <varlistentry>
<term><guilabel>Enable IMAP resource functionality</guilabel></term> <term><guilabel>Enable IMAP resource functionality</guilabel></term>
<listitem> <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> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="configure-misc-format-groupware-folders"> <varlistentry id="configure-misc-format-groupware-folders">

2
kalarm/kamail.cpp
Unescape View File

@ -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.")); 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; break;
case Preferences::MAIL_FROM_CONTROL_CENTRE: 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; break;
case Preferences::MAIL_FROM_ADDR: case Preferences::MAIL_FROM_ADDR:
default: default:

6
kalarm/prefdlg.cpp
Unescape View File

@ -658,7 +658,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
radio->setFixedSize(radio->sizeHint()); radio->setFixedSize(radio->sizeHint());
mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
TQWhatsThis::add(radio, 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); 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 // '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()); radio->setFixedSize(radio->sizeHint());
mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
TQWhatsThis::add(radio, 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); grid->addMultiCellWidget(radio, 6, 6, 1, 2, TQt::AlignAuto);
group->setFixedHeight(group->sizeHint().height()); group->setFixedHeight(group->sizeHint().height());
@ -799,7 +799,7 @@ TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const
case Preferences::MAIL_FROM_CONTROL_CENTRE: case Preferences::MAIL_FROM_CONTROL_CENTRE:
if (!KAMail::controlCentreAddress().isEmpty()) if (!KAMail::controlCentreAddress().isEmpty())
return TQString(); 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; break;
case Preferences::MAIL_FROM_KMAIL: case Preferences::MAIL_FROM_KMAIL:
if (KAMail::identitiesExist()) if (KAMail::identitiesExist())

2
kmail/kmail.kcfg
Unescape View File

@ -230,7 +230,7 @@
<group name="IMAP Resource"> <group name="IMAP Resource">
<entry name="TheIMAPResourceEnabled" type="Bool"> <entry name="TheIMAPResourceEnabled" type="Bool">
<whatsthis>&lt;p&gt;Enabling this makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook, and KNotes.)&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</whatsthis> <whatsthis>&lt;p&gt;Enabling this makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook, and KNotes.)&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</whatsthis>
<default>false</default> <default>false</default>
</entry> </entry>

2
korganizer/koattendeeeditor.cpp
Unescape View File

@ -75,7 +75,7 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * lay
"Identities can be set in the 'Personal' " "Identities can be set in the 'Personal' "
"section of the KOrganizer configuration, or in the " "section of the KOrganizer configuration, or in the "
"'Security & Privacy'->'Password & User Account' " "'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 " "identities are gathered from your KMail settings "
"and from your address book. If you choose " "and from your address book. If you choose "
"to set it globally for KDE in the Control Center, " "to set it globally for KDE in the Control Center, "

2
korganizer/korganizer.kcfg
Unescape View File

@ -101,7 +101,7 @@
</entry> </entry>
<entry type="Bool" key="Use Control Center Email" name="EmailControlCenter"> <entry type="Bool" key="Use Control Center Email" name="EmailControlCenter">
<label>Use email settings from Control Center</label> <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 &quot;Password &amp; User Account&quot; 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 &quot;Password &amp; User Account&quot; Module. Uncheck this box to be able to specify your full name and e-mail.</whatsthis>
<default>true</default> <default>true</default>
</entry> </entry>
<entry type="String" key="user_name" name="UserName"> <entry type="String" key="user_name" name="UserName">

2
korganizer/resourceview.cpp
Unescape View File

@ -541,7 +541,7 @@ void ResourceView::removeResource()
this, this,
i18n( "<qt>You may not delete your standard calendar resource.<p>" i18n( "<qt>You may not delete your standard calendar resource.<p>"
"You can change the standard calendar resource in the " "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>" ) ); "TDE Components area.</qt>" ) );
return; return;
} }

2
korganizer/tips
Unescape View File

@ -21,7 +21,7 @@
<tip category="KOrganizer|General"> <tip category="KOrganizer|General">
<html> <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. <b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates tab.
</p> </p>
</html> </html>

Write Preview
Loading…
Cancel
Save