Fix tdm branding on Debian and Ubuntu

7 files changed, 23 insertions, 23 deletions

diff --git a/debian/lenny/tdebase/debian/po/de.po b/debian/lenny/tdebase/debian/po/de.po
index eb1ff7a00..9b88c7ac7 100644
--- a/debian/lenny/tdebase/debian/po/de.po
+++ b/debian/lenny/tdebase/debian/po/de.po
@@ -96,10 +96,10 @@ msgstr "Soll der tdm-Dienst gestoppt werden?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The TDE Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Der K Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
+"Der TDE Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
 "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-"
 "Sitzung zu verwalten."
 
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.init b/debian/lenny/tdebase/debian/tdm-trinity.init
index c51d4aa73..ffe71c9bb 100644
--- a/debian/lenny/tdebase/debian/tdm-trinity.init
+++ b/debian/lenny/tdebase/debian/tdm-trinity.init
@@ -13,7 +13,7 @@
 # /etc/init.d/tdm-trinity: start or stop the X display manager
 # Script originally stolen from the xdm package
 #
-# description: K Display Manager
+# description: TDE Display Manager
 #
 set -e
 
@@ -110,9 +110,9 @@ case "$1" in
     if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
        [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
-      echo "Not starting K Display Manager (tdm-trinity); it is not the default display manager."
+      echo "Not starting TDE Display Manager (tdm-trinity); it is not the default display manager."
     else
-      echo -n "Starting K Display Manager: tdm-trinity"
+      echo -n "Starting TDE Display Manager: tdm-trinity"
       start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running"
       echo "."
     fi
@@ -129,7 +129,7 @@ case "$1" in
   ;;
 
   reload)
-    echo -n "Reloading K Display Manager configuration..."
+    echo -n "Reloading TDE Display Manager configuration..."
     if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
       echo "done."
     else
@@ -142,7 +142,7 @@ case "$1" in
   ;;
 
   stop)
-    echo -n "Stopping K Display Manager: tdm-trinity"
+    echo -n "Stopping TDE Display Manager: tdm-trinity"
     if [ ! -f $PIDFILE ]; then
       echo " not running ($PIDFILE not found)."
       exit 0
diff --git a/debian/squeeze/tdebase/debian/po/de.po b/debian/squeeze/tdebase/debian/po/de.po
index eb1ff7a00..9b88c7ac7 100644
--- a/debian/squeeze/tdebase/debian/po/de.po
+++ b/debian/squeeze/tdebase/debian/po/de.po
@@ -96,10 +96,10 @@ msgstr "Soll der tdm-Dienst gestoppt werden?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The TDE Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Der K Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
+"Der TDE Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
 "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-"
 "Sitzung zu verwalten."
 
diff --git a/debian/squeeze/tdebase/debian/tdm-trinity.init b/debian/squeeze/tdebase/debian/tdm-trinity.init
index c51d4aa73..ffe71c9bb 100644
--- a/debian/squeeze/tdebase/debian/tdm-trinity.init
+++ b/debian/squeeze/tdebase/debian/tdm-trinity.init
@@ -13,7 +13,7 @@
 # /etc/init.d/tdm-trinity: start or stop the X display manager
 # Script originally stolen from the xdm package
 #
-# description: K Display Manager
+# description: TDE Display Manager
 #
 set -e
 
@@ -110,9 +110,9 @@ case "$1" in
     if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
        [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
-      echo "Not starting K Display Manager (tdm-trinity); it is not the default display manager."
+      echo "Not starting TDE Display Manager (tdm-trinity); it is not the default display manager."
     else
-      echo -n "Starting K Display Manager: tdm-trinity"
+      echo -n "Starting TDE Display Manager: tdm-trinity"
       start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running"
       echo "."
     fi
@@ -129,7 +129,7 @@ case "$1" in
   ;;
 
   reload)
-    echo -n "Reloading K Display Manager configuration..."
+    echo -n "Reloading TDE Display Manager configuration..."
     if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
       echo "done."
     else
@@ -142,7 +142,7 @@ case "$1" in
   ;;
 
   stop)
-    echo -n "Stopping K Display Manager: tdm-trinity"
+    echo -n "Stopping TDE Display Manager: tdm-trinity"
     if [ ! -f $PIDFILE ]; then
       echo " not running ($PIDFILE not found)."
       exit 0
diff --git a/ubuntu/maverick/tdebase/debian/po/de.po b/ubuntu/maverick/tdebase/debian/po/de.po
index eb1ff7a00..9b88c7ac7 100644
--- a/ubuntu/maverick/tdebase/debian/po/de.po
+++ b/ubuntu/maverick/tdebase/debian/po/de.po
@@ -96,10 +96,10 @@ msgstr "Soll der tdm-Dienst gestoppt werden?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The TDE Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Der K Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
+"Der TDE Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
 "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-"
 "Sitzung zu verwalten."
 
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
index 7ea5ac479..f63b85e3d 100755
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
@@ -1,9 +1,9 @@
-# tdm-trinity - K Display Manager
+# tdm-trinity - TDE Display Manager
 #
 # The display manager service manages the X servers running on the
 # system, providing login and auto-login services
 
-description     "K Display Manager for Trinity"
+description     "TDE Display Manager"
 author          "Richard Johnson and Timothy Pearson"  
 
 start on (filesystem
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt
index c51d4aa73..ffe71c9bb 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt
@@ -13,7 +13,7 @@
 # /etc/init.d/tdm-trinity: start or stop the X display manager
 # Script originally stolen from the xdm package
 #
-# description: K Display Manager
+# description: TDE Display Manager
 #
 set -e
 
@@ -110,9 +110,9 @@ case "$1" in
     if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
        [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
-      echo "Not starting K Display Manager (tdm-trinity); it is not the default display manager."
+      echo "Not starting TDE Display Manager (tdm-trinity); it is not the default display manager."
     else
-      echo -n "Starting K Display Manager: tdm-trinity"
+      echo -n "Starting TDE Display Manager: tdm-trinity"
       start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running"
       echo "."
     fi
@@ -129,7 +129,7 @@ case "$1" in
   ;;
 
   reload)
-    echo -n "Reloading K Display Manager configuration..."
+    echo -n "Reloading TDE Display Manager configuration..."
     if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
       echo "done."
     else
@@ -142,7 +142,7 @@ case "$1" in
   ;;
 
   stop)
-    echo -n "Stopping K Display Manager: tdm-trinity"
+    echo -n "Stopping TDE Display Manager: tdm-trinity"
     if [ ! -f $PIDFILE ]; then
       echo " not running ($PIDFILE not found)."
       exit 0