mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 15:02:35 +01:00
Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit
This commit is contained in:
commit
462dd3f04f
@ -15,6 +15,7 @@
|
||||
* Allow larger "margin" in SSA/ASSA styles - thx von Suppé
|
||||
* Export to images alignment option "Center, left justify" - thx Shota
|
||||
* Add "only if on separate line" option for "Remove interjections" - thx darnn
|
||||
* Start with uppercase letter after title in "Change casing" - thx 791
|
||||
* FIXED:
|
||||
* Fix Ctrl+v of time code in "Time code control" (regr. from 3.5.5) - thx Mohammed
|
||||
* Fix for format "TTML draft 2006-10" - thx thehulk
|
||||
@ -25,6 +26,7 @@
|
||||
* Fix missing color tag for EBU STL - thx Tom
|
||||
* Fix for null terminated text from mkv - thx taxen/mkver
|
||||
* Fix focus after Alt+3/4 (previous/next) - thx Jamakmake
|
||||
* Fix possible crash in "Save original as..." - thx darnn
|
||||
|
||||
|
||||
3.5.5 (26th January 2018)
|
||||
|
@ -1,4 +1,5 @@
|
||||
<OCRFixReplaceList>
|
||||
<!-- ova skripta stvorena je isključivo za mijenjanje riječi bez kvačica u riječi sa kvačicama -->
|
||||
<WholeWords>
|
||||
<Word from="andele" to="anđele" />
|
||||
<Word from="andeli" to="anđeli" />
|
||||
@ -878,7 +879,6 @@
|
||||
<Word from="vrtic" to="vrtić" />
|
||||
<Word from="vrtica" to="vrtića" />
|
||||
<Word from="vrticu" to="vrtiću" />
|
||||
|
||||
<!--z-->
|
||||
<Word from="zaduzen" to="zadužen" />
|
||||
<Word from="Zaduzen" to="Zadužen" />
|
||||
@ -921,6 +921,7 @@
|
||||
<PartialWords />
|
||||
<PartialLines>
|
||||
<LinePart from="da nadjem" to="naći" />
|
||||
<LinePart from="da nadjes" to="naći" />
|
||||
<LinePart from="da budes" to="biti" />
|
||||
<LinePart from="da ides" to="ići" />
|
||||
<LinePart from="gdje ides" to="kamo ideš" />
|
||||
@ -1228,7 +1229,7 @@
|
||||
<RegEx find="redjas" replaceWith="rijaš" />
|
||||
<RegEx find="redlaz" replaceWith="redlaž" />
|
||||
<RegEx find="(?<![Šš])([pP])rica" replaceWith="$1riča" />
|
||||
<RegEx find="\b([pP])rilicn" replaceWith="$1riličn" />
|
||||
<RegEx find="rilicn" replaceWith="riličn" />
|
||||
<RegEx find="romj?enis" replaceWith="romijeniš" />
|
||||
<RegEx find="([pP](?:ri|od))sj?eca" replaceWith="$1sjeća" />
|
||||
<RegEx find="rosj?ec" replaceWith="rosječ" />
|
||||
@ -1252,7 +1253,7 @@
|
||||
<RegEx find="\b([rR])i?j?ecni([kc])" replaceWith="$1ječni$2" />
|
||||
<RegEx find="(?<!t)rocita" replaceWith="ročita" />
|
||||
<RegEx find="([dDrRvVg])odje" replaceWith="$1ođe" />
|
||||
<RegEx find="([rR])ucak" replaceWith="$1učak" />
|
||||
<RegEx find="(?<![Cc])ucak" replaceWith="učak" />
|
||||
<RegEx find="ruce" replaceWith="ruče" />
|
||||
<RegEx find="rucio" replaceWith="ručio" />
|
||||
<RegEx find="arud[zž]bin" replaceWith="arudžb" />
|
||||
@ -1541,7 +1542,6 @@
|
||||
<RegEx find="rucin" replaceWith="rućin" />
|
||||
<RegEx find="([lr])adj" replaceWith="$1ađ" />
|
||||
<RegEx find="redje([nm])" replaceWith="ređe$1" />
|
||||
<RegEx find="rocit" replaceWith="ročit" />
|
||||
<RegEx find="ronad" replaceWith="ronađ" />
|
||||
<RegEx find="([KkPp])renes\b" replaceWith="$1reneš" />
|
||||
<RegEx find="sapni" replaceWith="šapni" />
|
@ -8,7 +8,7 @@
|
||||
<Word from="ćmo" to="ćemo" />
|
||||
<Word from="ćte" to="ćete" />
|
||||
<Word from="čemo" to="ćemo" />
|
||||
<Word from="čete" to="čete" />
|
||||
<Word from="čete" to="ćete" />
|
||||
<Word from="djete" to="dijete" />
|
||||
<Word from="Hey" to="Hej" />
|
||||
<Word from="hey" to="hej" />
|
||||
@ -157,6 +157,10 @@
|
||||
<RegEx find="([ks]ao)\.:" replaceWith="$1:" />
|
||||
<RegEx find="(?<=[a-zčđšž])Ij(?=[a-zčđšž])" replaceWith="lj" />
|
||||
<RegEx find="(?<=[^A-ZČĐŠŽa-zčđšž])Iju(?=bav|d|t)" replaceWith="lju" />
|
||||
<!-- 10kg » 10 kg | 20cm » 20 cm | 44dag » 44 dag -->
|
||||
<RegEx find="\b(\d+)([a-z]{2,4})\b" replaceWith="$1 $2" />
|
||||
<!-- 10m » 10 m -->
|
||||
<RegEx find="([\d]){1}?m" replaceWith="$1 m" />
|
||||
<!-- kad ima razmak između tagova </i> <i> -->
|
||||
<!-- <RegEx find="(>) +(<)" replaceWith="$1$2" /> -->
|
||||
<!-- ',"' to '",' -->
|
||||
|
@ -2031,6 +2031,7 @@ can edit in same subtitle file (collaboration)</Information>
|
||||
<EditWholeText>Edit whole text</EditWholeText>
|
||||
<EditWordOnly>Edit word only</EditWordOnly>
|
||||
<AddXToNames>Add '{0}' to name list</AddXToNames>
|
||||
<AddXToUserDictionary>Add '{0}' to user dictionary</AddXToUserDictionary>
|
||||
<AutoFixNames>Auto fix names where only casing differ</AutoFixNames>
|
||||
<CheckOneLetterWords>Prompt for unknown one letter words</CheckOneLetterWords>
|
||||
<TreatINQuoteAsING>Treat word ending " in' " as " ing " (English only)</TreatINQuoteAsING>
|
||||
|
@ -30,11 +30,11 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
|
||||
// Ssa Tags
|
||||
if (text.StartsWith("{\\", StringComparison.Ordinal))
|
||||
{
|
||||
var endIDx = text.IndexOf('}', 2);
|
||||
if (endIDx > 2)
|
||||
var endIdx = text.IndexOf('}', 2);
|
||||
if (endIdx > 2)
|
||||
{
|
||||
pre = text.Substring(0, endIDx + 1);
|
||||
text = text.Remove(0, endIDx + 1);
|
||||
pre = text.Substring(0, endIdx + 1);
|
||||
text = text.Remove(0, endIdx + 1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -106,11 +106,11 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
|
||||
{
|
||||
Paragraph p = subtitle.Paragraphs[i];
|
||||
var text = HtmlUtil.RemoveHtmlTags(p.Text, true).Trim();
|
||||
if (callbacks.AllowFix(p, fixAction0) && string.IsNullOrEmpty(text))
|
||||
if (callbacks.AllowFix(p, fixAction0) && string.IsNullOrEmpty(text.RemoveControlCharacters()))
|
||||
{
|
||||
subtitle.Paragraphs.RemoveAt(i);
|
||||
emptyLinesRemoved++;
|
||||
callbacks.AddFixToListView(p, fixAction0, p.Text, string.Format("[{0}]", language.RemovedEmptyLine));
|
||||
callbacks.AddFixToListView(p, fixAction0, p.Text, $"[{language.RemovedEmptyLine}]");
|
||||
callbacks.AddToDeleteIndices(i);
|
||||
}
|
||||
}
|
||||
|
@ -2327,6 +2327,7 @@ can edit in same subtitle file (collaboration)",
|
||||
EditWholeText = "Edit whole text",
|
||||
EditWordOnly = "Edit word only",
|
||||
AddXToNames = "Add '{0}' to name list",
|
||||
AddXToUserDictionary = "Add '{0}' to user dictionary",
|
||||
AutoFixNames = "Auto fix names where only casing differ",
|
||||
CheckOneLetterWords = "Prompt for unknown one letter words",
|
||||
TreatINQuoteAsING = "Treat word ending \" in' \" as \" ing \" (English only)",
|
||||
|
@ -5506,6 +5506,9 @@ namespace Nikse.SubtitleEdit.Core
|
||||
case "SpellCheck/AddXToNames":
|
||||
language.SpellCheck.AddXToNames = reader.Value;
|
||||
break;
|
||||
case "SpellCheck/AddXToUserDictionary":
|
||||
language.SpellCheck.AddXToUserDictionary = reader.Value;
|
||||
break;
|
||||
case "SpellCheck/AutoFixNames":
|
||||
language.SpellCheck.AutoFixNames = reader.Value;
|
||||
break;
|
||||
|
@ -2206,6 +2206,7 @@
|
||||
public string EditWholeText { get; set; }
|
||||
public string EditWordOnly { get; set; }
|
||||
public string AddXToNames { get; set; }
|
||||
public string AddXToUserDictionary { get; set; }
|
||||
public string AutoFixNames { get; set; }
|
||||
public string CheckOneLetterWords { get; set; }
|
||||
public string TreatINQuoteAsING { get; set; }
|
||||
|
@ -458,7 +458,7 @@ namespace Nikse.SubtitleEdit.Core
|
||||
for (int i = _paragraphs.Count - 1; i >= 0; i--)
|
||||
{
|
||||
Paragraph p = _paragraphs[i];
|
||||
if (string.IsNullOrWhiteSpace(p.Text))
|
||||
if (string.IsNullOrWhiteSpace(p.Text.RemoveControlCharacters()))
|
||||
_paragraphs.RemoveAt(i);
|
||||
}
|
||||
if (count != _paragraphs.Count)
|
||||
|
32
src/Forms/SpellCheck.Designer.cs
generated
32
src/Forms/SpellCheck.Designer.cs
generated
@ -34,6 +34,7 @@
|
||||
this.buttonUseSuggestionAlways = new System.Windows.Forms.Button();
|
||||
this.buttonAddToNames = new System.Windows.Forms.Button();
|
||||
this.groupBoxWordNotFound = new System.Windows.Forms.GroupBox();
|
||||
this.buttonGoogleIt = new System.Windows.Forms.Button();
|
||||
this.buttonUndo = new System.Windows.Forms.Button();
|
||||
this.groupBoxSuggestions = new System.Windows.Forms.GroupBox();
|
||||
this.checkBoxAutoChangeNames = new System.Windows.Forms.CheckBox();
|
||||
@ -44,7 +45,7 @@
|
||||
this.textBoxWholeText = new System.Windows.Forms.TextBox();
|
||||
this.labelActionInfo = new System.Windows.Forms.Label();
|
||||
this.buttonSpellCheckDownload = new System.Windows.Forms.Button();
|
||||
this.buttonGoogleIt = new System.Windows.Forms.Button();
|
||||
this.addXToUserDictionaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.contextMenuStrip1.SuspendLayout();
|
||||
this.groupBoxWordNotFound.SuspendLayout();
|
||||
this.groupBoxSuggestions.SuspendLayout();
|
||||
@ -108,9 +109,10 @@
|
||||
// contextMenuStrip1
|
||||
//
|
||||
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.addXToNamesnoiseListToolStripMenuItem});
|
||||
this.addXToNamesnoiseListToolStripMenuItem,
|
||||
this.addXToUserDictionaryToolStripMenuItem});
|
||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||
this.contextMenuStrip1.Size = new System.Drawing.Size(208, 26);
|
||||
this.contextMenuStrip1.Size = new System.Drawing.Size(208, 70);
|
||||
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStrip1Opening);
|
||||
//
|
||||
// addXToNamesnoiseListToolStripMenuItem
|
||||
@ -247,6 +249,16 @@
|
||||
this.groupBoxWordNotFound.TabStop = false;
|
||||
this.groupBoxWordNotFound.Text = "Word not found";
|
||||
//
|
||||
// buttonGoogleIt
|
||||
//
|
||||
this.buttonGoogleIt.Location = new System.Drawing.Point(6, 158);
|
||||
this.buttonGoogleIt.Name = "buttonGoogleIt";
|
||||
this.buttonGoogleIt.Size = new System.Drawing.Size(280, 21);
|
||||
this.buttonGoogleIt.TabIndex = 7;
|
||||
this.buttonGoogleIt.Text = "&Google it";
|
||||
this.buttonGoogleIt.UseVisualStyleBackColor = true;
|
||||
this.buttonGoogleIt.Click += new System.EventHandler(this.buttonGoogleIt_Click);
|
||||
//
|
||||
// buttonUndo
|
||||
//
|
||||
this.buttonUndo.Location = new System.Drawing.Point(6, 185);
|
||||
@ -357,15 +369,12 @@
|
||||
this.buttonSpellCheckDownload.UseVisualStyleBackColor = true;
|
||||
this.buttonSpellCheckDownload.Click += new System.EventHandler(this.buttonSpellCheckDownload_Click);
|
||||
//
|
||||
// buttonGoogleIt
|
||||
// addXToUserDictionaryToolStripMenuItem
|
||||
//
|
||||
this.buttonGoogleIt.Location = new System.Drawing.Point(6, 158);
|
||||
this.buttonGoogleIt.Name = "buttonGoogleIt";
|
||||
this.buttonGoogleIt.Size = new System.Drawing.Size(280, 21);
|
||||
this.buttonGoogleIt.TabIndex = 7;
|
||||
this.buttonGoogleIt.Text = "&Google it";
|
||||
this.buttonGoogleIt.UseVisualStyleBackColor = true;
|
||||
this.buttonGoogleIt.Click += new System.EventHandler(this.buttonGoogleIt_Click);
|
||||
this.addXToUserDictionaryToolStripMenuItem.Name = "addXToUserDictionaryToolStripMenuItem";
|
||||
this.addXToUserDictionaryToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
|
||||
this.addXToUserDictionaryToolStripMenuItem.Text = "Add x to user dictionary";
|
||||
this.addXToUserDictionaryToolStripMenuItem.Click += new System.EventHandler(this.AddXToUserDictionaryToolStripMenuItem_Click);
|
||||
//
|
||||
// SpellCheck
|
||||
//
|
||||
@ -437,5 +446,6 @@
|
||||
private System.Windows.Forms.Button buttonSpellCheckDownload;
|
||||
private System.Windows.Forms.Button buttonUndo;
|
||||
private System.Windows.Forms.Button buttonGoogleIt;
|
||||
private System.Windows.Forms.ToolStripMenuItem addXToUserDictionaryToolStripMenuItem;
|
||||
}
|
||||
}
|
@ -358,6 +358,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
string word = richTextBoxParagraph.SelectedText.Trim();
|
||||
addXToNamesnoiseListToolStripMenuItem.Text = string.Format(Configuration.Settings.Language.SpellCheck.AddXToNames, word);
|
||||
addXToUserDictionaryToolStripMenuItem.Text = string.Format(Configuration.Settings.Language.SpellCheck.AddXToUserDictionary, word);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -374,6 +375,15 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
private void AddXToUserDictionaryToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(richTextBoxParagraph.SelectedText))
|
||||
{
|
||||
ChangeWord = richTextBoxParagraph.SelectedText.Trim();
|
||||
DoAction(SpellCheckAction.AddToDictionary);
|
||||
}
|
||||
}
|
||||
|
||||
private void CheckBoxAutoChangeNamesCheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (textBoxWord.Text.Length < 2)
|
||||
@ -1085,6 +1095,5 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (!string.IsNullOrWhiteSpace(text))
|
||||
System.Diagnostics.Process.Start("https://www.google.com/search?q=" + Utilities.UrlEncode(text));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user