[estuary] sync

7 files changed, 242 insertions, 188 deletions

diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po
index 8b7518af03..5daa30ef80 100644
--- a/addons/skin.estuary/language/resource.language.en_gb/strings.po
+++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po
@@ -16,692 +16,697 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: /1080i/Home.xml /1080i/DialogFullScreenInfo.xml
+#: /xml/Home.xml /xml/DialogFullScreenInfo.xml
 msgctxt "#31000"
 msgid "Now playing"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31001"
 msgid "Search..."
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31002"
 msgid "Show media fanart as background"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31003"
 msgid "Cinema mode"
 msgstr ""
 
-#: /1080i/VideoOSD.xml
+#: /xml/VideoOSD.xml
 msgctxt "#31004"
 msgid "Change mode"
 msgstr ""
 
-#: /1080i/VideoOSD.xml
+#: /xml/VideoOSD.xml
 msgctxt "#31005"
 msgid "Watch as 2D"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31006"
 msgid "Random movies"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31007"
 msgid "Unwatched movies"
 msgstr ""
 
 #empty string with id 31008
 
-#: /1080i/MyVideoNav.xml
+#: /xml/MyVideoNav.xml
 msgctxt "#31009"
 msgid "Download icons"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31010"
 msgid "In progress movies"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31011"
 msgid "Most played albums"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31012"
 msgid "Random albums"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31013"
 msgid "Random artists"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31014"
 msgid "Unplayed albums"
 msgstr ""
 
 #. home screen recordings widget: recent tv / radio recordings
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31015"
 msgid "Recent recordings"
 msgstr ""
 
 #. home screen channel widget: recently played tv channels. (please note that in some non-english languages #31018 and #31016 might not be equal)
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31016"
 msgid "Recently played channels"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31017"
 msgid "Rated"
 msgstr ""
 
 #. home screen channel widget: recently played radio channels. (please note that in some non-english languages #31018 and #31016 might not be equal)
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31018"
 msgid "Recently played channels"
 msgstr ""
 
-#: /1080i/Home.xml /1080i/MyWeather.xml
+#: /xml/Home.xml /xml/MyWeather.xml
 msgctxt "#31019"
 msgid "Forecast"
 msgstr ""
 
-#: /1080i/MyMusicNav.xml /1080i/MyPics.xml /1080i/MyVideoNav.xml
+#: /xml/MyMusicNav.xml /xml/MyPics.xml /xml/MyVideoNav.xml
 msgctxt "#31020"
 msgid "Actions"
 msgstr ""
 
-#: /1080i/AddonBrowser.xml /1080i/DialogPVRChannelManager.xml /1080i/Includes_MediaMenu.xml /1080i/EventLog.xml
+#: /xml/AddonBrowser.xml /xml/DialogPVRChannelManager.xml /xml/Includes_MediaMenu.xml /xml/EventLog.xml
 msgctxt "#31021"
 msgid "Misc options"
 msgstr ""
 
-#: /1080i/Includes_MediaMenu.xml /1080i/Includes.xml
+#: /xml/Includes_MediaMenu.xml /xml/Includes.xml
 msgctxt "#31022"
 msgid "Sort by"
 msgstr ""
 
-#: /1080i/Includes_MediaMenu.xml
+#: /xml/Includes_MediaMenu.xml
 msgctxt "#31023"
 msgid "Viewtype"
 msgstr ""
 
 #empty string with id 31024
 
-#: /1080i/DialogFavourites.xml
+#: /xml/DialogFavourites.xml
 msgctxt "#31025"
 msgid "No favourites found. You can add any item from media views to this list by using the context menu."
 msgstr ""
 
-#empty strings from id 31026 to 31027
+#: /xml/DialogSeekBar.xml
+msgctxt "#31026"
+msgid "Timeshift"
+msgstr ""
+
+#empty string with id 31027
 
-#: /1080i/DialogAlbumInfo.xml /1080i/DialogVideoInfo.xml
+#: /xml/DialogAlbumInfo.xml /xml/DialogVideoInfo.xml
 msgctxt "#31028"
 msgid "Show fanart"
 msgstr ""
 
-#: /1080i/SettingsProfile.xml
+#: /xml/SettingsProfile.xml
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr ""
 
-#: /1080i/SettingsSystemInfo.xml
+#: /xml/SettingsSystemInfo.xml
 msgctxt "#31030"
 msgid "System memory usage"
 msgstr ""
 
-#: /1080i/SettingsSystemInfo.xml
+#: /xml/SettingsSystemInfo.xml
 msgctxt "#31031"
 msgid "Version info"
 msgstr ""
 
-#: /1080i/EventLog.xml /1080i/Includes_MediaMenu.xml /1080i/SmartPlaylistEditor.xml
+#: /xml/EventLog.xml /xml/Includes_MediaMenu.xml /xml/SmartPlaylistEditor.xml
 msgctxt "#31032"
 msgid "Order"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml /1080i/DialogSongInfo.xml
+#: /xml/DialogVideoInfo.xml /xml/DialogSongInfo.xml
 msgctxt "#31033"
 msgid "Your rating"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31034"
 msgid "Extended info"
 msgstr ""
 
-#: /1080i/DialogPVRChannelManager.xml /1080i/DialogPVRChannelsOSD.xml /1080i/DialogPVRGuideOSD.xml /1080i/Variables.xml /1080i/FileBrowser.xml
+#: /xml/DialogPVRChannelManager.xml /xml/DialogPVRChannelsOSD.xml /xml/DialogPVRGuideOSD.xml /xml/Variables.xml /xml/FileBrowser.xml
 msgctxt "#31035"
 msgid "Pages"
 msgstr ""
 
-#: /1080i/FileBrowser.xml /1080i/Variables.xml /1080i/MyPVRRecordings.xml
+#: /xml/FileBrowser.xml /xml/Variables.xml /xml/MyPVRRecordings.xml
 msgctxt "#31036"
 msgid "items"
 msgstr ""
 
 #empty string with id 31037
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31038"
 msgid "Rewind"
 msgstr ""
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31039"
 msgid "Fast forward"
 msgstr ""
 
 #empty string with id 31040
 
-#: /1080i/Variables.xml /1080i/MyPics.xml
+#: /xml/Variables.xml /xml/MyPics.xml
 msgctxt "#31041"
 msgid "Camera manufacturer"
 msgstr ""
 
-#: /1080i/SmartPlaylistEditor.xml
+#: /xml/SmartPlaylistEditor.xml
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr ""
 
-#: /1080i/SmartPlaylistEditor.xml
+#: /xml/SmartPlaylistEditor.xml
 msgctxt "#31043"
 msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
 msgstr ""
 
-#: /1080i/DialogPVRGroupManager.xml
+#: /xml/DialogPVRGroupManager.xml
 msgctxt "#31044"
 msgid "Add group"
 msgstr ""
 
-#: /1080i/DialogPVRGroupManager.xml
+#: /xml/DialogPVRGroupManager.xml
 msgctxt "#31045"
 msgid "Rename group"
 msgstr ""
 
-#: /1080i/DialogPVRGroupManager.xml
+#: /xml/DialogPVRGroupManager.xml
 msgctxt "#31046"
 msgid "Delete group"
 msgstr ""
 
 #empty string with id 31047
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31048"
 msgid "Available"
 msgstr ""
 
 #empty string with id 31049
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31050"
 msgid "Press [B]OK[/B] to stop"
 msgstr ""
 
-#: /1080i/VideoOSD.xml
+#: /xml/VideoOSD.xml
 msgctxt "#31051"
 msgid "Toggle language"
 msgstr ""
 
-#: /1080i/Includes.xml
+#: /xml/Includes.xml
 msgctxt "#31052"
 msgid "filtered"
 msgstr ""
 
-#: /1080i/Font.xml
+#: /xml/Font.xml
 msgctxt "#31053"
 msgid "Arial based"
 msgstr ""
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31054"
 msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
 msgstr ""
 
 #empty string with id 31055
 
-#: /1080i/MyMusicNav.xml /1080i/MyVideoNav.xml
+#: /xml/MyMusicNav.xml /xml/MyVideoNav.xml
 msgctxt "#31056"
 msgid "Go to playlist"
 msgstr ""
 
-#: /1080i/SettingsProfile.xml
+#: /xml/SettingsProfile.xml
 msgctxt "#31057"
 msgid "Show login screen on startup"
 msgstr ""
 
-#: /1080i/SettingsProfile.xml
+#: /xml/SettingsProfile.xml
 msgctxt "#31058"
 msgid "Automatic Login on startup"
 msgstr ""
 
 #empty strings from id 31059 to 31060
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31061"
 msgid "Main menu items"
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31062"
 msgid "Choose weather fanart pack"
 msgstr ""
 
