diff --git a/LanguageBaseEnglish.xml b/LanguageBaseEnglish.xml
index 69f8cde79..af2a3b705 100644
--- a/LanguageBaseEnglish.xml
+++ b/LanguageBaseEnglish.xml
@@ -155,8 +155,11 @@ Note: Do check free disk space.</WaveFileMalformed>
   </AddWaveform>
   <AddWaveformBatch>
     <Title>Batch generate waveform data</Title>
+    <ExtractTimeCodes>Extract time codes with FFprobe</ExtractTimeCodes>
     <ExtractingAudio>Extracting audio...</ExtractingAudio>
     <Calculating>Calculating...</Calculating>
+    <ExtractingTimeCodes>Extracting time codes...</ExtractingTimeCodes>
+    <DetectingShotChanges>Detecting shot changes...</DetectingShotChanges>
     <Done>Done</Done>
     <Error>Error</Error>
   </AddWaveformBatch>
@@ -174,12 +177,14 @@ Note: Do check free disk space.</WaveFileMalformed>
     <ExtendOnly>Extend only</ExtendOnly>
     <EnforceDurationLimits>Enforce minimum and maximum duration</EnforceDurationLimits>
     <CheckShotChanges>Don't extend past shot changes</CheckShotChanges>
+    <BatchCheckShotChanges>Respect shot changes (if available)</BatchCheckShotChanges>
   </AdjustDisplayDuration>
   <ApplyDurationLimits>
     <Title>Apply duration limits</Title>
     <CheckShotChanges>Don't extend past shot changes</CheckShotChanges>
     <FixesAvailable>Fixes available: {0}</FixesAvailable>
     <UnableToFix>Unable to fix: {0}</UnableToFix>
+    <BatchCheckShotChanges>Respect shot changes (if available)</BatchCheckShotChanges>
   </ApplyDurationLimits>
   <AudioToText>
     <Title>Audio to text</Title>
@@ -371,7 +376,7 @@ Read more info (web)?</WhisperNotFound>
     <TitleSelectedLines>Beautify time codes ({0} selected lines)</TitleSelectedLines>
     <GroupTimeCodes>Time codes</GroupTimeCodes>
     <AlignTimeCodes>Align time codes to frame time codes</AlignTimeCodes>
-    <ExtractExactTimeCodes>Use ffprobe to extract exact frame time codes</ExtractExactTimeCodes>
+    <ExtractExactTimeCodes>Use FFprobe to extract exact frame time codes</ExtractExactTimeCodes>
     <ExtractTimeCodes>Extract time codes</ExtractTimeCodes>
     <CancelTimeCodes>Cancel</CancelTimeCodes>
     <GroupShotChanges>Shot changes</GroupShotChanges>
@@ -388,6 +393,9 @@ Please click "{0}" to extract the time codes first, or disable this option.</NoT
     <NoShotChangesLoadedError>You've selected to snap cues to shot changes, but there are no shot changes loaded.
 
 Please click "{0}" to generate or import shot changes first, or disable this option.</NoShotChangesLoadedError>
+    <BatchAlignTimeCodes>Align time codes to frame time codes</BatchAlignTimeCodes>
+    <BatchUseExactTimeCodes>Use exact time codes (if available)</BatchUseExactTimeCodes>
+    <BatchSnapToShotChanges>Snap cues to shot changes (if available)</BatchSnapToShotChanges>
   </BeautifyTimeCodes>
   <BeautifyTimeCodesProfile>
     <Title>Edit profile</Title>
@@ -2563,6 +2571,10 @@ can edit in same subtitle file (collaboration)</Information>
     <RecalculateDurationOfCurrentSubtitle>Re-calculate duration of current subtitle</RecalculateDurationOfCurrentSubtitle>
     <RecalculateDurationOfCurrentSubtitleByOptimalReadingSpeed>Re-calculate duration of current subtitle (based on optimal reading speed)</RecalculateDurationOfCurrentSubtitleByOptimalReadingSpeed>
     <RecalculateDurationOfCurrentSubtitleByMinReadingSpeed>Re-calculate duration of current subtitle (based on minimum reading speed)</RecalculateDurationOfCurrentSubtitleByMinReadingSpeed>
+    <SetInCueToClosestShotChangeLeftGreenZone>Set in cue to minimum distance before closest shot change (left green zone)</SetInCueToClosestShotChangeLeftGreenZone>
+    <SetInCueToClosestShotChangeRightGreenZone>Set in cue to minimum distance after closest shot change (right green zone)</SetInCueToClosestShotChangeRightGreenZone>
+    <SetOutCueToClosestShotChangeLeftGreenZone>Set out cue to minimum distance before closest shot change (left green zone)</SetOutCueToClosestShotChangeLeftGreenZone>
+    <SetOutCueToClosestShotChangeRightGreenZone>Set out cue to minimum distance after closest shot change (right green zone)</SetOutCueToClosestShotChangeRightGreenZone>
     <MainCreateStartDownEndUp>Insert new subtitle at key-down, set end time at key-up</MainCreateStartDownEndUp>
     <MergeDialog>Merge dialog (insert dashes)</MergeDialog>
     <MergeDialogWithNext>Merge dialog with next (insert dashes)</MergeDialogWithNext>
@@ -3330,6 +3342,10 @@ Keep changes?</KeepChangesMessage>
     <Title>WebVTT - set new voice</Title>
     <VoiceName>Name of voice</VoiceName>
   </WebVttNewVoice>
