Branch: master

29c4dd82 2014-06-08 04:02:56 Michele Calgaro
Rebranding: TDE Control Center --> Trinity Control Center
M KDE2PORTING.html
M KDE3PORTING.html
M tdecert/tdecertpart.cc
M tdeio/tdeio/tcpslavebase.cpp
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 89d26e1..181a5bc 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -55,7 +55,7 @@
 <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 @@
 
 <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 5168d25..d57e90b 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -24,7 +24,7 @@
 <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 9a50e6e..8bdd4d3 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -738,7 +738,7 @@
 		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 @@
 			_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 @@
 _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 9b6b978..e9707a7 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -1007,7 +1007,7 @@
              }
            }
         } 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");