--- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectionpopuphandler.cpp	Fri Sep 17 08:28:52 2010 +0300
+++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectionpopuphandler.cpp	Mon Oct 04 00:14:19 2010 +0300
@@ -308,7 +308,7 @@
     mPermanentData->mOriginalName = currentName;
     getText( hbTrId( "txt_mus_dialog_enter_name" ), 
              currentName,
-             hbTrId( "txt_common_button_ok" ), //TODO:replace for "rename" when string is available
+             hbTrId( "txt_mus_button_rename" ),
              SLOT( handleRenamePlaylistContainer( HbAction* ) ) );
     TX_EXIT
 }
@@ -322,7 +322,7 @@
     mPermanentData->mOriginalName = currentName;
     getText( hbTrId( "txt_mus_dialog_enter_name" ), 
              currentName,
-             hbTrId( "txt_common_button_ok" ),//TODO:replace for "rename" when string is available
+             hbTrId( "txt_mus_button_rename" ),
              SLOT( handleRenamePlaylistItem( HbAction* ) ) );
     TX_EXIT
 }
@@ -333,7 +333,7 @@
 void MpCollectionPopupHandler::openAddSongsToPlaylist( QAbstractItemModel* model )
 {
     TX_ENTRY
-    getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
+    getModelIndexes( hbTrId( "txt_mus_title_add_songs" ),
                      hbTrId( "txt_common_button_add_dialog" ),
                      model,
                      SLOT( handleAddSongsToPlayList( HbAction* ) ) );
@@ -351,7 +351,7 @@
     //this item will be deleted when clearing permanent data.
     model->setParent(mPermanentData);
     model->refreshModel();
-    getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
+    getModelIndexes( hbTrId( "txt_mus_title_add_songs" ),
                      hbTrId( "txt_common_button_add_dialog" ),
                      model,
                      SLOT( handleAddSongsToPlayList( HbAction* ) ) );
@@ -387,7 +387,7 @@
     collectionDataModel->refreshModel();
     mPermanentData->mAbstractItemModel = collectionDataModel;
 
-    getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
+    getModelIndexes( hbTrId( "txt_mus_title_add_songs" ),
                      hbTrId( "txt_common_button_add_dialog" ),
                      collectionDataModel,
                      SLOT( handleAddToCurrentPlaylist( HbAction* ) ) );
@@ -750,7 +750,7 @@
         QString newPlaylistName = dialog->value().toString();
         //Store the new playlist name and query for the items to be added
         mPermanentData->mOriginalName = newPlaylistName;
-        getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
+        getModelIndexes( hbTrId( "txt_mus_title_add_songs" ),
                          hbTrId( "txt_common_button_add_dialog" ),
                          mPermanentData->mAbstractItemModel, 
                          SLOT( handleCreateNewPlaylistGetModelIndexesFinished( HbAction* ) ) );