summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-06-08 18:02:56 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-06-08 18:02:56 +0900
commit29c4dd8212dacf80b03d2bfe7f604997f30ef7c8 (patch)
treefbdffec5dc5f5766048a9629395e2951907266b1
parent790fe12d34447ad8549fcb75acf05d056e6743c6 (diff)
downloadtdelibs-29c4dd8212dacf80b03d2bfe7f604997f30ef7c8.tar.gz
tdelibs-29c4dd8212dacf80b03d2bfe7f604997f30ef7c8.zip
Rebranding: TDE Control Center --> Trinity Control Center
-rw-r--r--KDE2PORTING.html6
-rw-r--r--KDE3PORTING.html2
-rw-r--r--tdecert/tdecertpart.cc6
-rw-r--r--tdeio/tdeio/tcpslavebase.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 89d26e18..181a5bcc 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -55,7 +55,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#kled">kled.h, kledlamp.h / KLed, KLedLamp</A></LI>
<LI><A HREF="#KDockWidget">KDockWidget</A></LI>
<LI><A HREF="#KPixmap">KPixmap, KPixmapEffect</A></LI>
-<LI><A HREF="#KControlCenter">TDE Control Center</A></LI>
+<LI><A HREF="#KControlCenter">Trinity Control Center</A></LI>
<LI><A HREF="#KWMModuleApplication">KWMModuleApplication libtdeui/kwmmapp.h</A></LI>
<LI><A HREF="#KDebug">KDebug</A></LI>
<LI><A HREF="#KFileDialog">KFileDialog - General Stuff</A></LI>
@@ -772,9 +772,9 @@ Dirk A. Mueller &lt;<A HREF="mailto:mueller@kde.org">mueller@kde.org</A>&gt;<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="KControlCenter">TDE Control Center</A></H3>
+<H3><A NAME="KControlCenter">Trinity Control Center</A></H3>
-The format for modules for the TDE Control Center has changed quite
+The format for modules for the Trinity Control Center has changed quite
a bit. If you want to port your module to the new schema, please
consult<P>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 5168d25c..d57e90b3 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -24,7 +24,7 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
<LI><A HREF="#tdespell">Changes in tdespell</A></LI>
<LI><A HREF="#tdehtmlpart">API-cleanup in TDEHTML</A></LI>
<LI><A HREF="#tdefile">Changes in tdefile</A></LI>
-<LI><A HREF="#kcontrol">TDE Control Center</A></LI>
+<LI><A HREF="#kcontrol">Trinity Control Center</A></LI>
<LI><A HREF="#kicker">Panel Applets and Extensions</A></LI>
</UL>
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index 9a50e6e2..8bdd4d38 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -738,7 +738,7 @@ void KCertPart::slotImport() {
cfg.writeEntry("Password", "");
cfg.sync();
if (!_silentImport)
- KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the TDE Control Center."), i18n("Certificate Import"));
+ KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the Trinity Control Center."), i18n("Certificate Import"));
} else if (_ca) {
TDEConfig cfg("ksslcalist", true, false);
if (cfg.hasGroup(_ca->getSubject())) {
@@ -756,7 +756,7 @@ void KCertPart::slotImport() {
_signers->regenerate();
if (!_silentImport)
- KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the TDE Control Center."), i18n("Certificate Import"));
+ KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the Trinity Control Center."), i18n("Certificate Import"));
}
}
@@ -870,7 +870,7 @@ _silentImport = false;
_p12 = p12Save;
_ca = caSave;
_curName = curNameSave;
-KMessageBox::information(_frame, i18n("Certificates have been successfully imported into TDE.\nYou can manage your certificate settings from the TDE Control Center."), i18n("Certificate Import"));
+KMessageBox::information(_frame, i18n("Certificates have been successfully imported into TDE.\nYou can manage your certificate settings from the Trinity Control Center."), i18n("Certificate Import"));
}
diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 9b6b9782..e9707a76 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -1007,7 +1007,7 @@ int TCPSlaveBase::verifyCertificate()
}
}
} else if (cp == KSSLCertificateCache::Reject) { // fail
- messageBox(Information, i18n("SSL certificate is being rejected as requested. You can disable this in the TDE Control Center."),
+ messageBox(Information, i18n("SSL certificate is being rejected as requested. You can disable this in the Trinity Control Center."),
i18n("Server Authentication"));
rc = -1;
setMetaData("ssl_action", "reject");