--- a/videoplayback/hbvideoplaybackview/viewsrc/hbvideobaseplaybackview.cpp	Thu Apr 01 23:32:44 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/viewsrc/hbvideobaseplaybackview.cpp	Fri Apr 16 18:13:14 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: da1mmcf#32 %
+// Version : %version: da1mmcf#34 %
 
 
 
@@ -122,7 +122,7 @@
     
     menu()->close();
 
-    hideItems( Hb::AllItems );
+    hideItems( Hb::ToolBarItem );
 
     //
     // Landscape orientation
@@ -159,7 +159,7 @@
     //
     //hbInstance->allMainWindows()[0]->unsetOrientation();
 
-    showItems( Hb::AllItems );
+    showItems( Hb::ToolBarItem );
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -171,7 +171,7 @@
     MPX_DEBUG(
       _L("HbVideoBasePlaybackView::handleClosePlaybackView()") );
 
-    if ( mVideoMpxWrapper->IsMultiItemPlaylist() )
+    if ( mVideoMpxWrapper && mVideoMpxWrapper->IsMultiItemPlaylist() )
     {
         TRAP_IGNORE( mVideoMpxWrapper->HandleCommandL( EMPXPbvCmdNextListItem ) );
     }
@@ -201,26 +201,22 @@
         case KErrCANoRights:
         case KErrCANoPermission:
         {
-            const QString qString = "License has expired or it is missing";
-            showDialog( qString );
+            showDialog( hbTrId( "txt_videos_info_license_has_expired_or_it_is_missi" ) );
             break;
         }
         case KMPXVideoCallOngoingError:
         {
-            const QString qString = "Video playback is not allowed during video call";
-            showDialog( qString, false );
+            showDialog( hbTrId( "txt_videos_info_video_playback_is_not_allowed_duri" ), false );
             break;
         }
         case KMPXVideoTvOutPlaybackNotAllowed:
         {
-            const QString qString = "Protected clip, can not be played through TV-Out";
-            showDialog( qString, false );
+            showDialog( hbTrId( "txt_videos_info_protected_clip_can_not_be_played" ), false );
             break;
         }
         case KMPXVideoTvOutPlaybackNotAllowedClose:
         {
-            const QString qString = "Protected clip, can not be played through TV-Out";
-            showDialog( qString );
+            showDialog( hbTrId( "txt_videos_info_protected_clip_can_not_be_played" ) );
             break;
         }
         default: