From 9a9d4a590e32833651a932328e2c145f87bcce32 Mon Sep 17 00:00:00 2001 From: Andrew Coles Date: Mon, 17 Jan 2005 12:50:27 +0000 Subject: [PATCH] CVS_SILENT Corrected typos. svn path=/trunk/kdebase/kwin/; revision=379392 --- kcmkwin/kwinoptions/windows.cpp | 12 ++++++------ workspace.cpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp index 3533144a63..a97986ce72 100644 --- a/kcmkwin/kwinoptions/windows.cpp +++ b/kcmkwin/kwinoptions/windows.cpp @@ -1177,15 +1177,15 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW resetKompmgr_ = FALSE; QVBoxLayout *lay = new QVBoxLayout (this); if (!kompmgrAvailable()){ - KActiveLabel *label = new KActiveLabel(i18n("It seems as if alpha channel support is not available!

" - "Please make sure, you have " - "Xorg ≥ 6.8" - " and installed the kompmgr that came with kwin
" - "Also make sure you have the following entries in your XConfig (e.g. /etc/XF86Config):

" + KActiveLabel *label = new KActiveLabel(i18n("It seems that alpha channel support is not available.

" + "Please make sure you have " + "Xorg ≥ 6.8," + " and installed the kompmgr that came with kwin.
" + "Also, make sure you have the following entries in your XConfig (e.g. /etc/XF86Config):

" "Section \"Extensions\"
" "Option \"Composite\" \"Enable\"
" "EndSection

" - "And if your GPU provides hardware accelerated Xrender support (mainly nVidia cards):

" + "And if your GPU provides hardware-accelerated Xrender support (mainly nVidia cards):

" "Option \"RenderAccel\" \"true\"
" "In Section \"Device\""), this); lay->addWidget(label); diff --git a/workspace.cpp b/workspace.cpp index 308765cd98..4f818ee3a1 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -2324,7 +2324,7 @@ void Workspace::startKompmgr() { { options->useTranslucency = FALSE; - KMessageBox::information(desktop_widget, i18n("The Composite Manager could not be started.
Make sure you've got \"kompmgr\" in a $PATH directory"),0, "UseTranslucency"); + KMessageBox::information(desktop_widget, i18n("The Composite Manager could not be started.
Make sure you have \"kompmgr\" in a $PATH directory."),0, "UseTranslucency"); } } else @@ -2356,7 +2356,7 @@ void Workspace::restartKompmgr() if (!allowKompmgrRestart) // uh-ohh { options->useTranslucency = FALSE; - KMessageBox::information(desktop_widget, i18n("The Composite Manager crashed twice within a minute and is therefore disabled for this session"), i18n("Composite Manager Failure")); + KMessageBox::information(desktop_widget, i18n("The Composite Manager crashed twice within a minute and is therefore disabled for this session."), i18n("Composite Manager Failure")); return; } if (!kompmgr) @@ -2372,7 +2372,7 @@ void Workspace::restartKompmgr() if (!kompmgr->start(KProcess::NotifyOnExit, KProcess::Stderr)) { options->useTranslucency = FALSE; - KMessageBox::information(desktop_widget, i18n("The Composite Manager could not be started.
Make sure you've got \"kompmgr\" in a $PATH directory")); + KMessageBox::information(desktop_widget, i18n("The Composite Manager could not be started.
Make sure you have \"kompmgr\" in a $PATH directory.")); } else { @@ -2385,18 +2385,18 @@ void Workspace::handleKompmgrOutput( KProcess *proc, char *buffer, int buflen) { if (QString(buffer).contains("Started",false)); // don't do anything, just pass to the connection release else if (QString(buffer).contains("Can't open display",false)) - KMessageBox::sorry(desktop_widget, i18n("kompmgr failed to open the display
There's probably an invalid display entry in your ~/.xcompmgrrc")); + KMessageBox::sorry(desktop_widget, i18n("kompmgr failed to open the display
There is probably an invalid display entry in your ~/.xcompmgrrc.")); else if (QString(buffer).contains("No render extension",false)) - KMessageBox::sorry(desktop_widget, i18n("kompmgr misses the Xrender extension
You're either using an outdated or a crippled version of XOrg.
Get XOrg ≥ 6.8 from www.freedesktop.org
")); + KMessageBox::sorry(desktop_widget, i18n("kompmgr cannot find the Xrender extension
You are using either an outdated or a crippled version of XOrg.
Get XOrg ≥ 6.8 from www.freedesktop.org.
")); else if (QString(buffer).contains("No composite extension",false)) - KMessageBox::sorry(desktop_widget, i18n("Composite extension not found
You must use XOrg ≥ 6.8 to have translucency/shadows work
Additionally you need to add a new section to your X config file:
" + KMessageBox::sorry(desktop_widget, i18n("Composite extension not found
You must use XOrg ≥ 6.8 for translucency and shadows to work.
Additionally, you need to add a new section to your X config file:
" "Section \"Extensions\"
" "Option \"Composite\" \"Enable\"
" "EndSection")); else if (QString(buffer).contains("No damage extension",false)) - KMessageBox::sorry(desktop_widget, i18n("Damage extension not found
You must use XOrg ≥ 6.8 to have translucency/shadows work")); + KMessageBox::sorry(desktop_widget, i18n("Damage extension not found
You must use XOrg ≥ 6.8 for translucency and shadows to work.")); else if (QString(buffer).contains("No XFixes extension",false)) - KMessageBox::sorry(desktop_widget, i18n("XFixes extension not found
You must use XOrg ≥ 6.8 to have translucency/shadows work")); + KMessageBox::sorry(desktop_widget, i18n("XFixes extension not found
You must use XOrg ≥ 6.8 for translucency and shadows to work.")); else return; //skip others // kompmgr startup failed or succeeded, release connection kompmgr->closeStderr();