Bring stop, lock, exit, and run icons into XDG compliance

diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 87b1ff1..40dcc8f 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -307,7 +307,7 @@
     new TDEAction(i18n("&Fetch Feed"), "down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
     new TDEAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
 
-    TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
+    TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
     stopAction->setEnabled(false);
 
     new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index ea1910f..c818824 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -262,7 +262,7 @@
 
   connectEnableOperationSignal( TQT_TQOBJECT(this), action );
 
-  action = new TDEAction( i18n("Stop Operation"), "stop", Key_Escape,
+  action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape,
 			TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()),
 			actionCollection(), "view_stop_operations" );
   action->setEnabled( false );
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index b46202b..5083750 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -139,7 +139,7 @@
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new TDEAction( i18n("S&top"),
-      TQString::fromLatin1("stop"), 0,
+      TQString::fromLatin1("process-stop"), 0,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index c9c2ef6..cbd122c 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -277,7 +277,7 @@
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new TDEAction( i18n("S&top"),
-      TQString::fromLatin1("stop"), Key_S,
+      TQString::fromLatin1("process-stop"), Key_S,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 0179383..eeb8d79 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -70,7 +70,7 @@
 
   mStatusCombo = new TQComboBox( parent, "quick search status combo box" );
   mStatusCombo->setSizeLimit( 12 );
-  mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
+  mStatusCombo->insertItem( SmallIcon( "system-run" ), i18n("Any Status") );
 
   inserStatus( StatusUnread );
   inserStatus( StatusNew );
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index dc5cd04..f3ff58a 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -133,7 +133,7 @@
     action->plug( mPopupMenu );
   mPopupMenu->insertSeparator();
 
-  mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
+  mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
 }
 
 void KMSystemTray::tray_quit()
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 2756f62..ac8d9fc 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -307,7 +307,7 @@
   rot13->setEnabled(false);
   connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool)));
 
-  a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "run", 0, TQT_TQOBJECT(this),
+  a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, TQT_TQOBJECT(this),
                        TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor");
 
   a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection());
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 459b01c..b9e3b06 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -731,7 +731,7 @@
                               TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit");
 
   //network
-  a_ctNetCancel             = new TDEAction(i18n("Stop &Network"),"stop",0, TQT_TQOBJECT(this),
+  a_ctNetCancel             = new TDEAction(i18n("Stop &Network"),"process-stop",0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop");
   a_ctNetCancel->setEnabled(false);
 
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 62c8efc..dd2d7e8 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -108,7 +108,7 @@
         TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" );
     new TDEAction( i18n("Rename..."), "text", 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" );
-    m_readOnly = new TDEToggleAction( i18n("Lock"), "lock" , 0,
+    m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" );
     m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) );
     new TDEAction( i18n("Hide"), "fileclose" , Key_Escape,

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim

diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c