-#: /1080i/Includes_MediaMenu.xml
+#: /xml/Includes_MediaMenu.xml
 msgctxt "#31063"
 msgid "Sections"
 msgstr ""
 
 #empty string with id 31064
 
-#: /1080i/MyVideoPlaylist.xml
+#: /xml/MyVideoPlaylist.xml
 msgctxt "#31065"
 msgid "Video playlist"
 msgstr ""
 
-#: /1080i/MyMusicPlaylist.xml
+#: /xml/MyMusicPlaylist.xml
 msgctxt "#31066"
 msgid "Music playlist"
 msgstr ""
 
-#: /1080i/EventLog.xml
+#: /xml/EventLog.xml
 msgctxt "#31067"
 msgid "Event log"
 msgstr ""
 
-#: /1080i/Custom_1105_MusicOSDSettings.xml
+#: /xml/Custom_1105_MusicOSDSettings.xml
 msgctxt "#31068"
 msgid "Choose presets"
 msgstr ""
 
-#: /1080i/AddonBrowser.xml
+#: /xml/AddonBrowser.xml
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr ""
 
 #empty string with id 31070
 
-#: /1080i/DialogAddonInfo.xml
+#: /xml/DialogAddonInfo.xml
 msgctxt "#31071"
 msgid "by"
 msgstr ""
 
-#: /1080i/DialogButtonMenu.xml /1080i/LoginScreen.xml
+#: /xml/DialogButtonMenu.xml /xml/LoginScreen.xml
 msgctxt "#31072"
 msgid "Power Options"
 msgstr ""
 
 #empty strings from id 31073 to 31074
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr ""
 
 #empty strings from id 31076 to 31078
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31079"
 msgid "Cast not available"
 msgstr ""
 
-#: /1080i/VideoOSD.xml
+#: /xml/VideoOSD.xml
 msgctxt "#31080"
 msgid "Ends at"
 msgstr ""
 
 #empty string with id 31081
 
-#: /1080i/Custom_1105_MusicOSDSettings.xml
+#: /xml/Custom_1105_MusicOSDSettings.xml
 msgctxt "#31082"
 msgid "Lyrics add-on"
 msgstr ""
 
-#: /1080i/Custom_1105_MusicOSDSettings.xml
+#: /xml/Custom_1105_MusicOSDSettings.xml
 msgctxt "#31083"
 msgid "Lyrics add-on settings"
 msgstr ""
 
-#: /1080i/Custom_1105_MusicOSDSettings.xml
+#: /xml/Custom_1105_MusicOSDSettings.xml
 msgctxt "#31084"
 msgid "Visualisation settings"
 msgstr ""
 
 #empty strings from id 31085 to 31088
 
-#: /1080i/DialogPVRGroupManager.xml
+#: /xml/DialogPVRGroupManager.xml
 msgctxt "#31089"
 msgid "Available groups"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31090"
 msgid "Search trailer"
 msgstr ""
 
 #empty string with id 31091
 
-#: /1080i/VideoOSD.xml /1080i/Variables.xml
+#: /xml/VideoOSD.xml /xml/Variables.xml
 msgctxt "#31092"
 msgid "Video menu"
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31093"
 msgid "Show weather info in top bar"
 msgstr ""
 
 #empty string with id 31094
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31095"
 msgid "Use slide animations"
 msgstr ""
 
-#: /1080i/DialogSubtitles.xml
+#: /xml/DialogSubtitles.xml
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr ""
 
-#: /1080i/DialogPVRChannelManager.xml
+#: /xml/DialogPVRChannelManager.xml
 msgctxt "#31097"
 msgid "Channel options"
 msgstr ""
 
-#: /1080i/LoginScreen.xml
+#: /xml/LoginScreen.xml
 msgctxt "#31098"
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr ""
 
 #. viewtype name
-#: /1080i/View_52_IconWall.xml
+#: /xml/View_52_IconWall.xml
 msgctxt "#31099"
 msgid "IconWall"
 msgstr ""
 
 #. viewtype name
-#: /1080i/View_53_Shift.xml
+#: /xml/View_53_Shift.xml
 msgctxt "#31100"
 msgid "Shift"
 msgstr ""
 
 #. viewtype name
