Branch: master

13c6ecc3 2019-07-14 17:29:38 Chris 
Fix typo in kasbar.

Signed-off-by: Chris <xchrisx@...>
M kicker/extensions/kasbar/kasprefsdlg.cpp

kicker/extensions/kasbar/kasprefsdlg.cpp

diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 978b6ae..28c6fca 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -418,8 +418,7 @@
 
    progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage );
    TQWhatsThis::add( progressCheck,
-		    i18n( "Enables the display of a progress bar in the label of windows show "
-			  "are progress indicators." ) );
+		    i18n( "Enables the display of a progress indicator in the label of windows." ) );
    progressCheck->setChecked( kasbar->showProgress() );
    connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) );
0721f2d3 2019-07-15 05:10:00 Chris 
Fix remaining brandings in tdebase.

Signed-off-by: Chris <xchrisx@...>
M kcontrol/knotify/knotify.cpp
M kcontrol/konsole/kcmkonsole.cpp
M kdesktop/kdesktop.kcfg
M kicker/extensions/kasbar/kasaboutdlg.cpp
M konsole/tips
M ksplashml/themeengine/redmond/previewredmond.cpp
M twin/kcmtwin/twindecoration/buttons.cpp

kcontrol/knotify/knotify.cpp

diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index be66690..b703b9b 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -54,7 +54,7 @@
     setButtons( Help | Default | Apply );
 
     setQuickHelp( i18n("<h1>System Notifications</h1>"
-                "KDE allows for a great deal of control over how you "
+                "TDE allows for a great deal of control over how you "
                 "will be notified when certain events occur. There are "
                 "several choices as to how you are notified:"
                 "<ul><li>As the application was originally designed."

kcontrol/konsole/kcmkonsole.cpp

diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index e2b280d..ace7409 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -40,7 +40,7 @@
 :TDECModule(ModuleFactory::instance(), parent, name)
 {
     
-    setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal"
+    setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the TDE terminal"
 		" application. You can configure the generic Konsole options (which can also be "
 		"configured using the RMB) and you can edit the schemas and sessions "
 		"available to Konsole."));

kdesktop/kdesktop.kcfg

diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 15262b6..8086ad8 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -107,17 +107,17 @@
   <group name="Version"> 
     <entry key="KDEVersionMajor" type="Int">
       <default>0</default>
-      <label>KDE major version number</label>
+      <label>TDE major version number</label>
       <whatsthis></whatsthis>
     </entry>
     <entry key="KDEVersionMinor" type="Int">
       <default>0</default>
-      <label>KDE minor version number</label>
+      <label>TDE minor version number</label>
       <whatsthis></whatsthis>
     </entry>
     <entry key="KDEVersionRelease" type="Int">
       <default>0</default>
-      <label>KDE release version number</label>
+      <label>TDE release version number</label>
       <whatsthis></whatsthis>
     </entry>
   </group>

kicker/extensions/kasbar/kasaboutdlg.cpp

diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 1b58d87..1d15dc7 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -155,7 +155,7 @@
 
    new TQLabel( i18n( "<qt><body>"
 		     "<h2>Kasbar Version: %1</h2>"
-		     "<b>KDE Version:</b> %2"
+		     "<b>TDE Version:</b> %2"
 		     "</body></qt>" )
 	       .arg( VERSION_STRING ).arg( TDE_VERSION_STRING ),
 	       aboutPage );

konsole/tips

diff --git a/konsole/tips b/konsole/tips
index 11fa299..dbc3631 100644
--- a/konsole/tips
+++ b/konsole/tips
@@ -238,7 +238,7 @@
 <p>...that if you drag &amp; drop a URL into a Konsole window you are presented with a
 menu giving the option to copy or move the specified file into the current working directory,
 as well as just pasting the URL as text.
-<p>This works with any type of URL which KDE supports.
+<p>This works with any type of URL which TDE supports.
 </html>
 </tip>

ksplashml/themeengine/redmond/previewredmond.cpp

diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp
index 7a31a44..29bfa4b 100644
--- a/ksplashml/themeengine/redmond/previewredmond.cpp
+++ b/ksplashml/themeengine/redmond/previewredmond.cpp
@@ -105,7 +105,7 @@
       rect().height()/2 + (int)(p.fontMetrics().height()*0.85) + 15 );
     p.setPen( m_statusColor );
     p.setFont( m_statusFont );
-    p.drawText( statusTextPos, i18n("Starting KDE...") );
+    p.drawText( statusTextPos, i18n("Starting TDE...") );
   }
 
   p.end();

twin/kcmtwin/twindecoration/buttons.cpp

diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index a7dc8a9..f47e0f5 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -608,7 +608,7 @@
 	p->fillRect( r, c1 );
 	p->setPen( Qt::white );
 	p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
