Don't trigger "Save as..." after "Import with manually chosen encoding" + fix text - thx OmrSi :)

Fix #3502
This commit is contained in:
niksedk 2019-03-28 06:33:07 +01:00
parent d98d65ebba
commit b427ce2044
4 changed files with 3 additions and 4 deletions

View File

@ -957,7 +957,7 @@ Go to "Options -> Settings -> Tools" to enter your Google translate API ke
<ImportBluRaySupFile>Import/OCR Blu-ray (.sup) subtitle file...</ImportBluRaySupFile>
<ImportXSub>Import/OCR XSub from divx/avi...</ImportXSub>
<ImportSubtitleFromMatroskaFile>Import subtitle from Matroska (.mkv) file...</ImportSubtitleFromMatroskaFile>
<ImportSubtitleWithManualChosenEncoding>Import subtitle with manual chosen encoding...</ImportSubtitleWithManualChosenEncoding>
<ImportSubtitleWithManualChosenEncoding>Import subtitle with manually chosen encoding...</ImportSubtitleWithManualChosenEncoding>
<ImportText>Import plain text...</ImportText>
<ImportImages>Import images...</ImportImages>
<ImportTimecodes>Import time codes...</ImportTimecodes>

View File

@ -1446,7 +1446,7 @@ namespace Nikse.SubtitleEdit.Core
ImportBluRaySupFile = "Import/OCR Blu-ray (.sup) subtitle file...",
ImportXSub = "Import/OCR XSub from divx/avi...",
ImportSubtitleFromMatroskaFile = "Import subtitle from Matroska (.mkv) file...",
ImportSubtitleWithManualChosenEncoding = "Import subtitle with manual chosen encoding...",
ImportSubtitleWithManualChosenEncoding = "Import subtitle with manually chosen encoding...",
ImportText = "Import plain text...",
ImportImages = "Import images...",
ImportTimecodes = "Import time codes...",

View File

@ -1205,7 +1205,7 @@
//
this.toolStripMenuItemManualAnsi.Name = "toolStripMenuItemManualAnsi";
this.toolStripMenuItemManualAnsi.Size = new System.Drawing.Size(330, 22);
this.toolStripMenuItemManualAnsi.Text = "Import subtitle with manual chosen encoding...";
this.toolStripMenuItemManualAnsi.Text = "Import subtitle with manually chosen encoding...";
this.toolStripMenuItemManualAnsi.Click += new System.EventHandler(this.ToolStripMenuItemManualAnsiClick);
//
// toolStripMenuItemImportText

View File

@ -12783,7 +12783,6 @@ namespace Nikse.SubtitleEdit.Forms
Encoding encoding = chooseEncoding.GetEncoding();
SetEncoding(Encoding.UTF8);
OpenSubtitle(openFileDialog1.FileName, encoding);
_converted = true;
}
}
}