diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 7eb7eb9a7..dcca67eca 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -1,351 +1,351 @@
 /*
  *
  * Copyright (C) 2003-2009 Sebastian Trueg <trueg@k3b.org>
  *
  * This file is part of the K3b project.
  * Copyright (C) 1998-2009 Sebastian Trueg <trueg@k3b.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * See the file "COPYING" for the exact licensing terms.
  */
 
 #include <config-k3b.h>
 
 #include "k3bcore.h"
 #include "k3bjob.h"
 #include "k3bmediacache.h"
 
 #include "k3bdevicemanager.h"
 #include "k3bexternalbinmanager.h"
 #include "k3bdefaultexternalprograms.h"
 #include "k3bglobals.h"
 #include "k3bversion.h"
 #include "k3bjob.h"
 #include "k3bthreadwidget.h"
 #include "k3bglobalsettings.h"
 #include "k3bpluginmanager.h"
 #include "k3b_i18n.h"
 
 #include <KConfigCore/KConfig>
 #include <KConfigCore/KConfigGroup>
 #ifdef WITH_NEW_SOLID_JOB
 #include <Solid/Power>
 #endif
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QEvent>
 #include <QtCore/QMutex>
 #include <QtCore/QMutexLocker>
 #include <QtCore/QThread>
 
 
 static QThread* s_guiThreadHandle = 0;
 
 // We cannot use QWaitCondition here since the event might be handled faster
 // than the thread starts the waiting
 class DeviceBlockingEventDoneCondition {
 public:
     DeviceBlockingEventDoneCondition()
         : m_done(false) {
     }
 
     void done() {
         QMutexLocker locker( &m_doneMutex );
         m_done = true;
     }
 
     void wait() {
         while( true ) {
             QMutexLocker locker( &m_doneMutex );
             bool done = m_done;
             if( done )
                 return;
         }
     }
 
 private:
     QMutex m_doneMutex;
     bool m_done;
 };
 
 
 class DeviceBlockingEvent : public QEvent
 {
 public:
     DeviceBlockingEvent( bool block_, K3b::Device::Device* dev, DeviceBlockingEventDoneCondition* cond_, bool* success_ )
         : QEvent( QEvent::User ),
           block(block_),
           device(dev),
           cond(cond_),
           success(success_) {
     }
 
     bool block;
     K3b::Device::Device* device;
     DeviceBlockingEventDoneCondition* cond;
     bool* success;
 };
 
 
 class K3b::Core::Private {
 public:
     Private()
         : version( LIBK3B_VERSION ),
           mediaCache(0),
           deviceManager(0),
           externalBinManager(0),
           pluginManager(0),
           globalSettings(0) {
     }
 
     K3b::Version version;
     K3b::MediaCache* mediaCache;
     K3b::Device::DeviceManager* deviceManager;
     K3b::ExternalBinManager* externalBinManager;
     K3b::PluginManager* pluginManager;
     K3b::GlobalSettings* globalSettings;
 
     QList<K3b::Job*> runningJobs;
     QList<K3b::Device::Device*> blockedDevices;
 
 #ifdef WITH_NEW_SOLID_JOB
     Solid::InhibitionJob *inhibitSleepJob = nullptr;
     Solid::InhibitionJob *inhibitNoneJob = nullptr;
 #endif
 };
 
 
 
 K3b::Core* K3b::Core::s_k3bCore = 0;
 
 
 
 K3b::Core::Core( QObject* parent )
     : QObject( parent )
 {
     d = new Private();
 
     if( s_k3bCore )
         qFatal("ONLY ONE INSTANCE OF K3BCORE ALLOWED!");
     s_k3bCore = this;
 
     // ew are probably constructed in the GUi thread :(
     s_guiThreadHandle = QThread::currentThread();
 
     // create the thread widget instance in the GUI thread
     K3b::ThreadWidget::instance();
 }
 
 
 K3b::Core::~Core()
 {
     s_k3bCore = 0;
 
     delete d->globalSettings;
     delete d;
 }
 
 
 K3b::MediaCache* K3b::Core::mediaCache() const
 {
     if ( !d->mediaCache ) {
         // create the media cache but do not connect it to the device manager
         // yet to speed up application start. We connect it in init()
         // once the devicemanager has scanned for devices.
         d->mediaCache = new K3b::MediaCache( const_cast<Core*>( this ) );
     }
     return d->mediaCache;
 }
 
 
 K3b::Device::DeviceManager* K3b::Core::deviceManager() const
 {
     if( !d->deviceManager ) {
         d->deviceManager = createDeviceManager();
     }
     return d->deviceManager;
 }
 
 
 K3b::ExternalBinManager* K3b::Core::externalBinManager() const
 {
     if( !d->externalBinManager ) {
         d->externalBinManager = new ExternalBinManager( const_cast<Core*>( this ) );
         addDefaultPrograms( d->externalBinManager );
     }
     return d->externalBinManager;
 }
 
 
 K3b::PluginManager* K3b::Core::pluginManager() const
 {
     if( !d->pluginManager )
         d->pluginManager = new K3b::PluginManager( const_cast<Core*>( this ) );
     return d->pluginManager;
 }
 
 
 K3b::GlobalSettings* K3b::Core::globalSettings() const
 {
     if( !d->globalSettings ) {
         d->globalSettings = new GlobalSettings();
     }
     return d->globalSettings;
 }
 
 
 K3b::Version K3b::Core::version() const
 {
     return d->version;
 }
 
 
 void K3b::Core::init()
 {
     // load the plugins before doing anything else
     // they might add external bins
     pluginManager()->loadAll();
 
     externalBinManager()->search();
 
     deviceManager()->scanBus();
 
     mediaCache()->buildDeviceList( deviceManager() );
 }
 
 
 K3b::Device::DeviceManager* K3b::Core::createDeviceManager() const
 {
     return new K3b::Device::DeviceManager( const_cast<Core*>( this ) );
 }
 
 
 void K3b::Core::readSettings( KSharedConfig::Ptr c )
 {
     globalSettings()->readSettings( c->group( "General Options" ) );
     deviceManager()->readConfig( c->group( "Devices" ) );
     externalBinManager()->readConfig( c->group( "External Programs" ) );
 }
 
 
 void K3b::Core::saveSettings( KSharedConfig::Ptr c )
 {
     KConfigGroup grp( c, "General Options" );
     grp.writeEntry( "config version", version().toString() );
 
     deviceManager()->saveConfig( c->group( "Devices" ) );
     externalBinManager()->saveConfig( c->group( "External Programs" ) );
     d->globalSettings->saveSettings( c->group( "General Options" ) );
 }
 
 
 void K3b::Core::registerJob(K3b::Job* job)
 {
     d->runningJobs.append(job);
     emit jobStarted(job);
     if (K3b::BurnJob* bj = dynamic_cast<K3b::BurnJob*>(job)) {
 #ifdef WITH_NEW_SOLID_JOB
         d->inhibitSleepJob = Solid::Power::inhibit(Solid::Power::Sleep,
                 i18n("Inhibiting sleep for disc writing"));
         if (d->inhibitSleepJob)
             d->inhibitSleepJob->start();
 #endif
         emit burnJobStarted(bj);
     }
 }
 
 
 void K3b::Core::unregisterJob(K3b::Job* job)
 {
     d->runningJobs.removeAll(job);
     emit jobFinished(job);
     if (K3b::BurnJob* bj = dynamic_cast<K3b::BurnJob*>(job)) {
 #ifdef WITH_NEW_SOLID_JOB
         d->inhibitNoneJob = Solid::Power::inhibit(Solid::None,
-                i18n("Inhibiting none for disc writing"));
+                i18n("Disable inhibition for disc writing"));
         if (d->inhibitNoneJob)
             d->inhibitNoneJob->start();
 #endif
         emit burnJobFinished(bj);
     }
 }
 
 
 bool K3b::Core::jobsRunning() const
 {
     return !d->runningJobs.isEmpty();
 }
 
 
 QList<K3b::Job*> K3b::Core::runningJobs() const
 {
     return d->runningJobs;
 }
 
 
 bool K3b::Core::blockDevice( K3b::Device::Device* dev )
 {
     if( QThread::currentThread() == s_guiThreadHandle ) {
         return internalBlockDevice( dev );
     }
     else {
         bool success = false;
         DeviceBlockingEventDoneCondition w;
         QCoreApplication::postEvent( this, new DeviceBlockingEvent( true, dev, &w, &success ) );
         w.wait();
         return success;
     }
 }
 
 
 void K3b::Core::unblockDevice( K3b::Device::Device* dev )
 {
     if( QThread::currentThread() == s_guiThreadHandle ) {
         internalUnblockDevice( dev );
     }
     else {
         DeviceBlockingEventDoneCondition w;
         QCoreApplication::postEvent( this, new DeviceBlockingEvent( false, dev, &w, 0 ) );
         w.wait();
     }
 }
 
 
 bool K3b::Core::internalBlockDevice( K3b::Device::Device* dev )
 {
     if( !d->blockedDevices.contains( dev ) ) {
         d->blockedDevices.append( dev );
         return true;
     }
     else
         return false;
 }
 
 
 void K3b::Core::internalUnblockDevice( K3b::Device::Device* dev )
 {
     d->blockedDevices.removeAll( dev );
 }
 
 
 bool K3b::Core::deviceBlocked( Device::Device* dev ) const
 {
     return d->blockedDevices.contains( dev );
 }
 
 
 void K3b::Core::customEvent( QEvent* e )
 {
     if( DeviceBlockingEvent* de = dynamic_cast<DeviceBlockingEvent*>(e) ) {
         if( de->block )
             *de->success = internalBlockDevice( de->device );
         else
             internalUnblockDevice( de->device );
         de->cond->done();
     }
 }