-	p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") );
+	p->drawText( r, AlignLeft | AlignVCenter, i18n("TDE") );
 
 	offset = geometry().width() - 3 - rightoffset;
 	drawButtonList( p, buttonsRight, offset );

Branch: r14.0.x

3fe34eec 2019-07-15 05:11:07 Chris 
Fix remaining brandings in tdebase.

Signed-off-by: Chris <xchrisx@...>
(cherry picked from commit 0721f2d3f40ee990c2227563889dff3d540f9224)
M kcontrol/knotify/knotify.cpp
M kcontrol/konsole/kcmkonsole.cpp
M kdesktop/kdesktop.kcfg
M kicker/extensions/kasbar/kasaboutdlg.cpp
M konsole/tips
M ksplashml/themeengine/redmond/previewredmond.cpp
M twin/kcmtwin/twindecoration/buttons.cpp

kcontrol/knotify/knotify.cpp

diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index be66690..b703b9b 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -54,7 +54,7 @@
     setButtons( Help | Default | Apply );
 
     setQuickHelp( i18n("<h1>System Notifications</h1>"
-                "KDE allows for a great deal of control over how you "
+                "TDE allows for a great deal of control over how you "
                 "will be notified when certain events occur. There are "
                 "several choices as to how you are notified:"
                 "<ul><li>As the application was originally designed."

kcontrol/konsole/kcmkonsole.cpp

diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index e2b280d..ace7409 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -40,7 +40,7 @@
 :TDECModule(ModuleFactory::instance(), parent, name)
 {
     
-    setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal"
+    setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the TDE terminal"
 		" application. You can configure the generic Konsole options (which can also be "
 		"configured using the RMB) and you can edit the schemas and sessions "
 		"available to Konsole."));

kdesktop/kdesktop.kcfg

diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 15262b6..8086ad8 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -107,17 +107,17 @@
   <group name="Version"> 
     <entry key="KDEVersionMajor" type="Int">
       <default>0</default>
-      <label>KDE major version number</label>
+      <label>TDE major version number</label>
       <whatsthis></whatsthis>
     </entry>
     <entry key="KDEVersionMinor" type="Int">
       <default>0</default>
-      <label>KDE minor version number</label>
+      <label>TDE minor version number</label>
       <whatsthis></whatsthis>
     </entry>
     <entry key="KDEVersionRelease" type="Int">
       <default>0</default>
-      <label>KDE release version number</label>
+      <label>TDE release version number</label>
       <whatsthis></whatsthis>
     </entry>
   </group>

kicker/extensions/kasbar/kasaboutdlg.cpp

diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 1b58d87..1d15dc7 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -155,7 +155,7 @@
 
    new TQLabel( i18n( "<qt><body>"
 		     "<h2>Kasbar Version: %1</h2>"
-		     "<b>KDE Version:</b> %2"
+		     "<b>TDE Version:</b> %2"
 		     "</body></qt>" )
 	       .arg( VERSION_STRING ).arg( TDE_VERSION_STRING ),
 	       aboutPage );

konsole/tips

diff --git a/konsole/tips b/konsole/tips
index 11fa299..dbc3631 100644
--- a/konsole/tips
+++ b/konsole/tips
@@ -238,7 +238,7 @@
 <p>...that if you drag &amp; drop a URL into a Konsole window you are presented with a
 menu giving the option to copy or move the specified file into the current working directory,
 as well as just pasting the URL as text.
-<p>This works with any type of URL which KDE supports.
+<p>This works with any type of URL which TDE supports.
 </html>
 </tip>

ksplashml/themeengine/redmond/previewredmond.cpp

diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp
index 7a31a44..29bfa4b 100644
--- a/ksplashml/themeengine/redmond/previewredmond.cpp
+++ b/ksplashml/themeengine/redmond/previewredmond.cpp
@@ -105,7 +105,7 @@
       rect().height()/2 + (int)(p.fontMetrics().height()*0.85) + 15 );
     p.setPen( m_statusColor );
     p.setFont( m_statusFont );
-    p.drawText( statusTextPos, i18n("Starting KDE...") );
+    p.drawText( statusTextPos, i18n("Starting TDE...") );
   }
 
   p.end();

twin/kcmtwin/twindecoration/buttons.cpp

diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index a7dc8a9..f47e0f5 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -608,7 +608,7 @@
 	p->fillRect( r, c1 );
 	p->setPen( Qt::white );
 	p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
-	p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") );
+	p->drawText( r, AlignLeft | AlignVCenter, i18n("TDE") );
 
 	offset = geometry().width() - 3 - rightoffset;
 	drawButtonList( p, buttonsRight, offset );