-#: /1080i/View_54_InfoWall.xml
+#: /xml/View_54_InfoWall.xml
 msgctxt "#31101"
 msgid "InfoWall"
 msgstr ""
 
 #. viewtype name
-#: /1080i/View_500_Wall.xml
+#: /xml/View_500_Wall.xml
 msgctxt "#31102"
 msgid "Wall"
 msgstr ""
 
-#: /1080i/SmartPlaylistRule.xml
+#: /xml/SmartPlaylistRule.xml
 msgctxt "#31103"
 msgid "Enter text here..."
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31104"
 msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31105"
 msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
 msgstr ""
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31106"
 msgid "Teletext"
 msgstr ""
 
 #. viewtype name
-#: /1080i/View_55_WideList.xml
+#: /xml/View_55_WideList.xml
 msgctxt "#31107"
 msgid "WideList"
 msgstr ""
 
 #empty strings from id 31108 to 31109
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31110"
 msgid "Enter files section"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31111"
 msgid "View your personal pictures or download one of the many image add-ons from the official repository."
 msgstr ""
 
-#: /1080i/VideoOSD.xml
+#: /xml/VideoOSD.xml
 msgctxt "#31112"
 msgid "Toggle audio stream"
 msgstr ""
 
-#: /1080i/Custom_1107_SearchDialog.xml
+#: /xml/Custom_1107_SearchDialog.xml
 msgctxt "#31113"
 msgid "Search local library"
 msgstr ""
 
-#: /1080i/Custom_1107_SearchDialog.xml /1080i/DialogMusicInfo.xml
+#: /xml/Custom_1107_SearchDialog.xml /xml/DialogMusicInfo.xml
 msgctxt "#31114"
 msgid "Search YouTube"
 msgstr ""
 
-#: /1080i/Custom_1107_SearchDialog.xml
+#: /xml/Custom_1107_SearchDialog.xml
 msgctxt "#31115"
 msgid "Search TheMovieDB"
 msgstr ""
 
-#: /1080i/Includes_Home.xml
+#: /xml/Includes_Home.xml
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr ""
 
-#: /1080i/MyVideoNav.xml
+#: /xml/MyVideoNav.xml
 msgctxt "#31117"
 msgid "Edit nodes"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31118"
 msgid "Enter add-on browser"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31119"
 msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31120"
 msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31121"
 msgid "Set weather provider"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31122"
 msgid "Unwatched TV Shows"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31123"
 msgid "Same director"
 msgstr ""
 
-#: /1080i/MyPics.xml
+#: /xml/MyPics.xml
 msgctxt "#31124"
 msgid "Show images on map"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr ""
 
-#: /1080i/DialogVideoInfo.xml
+#: /xml/DialogVideoInfo.xml
 msgctxt "#31126"
 msgid "Press OK to read plot"
 msgstr ""
 
-#: /1080i/Includes_MediaMenu.xml
+#: /xml/Includes_MediaMenu.xml
 msgctxt "#31127"
 msgid "Show icons"
 msgstr ""
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31128"
 msgid "Contributors"
 msgstr ""
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31129"
 msgid "General settings applying to all areas of the skin."
 msgstr ""
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31130"
 msgid "Main menu-related settings: Configure the home screen to your likings."
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31131"
 msgid "Choose skin fanart pack"
 msgstr ""
 
-#: /1080i/MyVideoNav.xml /1080i/View_502_FanArt.xml
+#: /xml/MyVideoNav.xml /xml/View_502_FanArt.xml
 msgctxt "#31132"
 msgid "min"
 msgstr ""
 
 #empty string with id 31133
 
-#: /1080i/DialogSeekBar.xml
+#: /xml/DialogSeekBar.xml
 msgctxt "#31134"
 msgid "Remaining"
 msgstr ""
 
 #empty string with id 31135
 
-#: /1080i/DialogAddonInfo.xml
+#: /xml/DialogAddonInfo.xml
 msgctxt "#31136"
 msgid "Click here to see latest changes..."
 msgstr ""
 
-#: /1080i/DialogPlayerProcessInfo.xml
+#: /xml/DialogPlayerProcessInfo.xml
 msgctxt "#31137"
 msgid "PVR info"
 msgstr ""
 
-#: /1080i/DialogPlayerProcessInfo.xml
+#: /xml/DialogPlayerProcessInfo.xml
 msgctxt "#31138"
 msgid "Player process info"
 msgstr ""
 
