From bb59ef92781dc24165b717f6e9d158a260fbce94 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 8 Dec 2011 17:32:32 -0600 Subject: Rename additional KDE strings in Debian and Ubuntu --- .../applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 | 8 ++++---- .../applications/kiosktool/debian/kiosktool-trinity.manpages | 2 +- ubuntu/maverick/tdebase/debian/changelog | 8 ++++---- .../tdebase/debian/patches/disable_starttde_wallpaper.diff | 10 +++++----- ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 | 2 +- ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'ubuntu') diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 index b03acfb84..e44c4cd99 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 @@ -1,10 +1,10 @@ .\" This file was generated by kdemangen.pl .TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $TDEDIRS according to the current user profile." .SH NAME -kiosktool\-kdedirs +kiosktool\-tdedirs \- A tool to set $TDEDIRS according to the current user profile. .SH SYNOPSIS -kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] +kiosktool\-tdedirs [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION .SH OPTIONS @@ -136,9 +136,9 @@ mirrors the whole layout of widgets. .SH SEE ALSO Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kiosktool\-kdedirs/ +.BR help:/kiosktool\-tdedirs/ directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool\-kdedirs/'" +.BR "`khelpcenter help:/kiosktool\-tdedirs/'" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages index 2d009e1db..43bd4d1b8 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages @@ -1,2 +1,2 @@ debian/kiosktool-trinity.1 -debian/kiosktool-kdedirs-trinity.1 +debian/kiosktool-tdedirs-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index 6c2ad6722..f4c18cd62 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -758,8 +758,8 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $kdehome=$HOME/.kde so we should use - $kdehome instead of $HOME/$kdehome + kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + $tdehome instead of $HOME/$tdehome -- Anthony Mercatante Wed, 19 Sep 2007 12:22:46 +0200 @@ -780,7 +780,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low - * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Jonathan Riddell Sat, 15 Sep 2007 23:12:26 +0100 @@ -799,7 +799,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low [ Ryan Kavanagh ] * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed - * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Ryan Kavanagh Mon, 03 Sep 2007 10:26:36 -0400 diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 0eebed280..21011fbd5 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,14 +1,14 @@ --- starttde +++ starttde @@ -184,17 +184,17 @@ - . $kdehome/share/config/startupconfig + . $tdehome/share/config/startupconfig fi -# Make sure a default wallpaper is set. --if [ ! -e $kdehome/share/config/kdesktoprc ]; then +-if [ ! -e $tdehome/share/config/kdesktoprc ]; then - # With Trinity KDE this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then --cat >$kdehome/share/config/kdesktoprc <$tdehome/share/config/kdesktoprc <$kdehome/share/config/kdesktoprc <$tdehome/share/config/kdesktoprc <