diff options
| -rw-r--r-- | kcontrol/kcontrol/aboutwidget.cpp | 10 | ||||
| -rw-r--r-- | kcontrol/kcontrol/helpwidget.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kcontrol/main.cpp | 14 | ||||
| -rw-r--r-- | startkde | 3 |
4 files changed, 15 insertions, 16 deletions
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 3a07ee567..f25eae002 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -40,28 +40,28 @@ #include "modules.h" #include "moduletreeview.h" -static const char kcc_text[] = I18N_NOOP("KDE Control Center"); +static const char kcc_text[] = I18N_NOOP("Trinity Control Center"); static const char title_text[] = I18N_NOOP("Configure your desktop environment."); -static const char intro_text[] = I18N_NOOP("Welcome to the \"KDE Control Center\", " +static const char intro_text[] = I18N_NOOP("Welcome to the \"Trinity Control Center\", " "a central place to configure your " "desktop environment. " "Select an item from the index on the left " "to load a configuration module."); -static const char kcc_infotext[] = I18N_NOOP("KDE Info Center"); +static const char kcc_infotext[] = I18N_NOOP("Trinity Info Center"); static const char title_infotext[] = I18N_NOOP("Get system and desktop environment information"); -static const char intro_infotext[] = I18N_NOOP("Welcome to the \"KDE Info Center\", " +static const char intro_infotext[] = I18N_NOOP("Welcome to the \"Trinity Info Center\", " "a central place to find information about your " "computer system."); static const char use_text[] = I18N_NOOP("Use the \"Search\" field if you are unsure " "where to look for a particular configuration option."); -static const char version_text[] = I18N_NOOP("KDE version:"); +static const char version_text[] = I18N_NOOP("Trinity version:"); static const char user_text[] = I18N_NOOP("User:"); static const char host_text[] = I18N_NOOP("Hostname:"); static const char system_text[] = I18N_NOOP("System:"); diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 131a9bd5c..bc4e402f8 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -48,12 +48,12 @@ void HelpWidget::setText(const TQString& docPath, const TQString& text) void HelpWidget::setBaseText() { if (KCGlobal::isInfoCenter()) - helptext = (i18n("<h1>KDE Info Center</h1>" + helptext = (i18n("<h1>Trinity Info Center</h1>" "There is no quick help available for the active info module." "<br><br>" "Click <a href = \"kinfocenter/index.html\">here</a> to read the general Info Center manual.") ); else - helptext = (i18n("<h1>KDE Control Center</h1>" + helptext = (i18n("<h1>Trinity Control Center</h1>" "There is no quick help available for the active control module." "<br><br>" "Click <a href = \"kcontrol/index.html\">here</a> to read the general Control Center manual.") ); diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 4a0191dd7..758b742fd 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -101,12 +101,12 @@ KControlApp::~KControlApp() extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KLocale::setMainCatalogue("kcontrol"); - KAboutData aboutKControl( "kcontrol", I18N_NOOP("KDE Control Center"), - KCONTROL_VERSION, I18N_NOOP("The KDE Control Center"), KAboutData::License_GPL, + KAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), + KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), KAboutData::License_GPL, I18N_NOOP("(c) 1998-2004, The KDE Control Center Developers")); - KAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("KDE Info Center"), - KCONTROL_VERSION, I18N_NOOP("The KDE Info Center"), KAboutData::License_GPL, + KAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"), + KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), KAboutData::License_GPL, I18N_NOOP("(c) 1998-2004, The KDE Control Center Developers")); TQCString argv_0 = argv[0]; @@ -123,11 +123,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) KCGlobal::setIsInfoCenter(false); } - + aboutData->addAuthor("Timothy Pearson", I18N_NOOP("Current Maintainer"), "kb9vqf@pearsoncomputing.net"); if (argv_0.right(11) == "kinfocenter") - aboutData->addAuthor("Helge Deller", I18N_NOOP("Current Maintainer"), "deller@kde.org"); + aboutData->addAuthor("Helge Deller", I18N_NOOP("Previous Maintainer"), "deller@kde.org"); else - aboutData->addAuthor("Daniel Molkentin", I18N_NOOP("Current Maintainer"), "molkentin@kde.org"); + aboutData->addAuthor("Daniel Molkentin", I18N_NOOP("Previous Maintainer"), "molkentin@kde.org"); aboutData->addAuthor("Matthias Hoelzer-Kluepfel",0, "hoelzer@kde.org"); aboutData->addAuthor("Matthias Elter",0, "elter@kde.org"); @@ -107,7 +107,7 @@ fi # Run a quick test for root. if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then - echo "startkde: User ID is $UID. Setting KDEROOTHOME to $KDEHOME." + echo "[startkde] User ID is $UID. Setting KDEROOTHOME to $KDEHOME." export KDEROOTHOME=$KDEHOME fi @@ -399,7 +399,6 @@ if test -n "$KDEDIRS"; then echo "[startkde] Reading from $kdedirs_first/share/kgtk/preload" read -r KGTK_PRELOAD < $kdedirs_first/share/kgtk/preload fi - read -r KGTK_PRELOAD < $kdedirs_first/share/kgtk/preload else if [ -r $KDEDIR/share/kgtk/preload ]; then read -r KGTK_PRELOAD < $KDEDIR/share/kgtk/preload |