+  <WebVttProperties>
+    <UseXTimeStamp>Use X-TIMESTAMP-MAP header value</UseXTimeStamp>
+    <MergeLines>Merge lines with same text on load</MergeLines>
+  </WebVttProperties>
   <WebVttStyleManager>
     <Title>WebVTT styles</Title>
   </WebVttStyleManager>
diff --git a/src/ui/Logic/LanguageDeserializer.cs b/src/ui/Logic/LanguageDeserializer.cs
index ac386e55f..713c469b0 100644
--- a/src/ui/Logic/LanguageDeserializer.cs
+++ b/src/ui/Logic/LanguageDeserializer.cs
@@ -430,12 +430,21 @@ namespace Nikse.SubtitleEdit.Logic
                 case "AddWaveformBatch/Title":
                     language.AddWaveformBatch.Title = reader.Value;
                     break;
+                case "AddWaveformBatch/ExtractTimeCodes":
+                    language.AddWaveformBatch.ExtractTimeCodes = reader.Value;
+                    break;
                 case "AddWaveformBatch/ExtractingAudio":
                     language.AddWaveformBatch.ExtractingAudio = reader.Value;
                     break;
                 case "AddWaveformBatch/Calculating":
                     language.AddWaveformBatch.Calculating = reader.Value;
                     break;
+                case "AddWaveformBatch/ExtractingTimeCodes":
+                    language.AddWaveformBatch.ExtractingTimeCodes = reader.Value;
+                    break;
+                case "AddWaveformBatch/DetectingShotChanges":
+                    language.AddWaveformBatch.DetectingShotChanges = reader.Value;
+                    break;
                 case "AddWaveformBatch/Done":
                     language.AddWaveformBatch.Done = reader.Value;
                     break;
@@ -481,6 +490,9 @@ namespace Nikse.SubtitleEdit.Logic
                 case "AdjustDisplayDuration/CheckShotChanges":
                     language.AdjustDisplayDuration.CheckShotChanges = reader.Value;
                     break;
+                case "AdjustDisplayDuration/BatchCheckShotChanges":
+                    language.AdjustDisplayDuration.BatchCheckShotChanges = reader.Value;
+                    break;
                 case "ApplyDurationLimits/Title":
                     language.ApplyDurationLimits.Title = reader.Value;
                     break;
@@ -493,6 +505,9 @@ namespace Nikse.SubtitleEdit.Logic
                 case "ApplyDurationLimits/UnableToFix":
                     language.ApplyDurationLimits.UnableToFix = reader.Value;
                     break;
+                case "ApplyDurationLimits/BatchCheckShotChanges":
+                    language.ApplyDurationLimits.BatchCheckShotChanges = reader.Value;
+                    break;
                 case "AudioToText/Title":
                     language.AudioToText.Title = reader.Value;
                     break;
@@ -1033,6 +1048,15 @@ namespace Nikse.SubtitleEdit.Logic
                 case "BeautifyTimeCodes/NoShotChangesLoadedError":
                     language.BeautifyTimeCodes.NoShotChangesLoadedError = reader.Value;
                     break;
+                case "BeautifyTimeCodes/BatchAlignTimeCodes":
+                    language.BeautifyTimeCodes.BatchAlignTimeCodes = reader.Value;
+                    break;
+                case "BeautifyTimeCodes/BatchUseExactTimeCodes":
+                    language.BeautifyTimeCodes.BatchUseExactTimeCodes = reader.Value;
+                    break;
+                case "BeautifyTimeCodes/BatchSnapToShotChanges":
+                    language.BeautifyTimeCodes.BatchSnapToShotChanges = reader.Value;
+                    break;
                 case "BeautifyTimeCodesProfile/Title":
                     language.BeautifyTimeCodesProfile.Title = reader.Value;
                     break;
@@ -6979,6 +7003,18 @@ namespace Nikse.SubtitleEdit.Logic
                 case "Settings/RecalculateDurationOfCurrentSubtitleByMinReadingSpeed":
                     language.Settings.RecalculateDurationOfCurrentSubtitleByMinReadingSpeed = reader.Value;
                     break;
+                case "Settings/SetInCueToClosestShotChangeLeftGreenZone":
+                    language.Settings.SetInCueToClosestShotChangeLeftGreenZone = reader.Value;
+                    break;
+                case "Settings/SetInCueToClosestShotChangeRightGreenZone":
+                    language.Settings.SetInCueToClosestShotChangeRightGreenZone = reader.Value;
+                    break;
+                case "Settings/SetOutCueToClosestShotChangeLeftGreenZone":
+                    language.Settings.SetOutCueToClosestShotChangeLeftGreenZone = reader.Value;
+                    break;
+                case "Settings/SetOutCueToClosestShotChangeRightGreenZone":
+                    language.Settings.SetOutCueToClosestShotChangeRightGreenZone = reader.Value;
+                    break;
                 case "Settings/MainCreateStartDownEndUp":
                     language.Settings.MainCreateStartDownEndUp = reader.Value;
                     break;
@@ -9073,6 +9109,12 @@ namespace Nikse.SubtitleEdit.Logic
                 case "WebVttNewVoice/VoiceName":
                     language.WebVttNewVoice.VoiceName = reader.Value;
                     break;
+                case "WebVttProperties/UseXTimeStamp":
+                    language.WebVttProperties.UseXTimeStamp = reader.Value;
+                    break;
+                case "WebVttProperties/MergeLines":
+                    language.WebVttProperties.MergeLines = reader.Value;
+                    break;
                 case "WebVttStyleManager/Title":
                     language.WebVttStyleManager.Title = reader.Value;
                     break;