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/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 44840af..ef38685 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -368,10 +368,10 @@
     action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
                           TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
     action->setEnabled(false);
-    action = new TDEAction( i18n("Mai&l"), "mail_send", CTRL+Key_A,
+    action = new TDEAction( i18n("Mai&l"), "mail-send", CTRL+Key_A,
                           TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
     action->setEnabled(false);
-    action = new TDEAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A,
+    action = new TDEAction( i18n("Mail Mar&ked"), "mail-send", CTRL+ALT+Key_A,
                           TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(),	"mail_file_marked");
     action->setEnabled(false);
 
diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp
index 625a1f8..e3bd6f3 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.cpp
+++ b/kbugbuster/gui/cwbugdetailscontainer.cpp
@@ -46,8 +46,8 @@
     m_bugReassignBtn->setIconSet( BarIconSet( "folder-new" ) );
     m_bugTitleBtn->setIconSet( SmallIconSet( "text_under" ) );
     m_bugSeverityBtn->setIconSet( SmallIconSet( "edit" ) );
-    m_bugReplyBtn->setIconSet( SmallIconSet( "mail_replyall" ) );
-    m_bugReplyPrivBtn->setIconSet( SmallIconSet( "mail_reply" ) );
+    m_bugReplyBtn->setIconSet( SmallIconSet( "mail-reply-all" ) );
+    m_bugReplyPrivBtn->setIconSet( SmallIconSet( "mail-reply-sender" ) );
 
     // The Bugzilla mail interface doesn't support all commands yet.
     m_bugCloseSilentlyBtn->hide();
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 9a34f6c..5d7203c 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -150,7 +150,7 @@
 
     new TDEAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ),
                  actionCollection(), "file_seechanges" );
-    new TDEAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
+    new TDEAction( i18n("&Submit Changes"), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
                  actionCollection(), "file_submit" );
 
     reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ),
@@ -193,9 +193,9 @@
 //                 TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" );
 //    new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget),
 //                 TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" );
-    new TDEAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget),
+    new TDEAction( i18n("&Reply..."), "mail-reply-all",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget),
                  TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" );
-    new TDEAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget),
+    new TDEAction( i18n("Reply &Privately..."), "mail-reply-sender", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget),
                  TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" );
 
     KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() );
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 3f0d5a7..12caf6b 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -286,7 +286,7 @@
     zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9,
                  TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)),
                  actionCollection(), "popup_zoom");
-    zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "viewmag1", 0,
+    zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "zoom-original", 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(),
                                 "zoom100");
 

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

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