Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance

diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 98dff74..6c8ef1a 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -160,19 +160,19 @@
     // *************** Search menu *********************
     
     toggle_action = new TDEToggleAction(i18n("&Start Search"),
-                                      "player_play", "Ctrl+s",
+                                      "media-playback-start", "Ctrl+s",
                                       TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStartSearch()),
                                       TQT_TQOBJECT(d->actionCollection), "start_search");
     toggle_action->setEnabled(false);
     
     toggle_action = new TDEToggleAction(i18n("&Pause Search"),
-                                      "player_pause", "Ctrl+p",
+                                      "media-playback-pause", "Ctrl+p",
                                       TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotPauseSearch()),
                                       TQT_TQOBJECT(d->actionCollection), "pause_search");    
     toggle_action->setEnabled(false);
     
     action = new TDEAction(i18n("St&op Search"),
-                                  "player_stop", "Ctrl+c",
+                                  "media-playback-stop", "Ctrl+c",
                                   TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStopSearch()),
                                   TQT_TQOBJECT(d->actionCollection), "stop_search");
     action->setEnabled(false);
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 966b149..2104007 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -82,7 +82,7 @@
 /** setup of the actions */
 void ProjectPrivate::initActions(TDEActionCollection *ac)
 {
-  (void) new TDEAction( i18n( "&New Project..." ), "window_new", 0,
+  (void) new TDEAction( i18n( "&New Project..." ), "window-new", 0,
                         this, TQT_SLOT( slotNewProject() ),
                         ac, "project_new" );
 
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 6d65d9b..804a4ec 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -809,7 +809,7 @@
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ),
                         TQT_TQOBJECT(ac), "load_dtep" );
 
-    (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail_send", 0,
+    (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail-send", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ),
                         TQT_TQOBJECT(ac), "send_dtep" );
 
@@ -903,7 +903,7 @@
     new TDEAction(i18n("&New User Toolbar..."),  0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add");
     new TDEAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove");
     new TDEAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename");
-    new TDEAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send");
+    new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send");
     new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" );
     new TDEAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" );
 
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 6a4e02a..5fd761f 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -92,7 +92,7 @@
   m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQT_SLOT(slotEditDescription()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQT_SLOT(slotAssignAction()));
-  m_fileMenu->insertItem(SmallIcon("mail_send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail()));
+  m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail()));
   m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript()));
 
   m_folderMenu = new TDEPopupMenu(this);
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 700dfcf..b50665b 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -145,7 +145,7 @@
 
   m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert()));
   m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
-  m_fileMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
+  m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
   m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate()));
   m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject()));
   m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
@@ -158,7 +158,7 @@
   m_folderMenu = new TDEPopupMenu(this);
 
   m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir()));
-  m_folderMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
+  m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
   m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate()));
   m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate()));
   m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));

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

diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090