mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 06:52:35 +01:00
Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit
This commit is contained in:
commit
cd71256be4
@ -2377,6 +2377,7 @@ can edit in same subtitle file (collaboration)</Information>
|
||||
<AlignmentN9>Alignment top right - {\an9}</AlignmentN9>
|
||||
<ColorX>Color {0} ({1})</ColorX>
|
||||
<CopyTextOnly>Copy text only to clipboard (selected lines)</CopyTextOnly>
|
||||
<CopyPlainText>Copy plain text to clipboard (selected lines)</CopyPlainText>
|
||||
<CopyTextOnlyFromOriginalToCurrent>Copy text from original to current</CopyTextOnlyFromOriginalToCurrent>
|
||||
<AutoDurationSelectedLines>Auto-duration (selected lines)</AutoDurationSelectedLines>
|
||||
<FixRTLViaUnicodeChars>Fix RTL via Unicode control characters</FixRTLViaUnicodeChars>
|
||||
|
@ -2214,6 +2214,7 @@ $HorzAlign = Center
|
||||
public string MainListViewColor4 { get; set; }
|
||||
public string MainRemoveFormatting { get; set; }
|
||||
public string MainListViewCopyText { get; set; }
|
||||
public string MainListViewCopyPlainText { get; set; }
|
||||
public string MainListViewCopyTextFromOriginalToCurrent { get; set; }
|
||||
public string MainListViewAutoDuration { get; set; }
|
||||
public string MainListViewColumnDeleteText { get; set; }
|
||||
@ -8257,6 +8258,12 @@ $HorzAlign = Center
|
||||
shortcuts.MainListViewCopyText = subNode.InnerText;
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("MainListViewCopyPlainText");
|
||||
if (subNode != null)
|
||||
{
|
||||
shortcuts.MainListViewCopyPlainText = subNode.InnerText;
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("MainListViewCopyTextFromOriginalToCurrent");
|
||||
if (subNode != null)
|
||||
{
|
||||
@ -10238,6 +10245,7 @@ $HorzAlign = Center
|
||||
textWriter.WriteElementString("MainListViewColor4", shortcuts.MainListViewColor4);
|
||||
textWriter.WriteElementString("MainRemoveFormatting", shortcuts.MainRemoveFormatting);
|
||||
textWriter.WriteElementString("MainListViewCopyText", shortcuts.MainListViewCopyText);
|
||||
textWriter.WriteElementString("MainListViewCopyPlainText", shortcuts.MainListViewCopyPlainText);
|
||||
textWriter.WriteElementString("MainListViewCopyTextFromOriginalToCurrent", shortcuts.MainListViewCopyTextFromOriginalToCurrent);
|
||||
textWriter.WriteElementString("MainListViewAutoDuration", shortcuts.MainListViewAutoDuration);
|
||||
textWriter.WriteElementString("MainListViewColumnDeleteText", shortcuts.MainListViewColumnDeleteText);
|
||||
|
@ -19078,6 +19078,30 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
MessageBox.Show("Unable to set clipboard text - some other application might have locked the clipboard.");
|
||||
}
|
||||
|
||||
private void CopyTextFromSelectedLinesToClipboard(bool removeTags)
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
foreach (int i in SubtitleListview1.SelectedIndices)
|
||||
{
|
||||
var p = _subtitle.GetParagraphOrDefault(i);
|
||||
if (p != null)
|
||||
{
|
||||
sb.Append(p.Text).AppendLine(Environment.NewLine);
|
||||
}
|
||||
}
|
||||
|
||||
if (sb.ToString().TrimEnd().Length > 0)
|
||||
{
|
||||
var text = sb.ToString().TrimEnd();
|
||||
if (removeTags)
|
||||
{
|
||||
text = HtmlUtil.RemoveHtmlTags(text, true);
|
||||
}
|
||||
|
||||
ClipboardSetText(text);
|
||||
}
|
||||
}
|
||||
|
||||
private void SubtitleListview1KeyDown(object sender, KeyEventArgs e)
|
||||
{
|
||||
if (e.KeyCode == Keys.C && e.Modifiers == Keys.Control) //Ctrl+c = Copy to clipboard
|
||||
@ -19106,21 +19130,12 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
else if (e.KeyData == _shortcuts.MainListViewCopyText)
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
foreach (int i in SubtitleListview1.SelectedIndices)
|
||||
{
|
||||
var p = _subtitle.GetParagraphOrDefault(i);
|
||||
if (p != null)
|
||||
{
|
||||
sb.Append(p.Text).AppendLine(Environment.NewLine);
|
||||
}
|
||||
}
|
||||
|
||||
if (sb.ToString().TrimEnd().Length > 0)
|
||||
{
|
||||
ClipboardSetText(sb.ToString().TrimEnd());
|
||||
}
|
||||
|
||||
CopyTextFromSelectedLinesToClipboard(false);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.KeyData == _shortcuts.MainListViewCopyPlainText)
|
||||
{
|
||||
CopyTextFromSelectedLinesToClipboard(true);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.KeyData == _shortcuts.MainListViewAutoDuration)
|
||||
|
@ -1461,6 +1461,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
|
||||
AddNode(listViewNode, language.ToggleDialogDashes, nameof(Configuration.Settings.Shortcuts.MainListViewToggleDashes));
|
||||
AddNode(listViewNode, language.Alignment, nameof(Configuration.Settings.Shortcuts.MainListViewAlignment), true);
|
||||
AddNode(listViewNode, language.CopyTextOnly, nameof(Configuration.Settings.Shortcuts.MainListViewCopyText));
|
||||
AddNode(listViewNode, language.CopyPlainText, nameof(Configuration.Settings.Shortcuts.MainListViewCopyPlainText));
|
||||
AddNode(listViewNode, language.CopyTextOnlyFromOriginalToCurrent, nameof(Configuration.Settings.Shortcuts.MainListViewCopyTextFromOriginalToCurrent), true);
|
||||
AddNode(listViewNode, language.AutoDurationSelectedLines, nameof(Configuration.Settings.Shortcuts.MainListViewAutoDuration));
|
||||
AddNode(listViewNode, language.ListViewColumnDelete, nameof(Configuration.Settings.Shortcuts.MainListViewColumnDeleteText), true);
|
||||
|
@ -94,6 +94,7 @@
|
||||
<Collapse>收起</Collapse>
|
||||
<ShortcutX>快捷键: {0}</ShortcutX>
|
||||
<ExampleX>示例: {0}</ExampleX>
|
||||
<Reset>重置</Reset>
|
||||
</General>
|
||||
<About>
|
||||
<Title>关于 Subtitle Edit</Title>
|
||||
@ -226,6 +227,7 @@ Command line: {1} {2}
|
||||
<ChangeResolutionFontSize>缩放字号</ChangeResolutionFontSize>
|
||||
<ChangeResolutionPositions>缩放位置</ChangeResolutionPositions>
|
||||
<ChangeResolutionDrawing>缩放图形</ChangeResolutionDrawing>
|
||||
<SourceAndTargetEqual>源视频与目标分辨率相同 - 别管了……</SourceAndTargetEqual>
|
||||
</AssaResulationChanger>
|
||||
<AssaSetBackgroundBox>
|
||||
<Title>生成背景框</Title>
|
||||
@ -360,7 +362,7 @@ Command line: {1} {2}
|
||||
<ChangeCasing>
|
||||
<Title>更改大小写</Title>
|
||||
<ChangeCasingTo>更改大小写为</ChangeCasingTo>
|
||||
<NormalCasing>正常大小写。句首字母大写。</NormalCasing>
|
||||
<NormalCasing>正常大小写,句首字母大写。</NormalCasing>
|
||||
<FixNamesCasing>修复名称大小写 (依据 Dictionaries\NamesEtc.xml)</FixNamesCasing>
|
||||
<FixOnlyNamesCasing>仅修复名称大小写 (依据 Dictionaries\NamesEtc.xml)</FixOnlyNamesCasing>
|
||||
<OnlyChangeAllUppercaseLines>仅更改全部大写的行</OnlyChangeAllUppercaseLines>
|
||||
@ -839,9 +841,9 @@ Command line: {1} {2}
|
||||
<AlignRight>右对齐</AlignRight>
|
||||
</GenerateVideoWithBurnedInSubs>
|
||||
<GetDictionaries>
|
||||
<Title>是否使用词典?</Title>
|
||||
<DescriptionLine1>Subtitle Edit 的拼写检查基于 NHunspell 引擎,它</DescriptionLine1>
|
||||
<DescriptionLine2>使用的是 LibreOffice 的拼写检查词典。</DescriptionLine2>
|
||||
<Title>获取更多词典</Title>
|
||||
<DescriptionLine1>Subtitle Edit 的拼写检查基于 NHunspell 引擎,</DescriptionLine1>
|
||||
<DescriptionLine2>它使用的是 LibreOffice 的拼写检查词典。</DescriptionLine2>
|
||||
<ChooseLanguageAndClickDownload>选择您的语言并点击「下载」</ChooseLanguageAndClickDownload>
|
||||
<OpenDictionariesFolder>打开 'Dictionaries' 文件夹</OpenDictionariesFolder>
|
||||
<Download>下载</Download>
|
||||
@ -875,7 +877,7 @@ Command line: {1} {2}
|
||||
<AutoTranslateViaCopyPaste>通过复制粘贴自动翻译</AutoTranslateViaCopyPaste>
|
||||
<CopyPasteMaxSize>最大块大小</CopyPasteMaxSize>
|
||||
<AutoCopyToClipboard>自动复制到剪贴板</AutoCopyToClipboard>
|
||||
<AutoCopyLineSeparator>行分离器</AutoCopyLineSeparator>
|
||||
<AutoCopyLineSeparator>行分隔符</AutoCopyLineSeparator>
|
||||
<TranslateBlockXOfY>翻译块{0}/{1}</TranslateBlockXOfY>
|
||||
<TranslateBlockInfo>转到翻译器并粘贴文本,将结果复制回剪贴板,然后单击下面的按钮</TranslateBlockInfo>
|
||||
<TranslateBlockGetFromClipboard>从剪贴板获取翻译(Ctrl + V)</TranslateBlockGetFromClipboard>
|
||||
@ -1177,7 +1179,7 @@ Command line: {1} {2}
|
||||
<RemoveUnicodeControlCharacters>移除 Unicode 控制字符(针对选中的行)</RemoveUnicodeControlCharacters>
|
||||
<ReverseRightToLeftStartEnd>反转 RTL 开始/结束 (所选行)</ReverseRightToLeftStartEnd>
|
||||
<ShowOriginalTextInAudioAndVideoPreview>在 音频/视频 预览中显示原始文本</ShowOriginalTextInAudioAndVideoPreview>
|
||||
<ModifySelection>更改选择...</ModifySelection>
|
||||
<ModifySelection>修改选集...</ModifySelection>
|
||||
<InverseSelection>反选</InverseSelection>
|
||||
</Edit>
|
||||
<Tools>
|
||||
@ -1241,8 +1243,8 @@ Command line: {1} {2}
|
||||
<ShowHideVideo>显示/隐藏视频</ShowHideVideo>
|
||||
<ShowHideWaveform>显示/隐藏波形</ShowHideWaveform>
|
||||
<ShowHideWaveformAndSpectrogram>显示/隐藏波形和频谱图</ShowHideWaveformAndSpectrogram>
|
||||
<UnDockVideoControls>取消停靠视频控件</UnDockVideoControls>
|
||||
<ReDockVideoControls>重新停靠视频控件</ReDockVideoControls>
|
||||
<UnDockVideoControls>取消内嵌显示视频控件</UnDockVideoControls>
|
||||
<ReDockVideoControls>内嵌显示视频控件</ReDockVideoControls>
|
||||
</Video>
|
||||
<SpellCheck>
|
||||
<Title>拼写检查(&S)</Title>
|
||||
@ -1295,7 +1297,7 @@ Command line: {1} {2}
|
||||
<RemoveTextForHi>移除听障辅助内容</RemoveTextForHi>
|
||||
<VisualSync>影音对照同步</VisualSync>
|
||||
<SpellCheck>拼写检查</SpellCheck>
|
||||
<NetflixQualityCheck>Netflix品质检查</NetflixQualityCheck>
|
||||
<NetflixQualityCheck>Netflix字幕质量检查</NetflixQualityCheck>
|
||||
<Settings>设置</Settings>
|
||||
<Help>帮助</Help>
|
||||
<ShowHideWaveform>显示/隐藏音频</ShowHideWaveform>
|
||||
@ -1376,6 +1378,7 @@ Command line: {1} {2}
|
||||
<SetPosition>设置位置...</SetPosition>
|
||||
<GenerateProgressBar>生成进度条...</GenerateProgressBar>
|
||||
<AssaResolutionChanger>更改ASSA脚本分辨率...</AssaResolutionChanger>
|
||||
<AssaGenerateBackgroundBox>生成背景框...</AssaGenerateBackgroundBox>
|
||||
<FixCommonErrorsInSelectedLines>修复所选行常规错误...</FixCommonErrorsInSelectedLines>
|
||||
<ChangeCasingForSelectedLines>更改所选行大小写...</ChangeCasingForSelectedLines>
|
||||
<SaveSelectedLines>所选行另存为...</SaveSelectedLines>
|
||||
@ -1615,7 +1618,7 @@ Command line: {1} {2}
|
||||
<ShowSelectedLinesXSecondsLinesLater>显示所选行 {0:0.0##} 秒滞后</ShowSelectedLinesXSecondsLinesLater>
|
||||
<ShowSelectionAndForwardXSecondsLinesEarlier>显示所选及以前行 {0:0.0##} 秒提前</ShowSelectionAndForwardXSecondsLinesEarlier>
|
||||
<ShowSelectionAndForwardXSecondsLinesLater>显示所选及以前行 {0:0.0##} 秒滞后</ShowSelectionAndForwardXSecondsLinesLater>
|
||||
<DoubleWordsViaRegEx>双词使用正则表达式 {0}</DoubleWordsViaRegEx>
|
||||
<DoubleWordsViaRegEx>使用正则表达式 {0} 查找重复词</DoubleWordsViaRegEx>
|
||||
<BeforeSortX>排序之前: {0}</BeforeSortX>
|
||||
<SortedByX>排序方式: {0}</SortedByX>
|
||||
<BeforeAutoBalanceSelectedLines>自动平衡所选行之前</BeforeAutoBalanceSelectedLines>
|
||||
@ -2531,7 +2534,6 @@ Command line: {1} {2}
|
||||
<DownloadMpvOk>mpv 库下载完成,等待启用。</DownloadMpvOk>
|
||||
</SettingsMpv>
|
||||
<SettingsFfmpeg>
|
||||
<XDownload>下载{0}</XDownload>
|
||||
<XDownloadFailed>无法下载{0} - 请稍后再试!</XDownloadFailed>
|
||||
<XDownloadOk>{0}已下载完成,准备就绪</XDownloadOk>
|
||||
</SettingsFfmpeg>
|
||||
@ -2628,7 +2630,7 @@ Command line: {1} {2}
|
||||
<LineMaximumLength>行最大长度</LineMaximumLength>
|
||||
<LineContinuationBeginEndStrings>行延续部分的 开头/末尾 字符串</LineContinuationBeginEndStrings>
|
||||
<NumberOfSplits>分割数量: {0}</NumberOfSplits>
|
||||
<LongestSingleLineIsXAtY>单行最长长度为 {0} 在第 {1} 行</LongestSingleLineIsXAtY>
|
||||
<LongestSingleLineIsXAtY>最长单行的长度为 {0} 在第 {1} 行</LongestSingleLineIsXAtY>
|
||||
<LongestLineIsXAtY>最长总行的长度是 {0} 在第 {1} 行</LongestLineIsXAtY>
|
||||
</SplitLongLines>
|
||||
<SplitSubtitle>
|
||||
@ -2674,7 +2676,7 @@ Command line: {1} {2}
|
||||
<LineLengthMinimum>字幕长度(最短): {0}</LineLengthMinimum>
|
||||
<LineLengthMaximum>字幕长度(最长): {0}</LineLengthMaximum>
|
||||
<LineLengthAverage>字幕长度(平均): {0}</LineLengthAverage>
|
||||
<LinesPerSubtitleAverage>字幕, 平均行数: {0:0.0}</LinesPerSubtitleAverage>
|
||||
<LinesPerSubtitleAverage>平均行数: {0:0.0}</LinesPerSubtitleAverage>
|
||||
<SingleLineLengthMinimum>单行长度(最短): {0}</SingleLineLengthMinimum>
|
||||
<SingleLineLengthMaximum>单行长度(最长): {0}</SingleLineLengthMaximum>
|
||||
<SingleLineLengthAverage>单行长度(平均): {0}</SingleLineLengthAverage>
|
||||
@ -2703,14 +2705,18 @@ Command line: {1} {2}
|
||||
<UpdateDetails>更新详情</UpdateDetails>
|
||||
<Resolution>分辨率</Resolution>
|
||||
<VideoResolution>视频分辨率</VideoResolution>
|
||||
<FromCurrentVideo>从当前视频</FromCurrentVideo>
|
||||
<FromCurrentVideo>取自当前视频</FromCurrentVideo>
|
||||
<Options>选项</Options>
|
||||
<WrapStyle>翻卷样式</WrapStyle>
|
||||
<Collision>冲突</Collision>
|
||||
<ScaleBorderAndShadow>缩放边框和阴影</ScaleBorderAndShadow>
|
||||
<WrapStyle>换行方式</WrapStyle>
|
||||
<Collision>叠加方式</Collision>
|
||||
<ScaleBorderAndShadow>按分辨率比例缩放边框和阴影</ScaleBorderAndShadow>
|
||||
<WrapStyle0>0: 智能换行, 上行较宽</WrapStyle0>
|
||||
<WrapStyle1>1: 在行尾换行, 仅在\N处断行</WrapStyle1>
|
||||
<WrapStyle2>2: 不智能换行, 仅在\n和\N处断行</WrapStyle2>
|
||||
<WrapStyle3>3: 智能换行, 下行较宽</WrapStyle3>
|
||||
</SubStationAlphaProperties>
|
||||
<SubStationAlphaStyles>
|
||||
<Title>高级 Sub Station Alpha 样式</Title>
|
||||
<Title>Advanced Sub Station Alpha 样式</Title>
|
||||
<TitleSubstationAlpha>Sub Station Alpha 样式</TitleSubstationAlpha>
|
||||
<Styles>样式</Styles>
|
||||
<Properties>属性</Properties>
|
||||
@ -2718,7 +2724,7 @@ Command line: {1} {2}
|
||||
<Font>字体</Font>
|
||||
<FontName>字体名称</FontName>
|
||||
<FontSize>字体大小</FontSize>
|
||||
<UseCount>已用</UseCount>
|
||||
<UseCount>使用次数</UseCount>
|
||||
<Primary>主色</Primary>
|
||||
<Secondary>副色</Secondary>
|
||||
<Tertiary>三级色</Tertiary>
|
||||
|
@ -2707,6 +2707,7 @@ can edit in same subtitle file (collaboration)",
|
||||
AlignmentN9 = "Alignment top right - {\\an9}",
|
||||
ColorX = "Color {0} ({1})",
|
||||
CopyTextOnly = "Copy text only to clipboard (selected lines)",
|
||||
CopyPlainText = "Copy plain text to clipboard (selected lines)",
|
||||
CopyTextOnlyFromOriginalToCurrent = "Copy text from original to current",
|
||||
AutoDurationSelectedLines = "Auto-duration (selected lines)",
|
||||
FixRTLViaUnicodeChars = "Fix RTL via Unicode control characters",
|
||||
|
@ -6502,6 +6502,9 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
case "Settings/CopyTextOnly":
|
||||
language.Settings.CopyTextOnly = reader.Value;
|
||||
break;
|
||||
case "Settings/CopyPlainText":
|
||||
language.Settings.CopyPlainText = reader.Value;
|
||||
break;
|
||||
case "Settings/CopyTextOnlyFromOriginalToCurrent":
|
||||
language.Settings.CopyTextOnlyFromOriginalToCurrent = reader.Value;
|
||||
break;
|
||||
|
@ -2560,6 +2560,7 @@
|
||||
public string AlignmentN9 { get; set; }
|
||||
public string ColorX { get; set; }
|
||||
public string CopyTextOnly { get; set; }
|
||||
public string CopyPlainText { get; set; }
|
||||
public string CopyTextOnlyFromOriginalToCurrent { get; set; }
|
||||
public string AutoDurationSelectedLines { get; set; }
|
||||
public string FixRTLViaUnicodeChars { get; set; }
|
||||
|
@ -191,6 +191,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
public Keys MainListViewRemoveBlankLines { get; set; }
|
||||
public Keys MainListViewRemoveTimeCodes { get; set; }
|
||||
public Keys MainListViewCopyText { get; set; }
|
||||
public Keys MainListViewCopyPlainText { get; set; }
|
||||
public Keys MainEditFixRTLViaUnicodeChars { get; set; }
|
||||
public Keys MainEditRemoveRTLUnicodeChars { get; set; }
|
||||
public Keys MainEditReverseStartAndEndingForRtl { get; set; }
|
||||
@ -334,6 +335,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
MainEditReverseStartAndEndingForRtl = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainEditReverseStartAndEndingForRTL);
|
||||
MainToggleVideoControls = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleControls);
|
||||
MainListViewCopyText = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewCopyText);
|
||||
MainListViewCopyPlainText = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewCopyPlainText);
|
||||
MainTextBoxSplitAtCursor = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxSplitAtCursor);
|
||||
MainTextBoxSplitAtCursorAndVideoPos = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxSplitAtCursorAndVideoPos);
|
||||
MainTextBoxSplitSelectedLineBilingual = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxSplitSelectedLineBilingual);
|
||||
|
Loading…
Reference in New Issue
Block a user