-#: /1080i/DialogPlayerProcessInfo.xml
+#: /xml/DialogPlayerProcessInfo.xml
 msgctxt "#31139"
 msgid "Video decoder"
 msgstr ""
 
-#: /1080i/DialogPlayerProcessInfo.xml
+#: /xml/DialogPlayerProcessInfo.xml
 msgctxt "#31140"
 msgid "Pixel format"
 msgstr ""
 
-#: /1080i/DialogAddonInfo.xml
+#: /xml/DialogAddonInfo.xml
 msgctxt "#31141"
 msgid "Changes for version"
 msgstr ""
 
-#: /1080i/Variables.xml
+#: /xml/Variables.xml
 msgctxt "#31142"
 msgid "Play speed"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31143"
 msgid "You did not set up PVR yet. In order to use PVR, choose a PVR client addon and configure it. Please visit http://kodi.wiki/view/PVR to learn more."
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31144"
 msgid "Enter add-on browser"
 msgstr ""
 
-#: /1080i/Custom_1107_SearchDialog.xml
+#: /xml/Custom_1107_SearchDialog.xml
 msgctxt "#31145"
 msgid "Search add-ons"
 msgstr ""
 
 #empty strings from id 31146 to 31147
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31148"
 msgid "Categories"
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31149"
 msgid "Select genre fanart pack"
 msgstr ""
 
-#: /1080i/DialogAddonInfo.xml
+#: /xml/DialogAddonInfo.xml
 msgctxt "#31150"
 msgid "Repository"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31151"
 msgid "Unwatched music videos"
 msgstr ""
 
-#: /1080i/Home.xml
+#: /xml/Home.xml
 msgctxt "#31152"
 msgid "Random music videos"
 msgstr ""
 
-#: /1080i/Includes.xml
+#: /xml/Includes.xml
 msgctxt "#31153"
 msgid "You do not have any add-ons of this type installed. Enter the add-on browser to download add-ons created by our community."
 msgstr ""
 
-#: /1080i/MyWeather.xml
+#: /xml/MyWeather.xml
 msgctxt "#31154"
 msgid "Press OK to switch between locations"
 msgstr ""
 
-#: /1080i/VideoOSDBookmarks.xml
+#: /xml/VideoOSDBookmarks.xml
 msgctxt "#31155"
 msgid "No bookmarks created yet."
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31156"
 msgid "Choose background pattern"
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31157"
 msgid "Edit categories"
 msgstr ""
 
-#: /1080i/SkinSettings.xml
+#: /xml/SkinSettings.xml
 msgctxt "#31158"
 msgid "Touch mode"
 msgstr ""
diff --git a/addons/skin.estuary/xml/DialogFullScreenInfo.xml b/addons/skin.estuary/xml/DialogFullScreenInfo.xml
index f89dc2e1db..bbd8aaa448 100644
--- a/addons/skin.estuary/xml/DialogFullScreenInfo.xml
+++ b/addons/skin.estuary/xml/DialogFullScreenInfo.xml
@@ -18,69 +18,71 @@
 			<height>230</height>
 			<visible>!Window.IsVisible(playerprocessinfo)</visible>
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<control type="image">
-				<depth>DepthOSD+</depth>
-				<left>10</left>
-				<top>-490</top>
-				<width>400</width>
-				<height>600</height>
-				<aspectratio aligny="bottom">keep</aspectratio>
-				<texture fallback="DefaultVideo.png" background="true">$VAR[NowPlayingPosterVar]</texture>
-				<bordertexture border="21">overlays/shadow.png</bordertexture>
-				<bordersize>20</bordersize>
-				<include>OpenClose_Left</include>
-			</control>
 			<control type="group">
-				<include>OpenClose_Right</include>
+				<animation effect="slide" end="0,-80" time="150" condition="PVR.IsTimeShift">conditional</animation>
 				<control type="image">
-					<left>400</left>
-					<top>-240</top>
-					<right>20</right>
-					<height>350</height>
-					<texture>dialogs/dialog-bg-nobo.png</texture>
+					<depth>DepthOSD+</depth>
+					<left>10</left>
+					<top>-490</top>
+					<width>400</width>
+					<height>600</height>
+					<aspectratio aligny="bottom">keep</aspectratio>
+					<texture fallback="DefaultVideo.png" background="true">$VAR[NowPlayingPosterVar]</texture>
 					<bordertexture border="21">overlays/shadow.png</bordertexture>
 					<bordersize>20</bordersize>
