yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

'composit[e|ing]' is technical jargon; use the terminology we use elsewhere in the UI (particularly the config UI) consistently everywhere. tested on real life users(tm)

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1103845
This commit is contained in:
Aaron J. Seigo 2010-03-16 01:17:36 +00:00
parent 8d2178ad5d
commit c83c168c16
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
composite.cpp
View file

@ -328,7 +328,7 @@ void Workspace::toggleCompositing()
if( !shortcut.isEmpty() && options->useCompositing )
{
// display notification only if there is the shortcut
message = i18n( "Compositing has been suspended by another application.<br/>"
message = i18n( "Desktop effects have been suspended by another application.<br/>"
"You can resume using the '%1' shortcut.", shortcut );
Notify::raise( Notify::CompositingSuspendedDbus, message );
}
@ -582,12 +582,12 @@ void Workspace::checkCompositePaintTime( int msec )
if( KAction* action = qobject_cast<KAction*>( keys->action("Suspend Compositing")))
shortcut = action->globalShortcut().primary().toString(QKeySequence::NativeText);
if (shortcut.isEmpty())
message = i18n( "Compositing was too slow and has been suspended.\n"
"You can disable functionality checks in advanced compositing settings." );
message = i18n( "Desktop effects were too slow and have been suspended.\n"
"You can disable functionality checks in System Settings (on the Advanced tab in Desktop Effects)." );
else
message = i18n( "Compositing was too slow and has been suspended.\n"
message = i18n( "Desktop effects were too slow and have been suspended.\n"
"If this was only a temporary problem, you can resume using the '%1' shortcut.\n"
"You can also disable functionality checks in advanced compositing settings.", shortcut );
"You can disable functionality checks in System Settings (on the Advanced tab in Desktop Effects).", shortcut );
Notify::raise( Notify::CompositingSlow, message );
compositeTimer.start( 1000 ); // so that it doesn't trigger sooner than suspendCompositing()
}

16
kcmkwin/kwincompositing/main.cpp
View file

@ -159,7 +159,7 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList
ui.useCompositing->setChecked(false);
compositingEnabled(false);
QString text = i18n("Compositing is not supported on your system.");
QString text = i18n("Desktop effects are not available on this system due to the following technical issues:");
text += "<br>";
text += CompositingPrefs::compositingNotPossibleReason();
ui.statusTitleWidget->setText(text);
@ -388,22 +388,22 @@ void KWinCompositingConfig::setupCompositingState( bool active, bool enabled )
if( active )
{
stateIcon = QString( "dialog-ok-apply" );
stateText = i18n( "Compositing is active" );
stateButtonText = i18n( "Suspend Compositing" );
stateText = i18n( "Desktop effects are active" );
stateButtonText = i18n( "Suspend Desktop Effects" );
}
else
{
stateIcon = QString( "dialog-cancel" );
stateText = i18n( "Compositing is temporarily disabled" );
stateButtonText = i18n( "Resume Compositing" );
stateText = i18n( "Desktop effects are temporarily disabled" );
stateButtonText = i18n( "Resume Desktop Effects" );
}
}
else
{
// compositing is disabled
stateIcon = QString( "dialog-cancel" );
stateText = i18n( "Compositing is disabled" );
stateButtonText = i18n( "Resume Compositing" );
stateText = i18n( "Desktop effects are disabled" );
stateButtonText = i18n( "Resume Desktop Effects" );
}
const int iconSize = (QApplication::fontMetrics().height() > 24) ? 32 : 22;
ui.compositingStateIcon->setPixmap( KIcon( stateIcon ).pixmap( iconSize, iconSize ) );
@ -699,7 +699,7 @@ void KWinCompositingConfig::checkLoadedEffects()
{
KServiceTypeTrader* trader = KServiceTypeTrader::self();
KService::List services;
QString message = i18n( "The following effects could not be activated:" );
QString message = i18n( "The following desktop effects could not be activated:" );
message.append( "<ul>" );
foreach( const QString &effect, disabledEffects )
{