From a797120a54f4a09bf163eee16534a8db30619cc2 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sat, 26 May 2012 17:05:46 -0500 Subject: Branding cleanup: KDE -> TDE --- kcert/kcertpart.cc | 8 ++++---- kded/kbuildsycoca.cpp | 6 +++--- kinit/kioslave.cpp | 2 +- kio/kio/kmimetypechooser.cpp | 2 +- kio/kssl/ksslkeygen.cc | 6 +++--- kio/misc/kwalletd/kwalletd.cpp | 26 +++++++++++++------------- tdecore/tests/kresolvertest.cpp | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index 45f8349f5..5986bcba0 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -180,7 +180,7 @@ _pkcsFrame = new TQFrame(_frame); grid = new TQGridLayout(_pkcsFrame, 13, 6, KDialog::marginHint(), KDialog::spacingHint() ); -grid->addMultiCellWidget(new TQLabel(i18n("KDE Secure Certificate Import"), _pkcsFrame), 0, 0, 0, 5); +grid->addMultiCellWidget(new TQLabel(i18n("TDE Secure Certificate Import"), _pkcsFrame), 0, 0, 0, 5); grid->addWidget(new TQLabel(i18n("Chain:"), _pkcsFrame), 1, 0); _p12_chain = new KComboBox(_pkcsFrame); grid->addMultiCellWidget(_p12_chain, 1, 1, 1, 4); @@ -271,7 +271,7 @@ _x509Frame = new TQFrame(_frame); grid = new TQGridLayout(_x509Frame, 12, 6, KDialog::marginHint(), KDialog::spacingHint() ); -grid->addMultiCellWidget(new TQLabel(i18n("KDE Secure Certificate Import"), _x509Frame), 0, 0, 0, 5); +grid->addMultiCellWidget(new TQLabel(i18n("TDE Secure Certificate Import"), _x509Frame), 0, 0, 0, 5); grid->addWidget(new TQLabel(i18n("Subject:"), _x509Frame), 1, 0); grid->addWidget(new TQLabel(i18n("Issued by:"), _x509Frame), 1, 3); @@ -356,7 +356,7 @@ _x509Frame->hide(); _blankFrame = new TQFrame(_frame); grid = new TQGridLayout(_blankFrame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); -grid->addMultiCellWidget(new TQLabel(i18n("KDE Secure Certificate Import"), _blankFrame), 0, 0, 0, 0); +grid->addMultiCellWidget(new TQLabel(i18n("TDE Secure Certificate Import"), _blankFrame), 0, 0, 0, 0); _blankFrame->show(); @@ -452,7 +452,7 @@ if (_p12) { bool KCertPart::openFile() { #ifndef HAVE_SSL - KMessageBox::sorry(_frame, i18n("You do not seem to have compiled KDE with SSL support."), i18n("Certificate Import")); + KMessageBox::sorry(_frame, i18n("You do not seem to have compiled TDE with SSL support."), i18n("Certificate Import")); return false; #else diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index e075fdca8..f111b3762 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -747,10 +747,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) #ifdef KBUILDSYCOCA_GUI silent = args->isSet("silent"); showprogress = args->isSet("showprogress"); - TQLabel progress( TQString("


%1
").arg( i18n("Reloading KDE configuration, please wait...") ), 0, "", Qt::WType_Dialog | Qt::WStyle_DialogBorder | Qt::WStyle_Customize| Qt::WStyle_Title ); - TQString capt = i18n("KDE Configuration Manager"); + TQLabel progress( TQString("


%1
").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", Qt::WType_Dialog | Qt::WStyle_DialogBorder | Qt::WStyle_Customize| Qt::WStyle_Title ); + TQString capt = i18n("TDE Configuration Manager"); if (!silent) { - if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload KDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload"))) + if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload TDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload"))) return 0; } if (!silent || showprogress) { diff --git a/kinit/kioslave.cpp b/kinit/kioslave.cpp index 215f53c67..f132abb0d 100644 --- a/kinit/kioslave.cpp +++ b/kinit/kioslave.cpp @@ -55,7 +55,7 @@ int main(int argc, char **argv) { if (argc < 5) { - fprintf(stderr, "Usage: kioslave \n\nThis program is part of KDE.\n"); + fprintf(stderr, "Usage: kioslave \n\nThis program is part of TDE.\n"); exit(1); } TQCString libpath = argv[1]; diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 5548396b6..78011e143 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -101,7 +101,7 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text, this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); TQWhatsThis::add( d->btnEditMimeType, i18n( - "Click this button to display the familiar KDE mime type editor.") ); + "Click this button to display the familiar TDE mime type editor.") ); } } diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc index c71490d60..5e7eb3a77 100644 --- a/kio/kssl/ksslkeygen.cc +++ b/kio/kssl/ksslkeygen.cc @@ -45,9 +45,9 @@ KSSLKeyGen::KSSLKeyGen(TQWidget *parent, const char *name, bool modal) #ifdef KSSL_HAVE_SSL page1 = new KGWizardPage1(this, "Wizard Page 1"); - addPage(page1, i18n("KDE Certificate Request")); + addPage(page1, i18n("TDE Certificate Request")); page2 = new KGWizardPage2(this, "Wizard Page 2"); - addPage(page2, i18n("KDE Certificate Request - Password")); + addPage(page2, i18n("TDE Certificate Request - Password")); setHelpEnabled(page1, false); setHelpEnabled(page2, false); setFinishEnabled(page2, false); @@ -90,7 +90,7 @@ void KSSLKeyGen::slotGenerate() { bits = 512; break; default: - KMessageBox::sorry(NULL, i18n("Unsupported key size."), i18n("KDE SSL Information")); + KMessageBox::sorry(NULL, i18n("Unsupported key size."), i18n("TDE SSL Information")); return; } diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 3815277c5..eca13c463 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -400,7 +400,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool TQCString thisApp; if (appid.isEmpty()) { - thisApp = "KDE System"; + thisApp = "TDE System"; } else { thisApp = appid; } @@ -435,7 +435,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool } kpd = new KPasswordDialog(KPasswordDialog::Password, false, 0); if (appid.isEmpty()) { - kpd->setPrompt(i18n("KDE has requested to open the wallet '%1'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(wallet))); + kpd->setPrompt(i18n("TDE has requested to open the wallet '%1'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(wallet))); } else { kpd->setPrompt(i18n("The application '%1' has requested to open the wallet '%2'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet))); } @@ -449,16 +449,16 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool // Auto create these wallets. kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0); if (appid.isEmpty()) { - kpd->setPrompt(i18n("KDE has requested to open the wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.")); + kpd->setPrompt(i18n("TDE has requested to open the wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.")); } else { - kpd->setPrompt(i18n("The application '%1' has requested to open the KDE wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.").arg(TQStyleSheet::escape(appid))); + kpd->setPrompt(i18n("The application '%1' has requested to open the TDE wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.").arg(TQStyleSheet::escape(appid))); } brandNew = true; kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen")); } else { kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0); if (appid.length() == 0) { - kpd->setPrompt(i18n("KDE has requested to create a new wallet named '%1'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(wallet))); + kpd->setPrompt(i18n("TDE has requested to create a new wallet named '%1'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(wallet))); } else { kpd->setPrompt(i18n("The application '%1' has requested to create a new wallet named '%2'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet))); } @@ -467,7 +467,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool } if (kpd) { - kpd->setCaption(i18n("KDE Wallet Service")); + kpd->setCaption(i18n("TDE Wallet Service")); kpd->setAllowEmptyPasswords(true); } @@ -545,7 +545,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W TQCString thisApp; if (appid.isEmpty()) { - thisApp = "KDE System"; + thisApp = "TDE System"; } else { thisApp = appid; } @@ -553,7 +553,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W if (!implicitAllow(wallet, thisApp)) { KBetterThanKDialogBase *dialog = new KBetterThanKDialogBase; if (appid.isEmpty()) { - dialog->setLabel(i18n("KDE has requested access to the open wallet '%1'.").arg(TQStyleSheet::escape(wallet))); + dialog->setLabel(i18n("TDE has requested access to the open wallet '%1'.").arg(TQStyleSheet::escape(wallet))); } else { dialog->setLabel(i18n("The application '%1' has requested access to the open wallet '%2'.").arg(TQStyleSheet::escape(TQString(appid))).arg(TQStyleSheet::escape(wallet))); } @@ -642,7 +642,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin if (!it.current()) { handle = doTransactionOpen(appid, wallet, wId,false); if (-1 == handle) { - KMessageBox::sorryWId(wId, i18n("Unable to open wallet. The wallet must be opened in order to change the password."), i18n("KDE Wallet Service")); + KMessageBox::sorryWId(wId, i18n("Unable to open wallet. The wallet must be opened in order to change the password."), i18n("TDE Wallet Service")); return; } @@ -658,7 +658,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin KPasswordDialog *kpd; kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0); kpd->setPrompt(i18n("Please choose a new password for the wallet '%1'.").arg(TQStyleSheet::escape(wallet))); - kpd->setCaption(i18n("KDE Wallet Service")); + kpd->setCaption(i18n("TDE Wallet Service")); kpd->setAllowEmptyPasswords(true); setupDialog( kpd, wId, appid, false ); if (kpd->exec() == KDialog::Accepted) { @@ -669,12 +669,12 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin pa.duplicate(p, strlen(p)); int rc = w->close(pa); if (rc < 0) { - KMessageBox::sorryWId(wId, i18n("Error re-encrypting the wallet. Password was not changed."), i18n("KDE Wallet Service")); + KMessageBox::sorryWId(wId, i18n("Error re-encrypting the wallet. Password was not changed."), i18n("TDE Wallet Service")); reclose = true; } else { rc = w->open(pa); if (rc < 0) { - KMessageBox::sorryWId(wId, i18n("Error reopening the wallet. Data may be lost."), i18n("KDE Wallet Service")); + KMessageBox::sorryWId(wId, i18n("Error reopening the wallet. Data may be lost."), i18n("TDE Wallet Service")); reclose = true; } } @@ -1234,7 +1234,7 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) { void KWalletD::notifyFailures() { if (!_showingFailureNotify) { _showingFailureNotify = true; - KMessageBox::information(0, i18n("There have been repeated failed attempts to gain access to a wallet. An application may be misbehaving."), i18n("KDE Wallet Service")); + KMessageBox::information(0, i18n("There have been repeated failed attempts to gain access to a wallet. An application may be misbehaving."), i18n("TDE Wallet Service")); _showingFailureNotify = false; } } diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp index f1d3c11f9..1c2272c11 100644 --- a/tdecore/tests/kresolvertest.cpp +++ b/tdecore/tests/kresolvertest.cpp @@ -181,7 +181,7 @@ bool testKernel() printf("\tCould not get socket name\n"); } - printf("\tSize of KDE's internal sockaddr_in6 is %d bytes\n", + printf("\tSize of TDE's internal sockaddr_in6 is %d bytes\n", sizeof(kde_sockaddr_in6)); # ifdef HAVE_SOCKADDR_IN6 @@ -327,10 +327,10 @@ void go() rf & KRF_KNOWS_AF_INET6) printf(" Your system probably supports full IPv6 implementation.\n" " This depends on whether your system's getaddrinfo() supports IPv6.\n" - " However, KDE Libraries were compiled to use the support whenever available.\n"); + " However, TDE Libraries were compiled to use the support whenever available.\n"); else if ((rf & (KRF_USING_OWN_GETADDRINFO|KRF_KNOWS_AF_INET6)) == 0) printf(" Your system supports partial IPv6 implementation.\n" - " That is, your system has a getaddrinfo() implementation, but KDE Libraries\n" + " That is, your system has a getaddrinfo() implementation, but TDE Libraries\n" " don't know how to detect an IPv6 socket. That means that only request to" " any kind of socket will use IPv6, if your getaddrinfo() returns them."); else if (rf & KRF_USING_OWN_GETADDRINFO) @@ -339,10 +339,10 @@ void go() { printf(" Your system supports partial IPv6 implementation.\n"); if (rf & KRF_CAN_RESOLVE_IPV6) - printf(" The KDE implementation of getaddrinfo() claims to be able to resolve\n" + printf(" The TDE implementation of getaddrinfo() claims to be able to resolve\n" " IPv6 lookups and the value of AF_INET6 is known.\n"); else - printf(" The KDE implementation of getaddrinfo() cannot resolve IPv6 lookups.\n" + printf(" The TDE implementation of getaddrinfo() cannot resolve IPv6 lookups.\n" " That means that IPv6 support is limited to two addresses (:: and ::1)\n"); } else -- cgit v1.2.1