+					<include>OpenClose_Left</include>
 				</control>
-				<control type="textbox">
-					<left>443</left>
-					<top>-207</top>
-					<right>80</right>
-					<height>290</height>
-					<label fallback="416">$VAR[FullScreenInfoTextBoxVar]</label>
-					<align>justify</align>
-					<autoscroll delay="5000" repeat="7500" time="5000"></autoscroll>
-				</control>
-				<control type="grouplist" id="5550">
-					<right>20</right>
-					<top>-310</top>
-					<width>1000</width>
-					<height>100</height>
-					<align>right</align>
-					<orientation>horizontal</orientation>
-					<itemgap>-10</itemgap>
-					<onup>Close</onup>
-					<ondown>Close</ondown>
-					<usecontrolcoords>true</usecontrolcoords>
-					<control type="button" id="5553">
-						<width>auto</width>
-						<height>100</height>
-						<textoffsetx>80</textoffsetx>
-						<label>$LOCALIZE[207]</label>
+				<control type="group">
+					<include>OpenClose_Right</include>
+					<control type="image">
+						<left>400</left>
+						<top>-240</top>
+						<right>20</right>
+						<height>350</height>
+						<texture>dialogs/dialog-bg-nobo.png</texture>
+						<bordertexture border="21">overlays/shadow.png</bordertexture>
+						<bordersize>20</bordersize>
 					</control>
-					<control type="button" id="5554">
-						<width>auto</width>
-						<height>100</height>
-						<textoffsetx>80</textoffsetx>
-						<onclick>Close</onclick>
-						<label>$LOCALIZE[206]</label>
-						<visible>!String.IsEmpty(VideoPlayer.CastAndRole)</visible>
+					<control type="textbox">
+						<left>443</left>
+						<top>-207</top>
+						<right>80</right>
+						<height>290</height>
+						<label fallback="416">$VAR[FullScreenInfoTextBoxVar]</label>
+						<align>justify</align>
+						<autoscroll delay="5000" repeat="7500" time="5000"></autoscroll>
 					</control>
-					<control type="button" id="5555">
-						<width>auto</width>
+					<control type="grouplist" id="5550">
+						<right>20</right>
+						<top>-310</top>
+						<width>1000</width>
 						<height>100</height>
-						<textoffsetx>80</textoffsetx>
-						<label>$LOCALIZE[19031]</label>
-						<visible>VideoPlayer.Content(livetv)</visible>
+						<align>right</align>
+						<orientation>horizontal</orientation>
+						<itemgap>-10</itemgap>
+						<onup>Dialog.Close(fullscreeninfo)</onup>
+						<ondown>Dialog.Close(fullscreeninfo)</ondown>
+						<usecontrolcoords>true</usecontrolcoords>
+						<control type="button" id="5553">
+							<width>auto</width>
+							<height>100</height>
+							<textoffsetx>80</textoffsetx>
+							<label>$LOCALIZE[207]</label>
+						</control>
+						<control type="button" id="5554">
+							<width>auto</width>
+							<height>100</height>
+							<textoffsetx>80</textoffsetx>
+							<label>$LOCALIZE[206]</label>
+							<visible>!String.IsEmpty(VideoPlayer.CastAndRole)</visible>
+						</control>
+						<control type="button" id="5555">
+							<width>auto</width>
+							<height>100</height>
+							<textoffsetx>80</textoffsetx>
+							<label>$LOCALIZE[19031]</label>
+							<visible>VideoPlayer.Content(livetv)</visible>
+						</control>
 					</control>
 				</control>
 			</control>
diff --git a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
index d83c2218a1..53c4567c60 100644
--- a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
+++ b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
@@ -8,6 +8,7 @@
 		<control type="group">
 			<bottom>0</bottom>
 			<height>250</height>
+			<animation effect="slide" end="0,-80" time="150" condition="PVR.IsTimeShift">conditional</animation>
 			<control type="image">
 				<left>10</left>
 				<top>-240</top>
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml
index b241009e37..17709f0cf1 100644
--- a/addons/skin.estuary/xml/DialogSeekBar.xml
+++ b/addons/skin.estuary/xml/DialogSeekBar.xml
@@ -103,6 +103,50 @@
 				<label>$VAR[SeekLabel]</label>
 				<shadowcolor>black</shadowcolor>
 			</control>
