From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- konqueror/about/konq_aboutpage.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'konqueror/about') diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index fed36a1e2..ab602eb94 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -281,12 +281,12 @@ TQString KonqAboutPageFactory::specs() .arg( i18n("Cascading Style Sheets (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") ) .arg( i18n("built-in") ) .arg( i18n("ECMA-262 Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) - .arg( i18n("JavaScript disabled (globally). Enable JavaScript here.").arg("exec:/kcmshell tdehtml_java_js") ) - .arg( i18n("JavaScript enabled (globally). Configure JavaScript here.").arg("exec:/kcmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! + .arg( i18n("JavaScript disabled (globally). Enable JavaScript here.").arg("exec:/tdecmshell tdehtml_java_js") ) + .arg( i18n("JavaScript enabled (globally). Configure JavaScript here.").arg("exec:/tdecmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! .arg( i18n("Secure Java® support").arg("http://java.sun.com") ) .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (Blackdown, IBM or Sun)") .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") ) - .arg( i18n("Enable Java (globally) here.").arg("exec:/kcmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ? + .arg( i18n("Enable Java (globally) here.").arg("exec:/tdecmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ? .arg( i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®Video, etc.)") .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash") .arg("http://www.real.com").arg("http://www.real.com") @@ -306,7 +306,7 @@ TQString KonqAboutPageFactory::specs() .arg( i18n("Transfer protocols") ) .arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") ) .arg( i18n("FTP") ) - .arg( i18n("and many more...").arg("exec:/kcmshell ioslaveinfo") ) + .arg( i18n("and many more...").arg("exec:/tdecmshell ioslaveinfo") ) .arg( i18n("URL-Completion") ) .arg( i18n("Manual")) .arg( i18n("Popup")) @@ -366,7 +366,7 @@ TQString KonqAboutPageFactory::tips() "using Google, for the search phrase \"KDE\". There are a lot of " "Web-Shortcuts predefined to make searching for software or looking " "up certain words in an encyclopedia a breeze. You can even " - "create your own Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") ) + "create your own Web-Shortcuts." ).arg("exec:/tdecmshell ebrowsing") ) .arg( i18n( "Use the magnifier button in the" " toolbar to increase the font size on your web page.").arg(viewmag_icon_path) ) .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to " @@ -386,11 +386,11 @@ TQString KonqAboutPageFactory::tips() ", or create your own ones." ).arg(view_left_right_icon_path)) .arg( i18n( "Use the user-agent feature if the website you are visiting " "asks you to use a different browser " - "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/kcmshell useragent") ) + "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/tdecmshell useragent") ) .arg( i18n( "The History in your SideBar ensures " "that you can keep track of the pages you have visited recently.").arg(history_icon_path) ) .arg( i18n( "Use a caching proxy to speed up your" - " Internet connection.").arg("exec:/kcmshell proxy") ) + " Internet connection.").arg("exec:/tdecmshell proxy") ) .arg( i18n( "Advanced users will appreciate the Konsole which you can embed into " "Konqueror (Window -> Show " "Terminal Emulator).").arg(openterm_icon_path)) @@ -437,7 +437,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow * setCharset(codec->name(), true); else setCharset("iso-8859-1", true); - // about:blah isn't a kioslave -> disable View source + // about:blah isn't a tdeioslave -> disable View source KAction * act = actionCollection()->action("viewDocumentSource"); if ( act ) act->setEnabled( false ); -- cgit v1.2.1