Skip to content

Commit

Permalink
solve merge issues and include all previous changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaVukovic
DaVukovic committed Mar 31, 2023
1 parent 209430f commit d02a3b4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions 720p/Includes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,12 +549,12 @@
<value>$INFO[ListItem.VideoCodec]</value>
</variable>
<variable name="SeekLabel">
<value condition="[Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek] | Player.IsTempo">$LOCALIZE[31042]</value>
<value condition="[Player.Playing + !Player.Seeking + !Player.HasPerformedSeek(3)] | Player.IsTempo">$LOCALIZE[31042]</value>
<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking">$LOCALIZE[31043]</value>
<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
<value condition="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
<value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
<value condition="!Player.DisplayAfterSeek + Player.Seeking">$LOCALIZE[31046]</value>
<value condition="Player.HasPerformedSeek(3) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
<value condition="!Player.HasPerformedSeek(3) + Player.Seeking">$LOCALIZE[31046]</value>
<value condition="Player.Forwarding">$LOCALIZE[31044]</value>
<value condition="Player.Rewinding">$LOCALIZE[31045]</value>
</variable>
Expand Down

0 comments on commit d02a3b4

Please sign in to comment.