+			<control type="group" id="6000">
+				<top>-5</top>
+				<visible>PVR.IsTimeShift + !Player.ChannelPreviewActive</visible>
+				<animation effect="fade" time="300">VisibleChange</animation>
+				<control type="label">
+					<top>0</top>
+					<right>20</right>
+					<width>400</width>
+					<height>50</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font30</font>
+					<label>$INFO[PVR.TimeShiftEnd]</label>
+				</control>
+				<control type="label">
+					<top>0</top>
+					<left>20</left>
+					<width>400</width>
+					<height>50</height>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font30</font>
+					<label>$INFO[PVR.TimeShiftStart]</label>
+				</control>
+				<control type="label">
+					<top>0</top>
+					<left>20</left>
+					<right>20</right>
+					<height>50</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>font30</font>
+					<label>[B]$LOCALIZE[31026][/B] $INFO[PVR.timeshiftcur]</label>
+				</control>
+				<control type="progress">
+					<left>0</left>
+					<top>50</top>
+					<width>100%</width>
+					<height>15</height>
+					<info>PVR.timeshiftprogress</info>
+					<texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
+					<midtexture>colors/white50.png</midtexture>
+				</control>
+			</control>
 			<control type="progress">
 				<left>0</left>
 				<top>70</top>
@@ -111,6 +155,7 @@
 				<info>Player.ProgressCache</info>
 				<texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
 				<midtexture>colors/white50.png</midtexture>
+				<visible>!Player.ChannelPreviewActive</visible>
 			</control>
 			<control type="progress">
 				<left>0</left>
@@ -135,6 +180,7 @@
 		<control type="group">
 			<visible>Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo) + !Window.IsActive(fullscreeninfo)</visible>
 			<animation effect="fade" time="400">VisibleChange</animation>
+			<animation effect="slide" end="0,-80" time="150" condition="Control.IsVisible(6000)">conditional</animation>
 			<bottom>0</bottom>
 			<height>380</height>
 			<control type="image">
diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml
index 0d04a02e12..3159d2c528 100644
--- a/addons/skin.estuary/xml/Home.xml
+++ b/addons/skin.estuary/xml/Home.xml
@@ -705,7 +705,7 @@
 					<include content="ImageWidget">
 						<param name="text_label" value="$INFO[System.DVDLabel]" />
 						<param name="button_label" value="$LOCALIZE[341]" />
-						<param name="button_onclick" value="PlayDVD"/>
+						<param name="button_onclick" value="PlayDisc"/>
 						<param name="button_id" value="21100"/>
 						<param name="visible" value="true"/>
 						<param name="button2_label" value="$LOCALIZE[13391]"/>
@@ -825,7 +825,7 @@
 						</item>
 						<item>
 							<label>$LOCALIZE[427]</label>
-							<onclick>PlayDVD</onclick>
+							<onclick>PlayDisc</onclick>
 							<property name="menu_id">$NUMBER[21000]</property>
 							<thumb>icons/sidemenu/disc.png</thumb>
 							<property name="id">disc</property>
diff --git a/addons/skin.estuary/xml/SettingsSystemInfo.xml b/addons/skin.estuary/xml/SettingsSystemInfo.xml
index 6ace4b98f5..b11b55c104 100644
--- a/addons/skin.estuary/xml/SettingsSystemInfo.xml
+++ b/addons/skin.estuary/xml/SettingsSystemInfo.xml
@@ -86,7 +86,7 @@
 				<top>100</top>
 				<bottom>315</bottom>
 				<pagecontrol>60</pagecontrol>
-				<autoscroll delay="5000" repeat="7500" time="5000">true</autoscroll>
+				<autoscroll delay="5000" repeat="7500" time="5000">!Control.HasFocus(60)</autoscroll>
 			</control>
 			<control type="scrollbar" id="60">
 				<right>0</right>
diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml
index abef177b6f..3f6e7ae88e 100644
--- a/addons/skin.estuary/xml/VideoOSD.xml
+++ b/addons/skin.estuary/xml/VideoOSD.xml
@@ -30,7 +30,7 @@
 				<width>1000</width>
 				<height>60</height>
 				<label>$VAR[VideoOSDHelpTextVar]</label>
-				<visible>!Player.ShowInfo</visible>
+				<visible>!Player.ShowInfo + !PVR.IsTimeShift</visible>
 			</control>
 			<control type="group" id="200">
 				<control type="grouplist" id="201">