mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-26 23:12:38 +02:00
Work on #3255
This commit is contained in:
parent
3a3489d968
commit
8589501d1c
@ -1749,7 +1749,7 @@ can edit in same subtitle file (collaboration)</Information>
|
||||
<ToggleBookmarksWithComment>Toggle bookmarks - add comment</ToggleBookmarksWithComment>
|
||||
<ClearBookmarks>Clear bookmarks</ClearBookmarks>
|
||||
<GoToBookmark>Go to bookmark</GoToBookmark>
|
||||
<GoToPreviousBookmark>Go to prevous bookmark</GoToPreviousBookmark>
|
||||
<GoToPreviousBookmark>Go to previous bookmark</GoToPreviousBookmark>
|
||||
<GoToNextBookmark>Go to next bookmark</GoToNextBookmark>
|
||||
<FontInUi>UI Font</FontInUi>
|
||||
<ShowFrameRate>Show frame rate in toolbar</ShowFrameRate>
|
||||
|
@ -612,6 +612,8 @@ namespace Nikse.SubtitleEdit.Core
|
||||
sb.Append((p.StartTime.TotalMilliseconds + Configuration.Settings.General.CurrentVideoOffsetInMs).GetHashCode());
|
||||
sb.Append((p.EndTime.TotalMilliseconds + Configuration.Settings.General.CurrentVideoOffsetInMs).GetHashCode());
|
||||
sb.Append(p.Text);
|
||||
if (p.Bookmark != null)
|
||||
sb.Append("*" + p.Bookmark);
|
||||
}
|
||||
return sb.ToString().TrimEnd();
|
||||
}
|
||||
|
2
src/Forms/Main.Designer.cs
generated
2
src/Forms/Main.Designer.cs
generated
@ -3732,7 +3732,7 @@
|
||||
// ShowSubtitleTimer
|
||||
//
|
||||
this.ShowSubtitleTimer.Enabled = true;
|
||||
this.ShowSubtitleTimer.Interval = 16;
|
||||
this.ShowSubtitleTimer.Interval = 17;
|
||||
this.ShowSubtitleTimer.Tick += new System.EventHandler(this.ShowSubtitleTimerTick);
|
||||
//
|
||||
// timerAutoDuration
|
||||
|
@ -462,20 +462,20 @@
|
||||
<data name="toolStripButtonNetflixQualityCheck.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALmSURBVFhHtZe/axRBFMdHb3+Nd7n9NSkFWy2sLbS3sbfw
|
||||
D7CxtxBSGsWIoJADE9AQTDTmfhAExeBhFUIUFJIQEvFyu7eChdhEBH9kfe+YOzZzL2B2b7/wrea9fZ97
|
||||
s292jh2mDcuLIy4G3NacCzKEVMOwY8pjjGky5P/0xnRIgI7pL8oQUlRx9JEBlgBgx/IHANa5+NMy7VMy
|
||||
bEBUcfSRAcYMe3/ZoLsQcn9Chg2IKo5OBTCnleM20YXIFN/XGSvJ0AOiiqNTAdT0ctw03EEAcGCOXpOh
|
||||
B0QVR6cCwMTpQpkEiCx3Gx56XIb3pRbuOTXAFGzDmkmPZMdwLsnwvtTCPacGeArbMKPZJEBgiWUZ3pda
|
||||
uOfUAOjbhZF4kziYqlzsh7pzVqZ0lSyadCaASW0krup0F0LLn5IpXSWLJp0JYAbegzvQhc/USHL75zYr
|
||||
jcq0fABwHMcB4NUhB1PHEjdkGluA2GThnjMBoO8BwH0wFPylAkS6/QUOJgPzHkG3knk9ZwbAccQuhNyb
|
||||
GwAAh5ZzBfMeQEwyr+fMADiOXQDNO0cCmOId5t2CmCqxDZkB0DiOuBYZ/goF0dbc8wiJL62aOxQAHEdc
|
||||
C3RxmQKAu8JzBMA4NXcoAPjLcK0JD4u4H6gAeFfAdwA7hZOTzB0KAD5ULrPQcq+rAOjXMKrYhdk8ANBy
|
||||
mQWs7G3x0g8VYBcOKzy0Kso2DB0AFVmiogKg67oTTwBEMi8XgJbhncYPkgqwBV3AcXyS2IZcAFAdy3+p
|
||||
AqBn4RP+MLENuQEEJ9yLFMB7uMTcTWxDbgCgYyEXmxREBcZ2Xm5DngCsw/2rFMBbuNDiNwTzcgX4wFgR
|
||||
rurfVIAAXsZJuQ25AqA6XIyrAOgXMJLPYBvyB2DuyRYXv1WAT9CFx7ANuQOg4C/bvAqArsN98sgAi0Zx
|
||||
r1Eothq6vVrXy0s1ozxd0+2bcpnUruGdWTXslTX40/JRd79u8OLeDnSlycVfGoCxfzGArSEM0jriAAAA
|
||||
AElFTkSuQmCC
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALnSURBVFhHtZfPaxNBFMdHs7/GpPsjOz0KXvXg2YPevXj3
|
||||
4B/gxbsHoUerWBEUGrAFLcVWa5qEIigWg6dSqqDQltKKaXazggfxUhH80fW9MAnb2Vew2ewXvqd5b98n
|
||||
b/bNTthh2rDKccRFym3NvSBDSDUMJ6Y8xpgmQ/5Pb0yXBOiYflWGkKKKo48MsAQAO5afAljn4k/LdE7J
|
||||
sJSo4ugjA4wZzv6yQXch5P6EDEuJKo4eCGBOs+M20YXIFN/XGSvJ0AOiiqMHAqjpdtw0vDQAODBHr8nQ
|
||||
A6KKowcCwMTpgk0CRJa3DQ89LsP7Ugv3PDDAFGzDmkmPZMdwL8nwvtTCPQ8M8BS2YUZzSIDAEssyvC+1
|
||||
cM8DA6BvF0biTeJgqnKxH+ruWZnSVbJo0pkAJrWReFGnuxBa/pRM6SpZNOlMADPwHtyBLnymRpI7P7dZ
|
||||
aVSm5QOA4zgOAK8OOZg6lrgh09gCxCYL95wJAH0PAO6DoeAvFSDSnS9wMBmY9wi6lczrOTMAjiN2IeTl
|
||||
uRQAOLTcK5j3AGKSeT1nBsBx7AJo5XMkgCneYd4tiFkktiEzABrHEdciw1+hINqadx4h8aVVc4cCgOOI
|
||||
a4EuLlMAcFd4jgAYp+YOBQB/Ga414WER9wMVAO8K+A5gp3BykrlDAcCHymUWWt51FQD9GkYVuzCbBwBa
|
||||
LrOA2eUtXvqhAuzCYYWHVkXZhqEDoCJLVFQAdF134wmASOblAtAyyqfxg6QCbEEXcByfJLYhFwBUx/Jf
|
||||
qgDoWfiEP0xsQ24AwQnvIgXwHi4xdxPbkBsA6FjIxSYFUYGxnZfbkCcA63D/KgXwFi60+A3BvFwBPjBW
|
||||
hKv6NxUggJdxUm5DrgCoDhfjKgD6BYzkM9iG/AGYd7LFxW8V4BN04TFsQ+4AKPjLNq8CoOtwnzwyQNUo
|
||||
7jUKxVZDd1brur1UM+zpmu7clMukdo3ymVXDWVmDPy0fde/rBi/u7UBXmlz8pQEY+wchXa0fns+P5gAA
|
||||
AABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="toolStripButtonSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@ -771,7 +771,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAWABJQFgASUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAWgBJQFoASUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
Loading…
Reference in New Issue
Block a user