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/src/crashhandler.cpp b/src/crashhandler.cpp
index 98b3bd6..db161b1 100644
--- a/src/crashhandler.cpp
+++ b/src/crashhandler.cpp
@@ -279,7 +279,7 @@
     layout = new TQHBoxLayout( layout, 6 );
 
     layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
-    layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
+    layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail-send" ), this, "email" ) );
     layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
 
     static_cast<TQPushButton*>(child("email"))->setDefault( true );
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 4ffb58e..4517ec5 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -378,7 +378,7 @@
 {
 	if (d->action == 0)
 		d->action = new TDEAction(
-			i18n("&Send a Comment to Developers"), /*icon=*/"mail_new", /*shortcut=*/"",
+			i18n("&Send a Comment to Developers"), /*icon=*/"mail-message-new", /*shortcut=*/"",
 			this, SLOT(execCommentDialog()),
 			parent, "likeback_send_a_comment"
 		);
@@ -720,7 +720,7 @@
 	pageLayout->addWidget(m_showButtons);
 	connect( m_showButtons, SIGNAL(stateChanged(int)), this, SLOT(changeButtonBarVisible()) );
 
-	setButtonOK(KGuiItem(i18n("&Send Comment"), "mail_send"));
+	setButtonOK(KGuiItem(i18n("&Send Comment"), "mail-send"));
 	enableButtonOK(false);
 	connect( m_comment, SIGNAL(textChanged()), this, SLOT(commentChanged()) );
 

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

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