From 0e071064b91e64638e14f3756d477f9e2fd3317e Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 17 Jul 2019 23:27:31 +0200 Subject: [PATCH] Fix remaining brandings in tdelibs and adopt to modern age. Signed-off-by: Chris --- tdeio/kssl/ksslcertdlg.cc | 2 +- tdeio/tdeio/global.cpp | 9 ++++----- tdeprint/cups/kptextpage.cpp | 6 +++--- tdeprint/kmspecialmanager.cpp | 2 +- tdeprint/kpcopiespage.cpp | 7 ++++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc index 53904f10d..7431d4c0a 100644 --- a/tdeio/kssl/ksslcertdlg.cc +++ b/tdeio/kssl/ksslcertdlg.cc @@ -81,7 +81,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont())); #ifndef TQT_NO_WIDGET_TOPEXTRA - setCaption(i18n("KDE SSL Certificate Dialog")); + setCaption(i18n("TDE SSL Certificate Dialog")); #endif } diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp index 4a5819bad..ff51ac19c 100644 --- a/tdeio/tdeio/global.cpp +++ b/tdeio/tdeio/global.cpp @@ -688,11 +688,10 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er causes << i18n( "The requested protocol may not be supported." ) << i18n( "The versions of the %1 protocol supported by this computer and " "the server may be incompatible." ).arg( protocol ); - solutions << i18n( "You may perform a search on the Internet for a TDE " - "program (called a tdeioslave or ioslave) which supports this protocol. " - "Places to search include " - "http://kde-apps.org/ and " - "http://freshmeat.net/." ) + solutions << i18n( "You may perform a search on the Trinity website for a TDE " + "program (called a tdeioslave, ioslave or tdeio) which supports this protocol. " + "Places to search include " + "https://mirror.git.trinitydesktop.org/cgit/ or the repos for your distribution." ) << sUpdate << sSysadmin; break; diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index 955434da4..6fb0652ce 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -89,7 +89,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) "

These settings control the appearance of text on printouts. They are only valid for " " printing text files or input directly through kprinter.

" "

Note: These settings have no effect whatsoever for other input formats than " - " text, or for printing from applications such as the KDE Advanced Text Editor. (Applications " + " text, or for printing from applications such as the TDE Advanced Text Editor. (Applications " " in general send PostScript to the print system, and 'kate' in particular has its own " " knobs to control the print output.

." "
" @@ -109,8 +109,8 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) "

Margins

" "

These settings control the margins of printouts on the paper. They are not valid for " " jobs originating from applications which define their own page layout internally and " - " send PostScript to TDEPrint (such as KOffice or OpenOffice.org).

" - "

When printing from KDE applications, such as KMail and Konqueror, or printing an ASCII text " + " send PostScript to TDEPrint (such as KOffice, OpenOffice or LibreOffice).

" + "

When printing from TDE applications, such as KMail and Konqueror, or printing an ASCII text " " file through kprinter, you can choose your preferred margin settings here.

" "

Margins may be set individually for each edge of the paper. The combo box at the bottom lets you change " " the units of measurement between Pixels, Millimeters, Centimeters, and Inches.

" diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index 910de4931..16a0ab616 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -51,7 +51,7 @@ bool KMSpecialManager::savePrinters() { // seems there's a problem here m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " - "local KDE directory. This file probably comes from a previous KDE " + "local TDE directory. This file probably comes from a previous TDE " "release and should be removed in order to manage global pseudo " "printers.")); return false; diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp index 10eb6e204..27b647208 100644 --- a/tdeprint/kpcopiespage.cpp +++ b/tdeprint/kpcopiespage.cpp @@ -53,10 +53,11 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) "

" " " ); TQString whatsThisCurrentPagesLabel = i18n( " Current Page: Select \"Current\" if you want " - " to print the page currently visible in your KDE application.

" + " to print the page currently visible in your TDE application.

" "

Note: this field is disabled if you print from" - " non-TDE applications like Mozilla or OpenOffice.org, since here TDEPrint has no" - " means to determine which document page you are currently viewing.

" ); + " non-TDE applications like Firefox, PaleMoon, SeaMonkey or OpenOffice and" + " LibreOffice, since here TDEPrint has no means to determine which document page" + " you are currently viewing.

" ); TQString whatsThisPageRangeLabel = i18n( " Page Range: Choose a \"Page Range\" to select a subset of the" " complete document pages" " to be printed. The format is \"n,m,o-p,q,r,s-t, u\".

"