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/bnpview.cpp b/src/bnpview.cpp
index a00c065..db6fc54 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -459,7 +459,7 @@
 										 TQT_TQOBJECT(this), TQT_SLOT(editNote()), actionCollection(), "note_edit" );
 
 	m_actOpenNote         = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(openNote()), actionCollection(), "note_open" );
-	m_actOpenNote->setIcon("window_new");
+	m_actOpenNote->setIcon("window-new");
 	m_actOpenNote->setText(i18n("&Open"));
 	m_actOpenNote->setShortcut("F9");
 
diff --git a/src/likeback.cpp b/src/likeback.cpp
index abfdc87..ee2581d 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, TQT_SLOT(execCommentDialog()),
 			parent, "likeback_send_a_comment"
 		);
@@ -720,7 +720,7 @@
 	pageLayout->addWidget(m_showButtons);
 	connect( m_showButtons, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changeButtonBarVisible()) );
 
-	setButtonOK(KGuiItem(i18n("&Send Comment"), "mail_send"));
+	setButtonOK(KGuiItem(i18n("&Send Comment"), "mail-send"));
 	enableButtonOK(false);
 	connect( m_comment, TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) );
 

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

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