diff --git a/src/Forms/ChangeFrameRate.cs b/src/Forms/ChangeFrameRate.cs index c1bfe9570..d21bd96f2 100644 --- a/src/Forms/ChangeFrameRate.cs +++ b/src/Forms/ChangeFrameRate.cs @@ -57,7 +57,7 @@ namespace Nikse.SubtitleEdit.Forms { openFileDialog1.Title = Configuration.Settings.Language.General.OpenVideoFileTitle; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(false); openFileDialog1.FileName = string.Empty; if (openFileDialog1.ShowDialog() == DialogResult.OK) { diff --git a/src/Forms/ChooseResolution.cs b/src/Forms/ChooseResolution.cs index e5389bcf6..6cc2f1903 100644 --- a/src/Forms/ChooseResolution.cs +++ b/src/Forms/ChooseResolution.cs @@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Forms { openFileDialog1.Title = Configuration.Settings.Language.General.OpenVideoFileTitle; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(false); openFileDialog1.FileName = string.Empty; if (openFileDialog1.ShowDialog() == DialogResult.OK) { diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 1c37c120c..2a09dba37 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -3633,7 +3633,7 @@ namespace Nikse.SubtitleEdit.Forms { openFileDialog1.Title = _language.OpenVideoFile; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(false); if (openFileDialog1.ShowDialog(this) == DialogResult.OK) { _videoFileName = openFileDialog1.FileName; @@ -12002,7 +12002,8 @@ namespace Nikse.SubtitleEdit.Forms openFileDialog1.InitialDirectory = Path.GetDirectoryName(_fileName); openFileDialog1.Title = Configuration.Settings.Language.General.OpenVideoFileTitle; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(true); + openFileDialog1.FileName = string.Empty; if (openFileDialog1.ShowDialog() == DialogResult.OK) { @@ -13192,7 +13193,7 @@ namespace Nikse.SubtitleEdit.Forms { string fileName = files[0]; string ext = Path.GetExtension(fileName).ToLower(); - if (Utilities.GetVideoFileFilter().Contains(ext)) + if (Utilities.GetVideoFileFilter(true).Contains(ext)) { OpenVideo(fileName); } diff --git a/src/Forms/SetSyncPoint.cs b/src/Forms/SetSyncPoint.cs index a0dee3d7a..c17aaea3c 100644 --- a/src/Forms/SetSyncPoint.cs +++ b/src/Forms/SetSyncPoint.cs @@ -102,7 +102,7 @@ namespace Nikse.SubtitleEdit.Forms { openFileDialog1.Title = Configuration.Settings.Language.General.OpenVideoFileTitle; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(false); openFileDialog1.FileName = string.Empty; if (openFileDialog1.ShowDialog() == DialogResult.OK) { diff --git a/src/Forms/SplitSubtitle.cs b/src/Forms/SplitSubtitle.cs index 9ea20e46d..1e1a8e94c 100644 --- a/src/Forms/SplitSubtitle.cs +++ b/src/Forms/SplitSubtitle.cs @@ -149,7 +149,7 @@ namespace Nikse.SubtitleEdit.Forms openFileDialog1.Title = Configuration.Settings.Language.General.OpenVideoFileTitle; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(true); openFileDialog1.FileName = string.Empty; if (openFileDialog1.ShowDialog() == DialogResult.OK) { diff --git a/src/Forms/SubStationAlphaProperties.cs b/src/Forms/SubStationAlphaProperties.cs index 47ffb8fda..3e17e1764 100644 --- a/src/Forms/SubStationAlphaProperties.cs +++ b/src/Forms/SubStationAlphaProperties.cs @@ -250,7 +250,7 @@ namespace Nikse.SubtitleEdit.Forms { openFileDialog1.Title = Configuration.Settings.Language.General.OpenVideoFileTitle; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(false); openFileDialog1.FileName = string.Empty; if (string.IsNullOrEmpty(openFileDialog1.InitialDirectory) && !string.IsNullOrEmpty(_videoFileName)) { diff --git a/src/Forms/VisualSync.cs b/src/Forms/VisualSync.cs index 882ebfbdd..3ce75adf2 100644 --- a/src/Forms/VisualSync.cs +++ b/src/Forms/VisualSync.cs @@ -483,7 +483,7 @@ namespace Nikse.SubtitleEdit.Forms openFileDialog1.InitialDirectory = Path.GetDirectoryName(_subtitleFileName); openFileDialog1.Title = _languageGeneral.OpenVideoFileTitle; openFileDialog1.FileName = string.Empty; - openFileDialog1.Filter = Utilities.GetVideoFileFilter(); + openFileDialog1.Filter = Utilities.GetVideoFileFilter(true); openFileDialog1.FileName = string.Empty; if (openFileDialog1.ShowDialog() == DialogResult.OK) { diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs index 18752f955..b6df583ff 100644 --- a/src/Logic/Language.cs +++ b/src/Logic/Language.cs @@ -113,6 +113,7 @@ namespace Nikse.SubtitleEdit.Logic SubtitleFiles = "Subtitle files", AllFiles = "All files", VideoFiles = "Video files", + AudioFiles = "Audio files", OpenSubtitle = "Open subtitle...", OpenVideoFile = "Open video file...", OpenVideoFileTitle = "Open video file...", diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs index c3be691bf..bd2b188a9 100644 --- a/src/Logic/LanguageStructure.cs +++ b/src/Logic/LanguageStructure.cs @@ -19,6 +19,7 @@ public string SubtitleFiles { get; set; } public string AllFiles { get; set; } public string VideoFiles { get; set; } + public string AudioFiles { get; set; } public string OpenSubtitle { get; set; } public string OpenVideoFile { get; set; } public string OpenVideoFileTitle { get; set; } diff --git a/src/Logic/Utilities.cs b/src/Logic/Utilities.cs index 9b3fa878a..8a7b3de44 100644 --- a/src/Logic/Utilities.cs +++ b/src/Logic/Utilities.cs @@ -160,7 +160,7 @@ namespace Nikse.SubtitleEdit.Logic return new List { ".avi", ".mkv", ".wmv", ".mpg", ".mpeg", ".divx", ".mp4", ".asf", ".flv", ".mov", ".m4v", ".vob", ".ogv", ".webm", ".ts", ".m2ts" }; } - public static string GetVideoFileFilter() + public static string GetVideoFileFilter(bool includeAudioFiles) { var sb = new StringBuilder(); sb.Append(Configuration.Settings.Language.General.VideoFiles + "|"); @@ -172,6 +172,8 @@ namespace Nikse.SubtitleEdit.Logic sb.Append("*" + extension); i++; } + if (includeAudioFiles && !string.IsNullOrEmpty(Configuration.Settings.Language.General.AudioFiles)) + sb.Append("|" + Configuration.Settings.Language.General.AudioFiles + "|*.mp3;*.wav;*.wma;*.ogg;*.mpa;*.ape;*.aiff;*.flac;*.aac"); sb.Append("|" + Configuration.Settings.Language.General.AllFiles + "|*.*"); return sb.ToString(); } diff --git a/src/Resources/OpenOfficeDictionaries.xml b/src/Resources/OpenOfficeDictionaries.xml index de6943d1a..5e4e29fca 100644 --- a/src/Resources/OpenOfficeDictionaries.xml +++ b/src/Resources/OpenOfficeDictionaries.xml @@ -83,6 +83,12 @@ http://numbertext.org/tmp/dict-en.oxt All English dictionaries (AU, CA, GB, US, ZA) + + Farsi (Persian) + Persian/Farsi + http://downloads.sourceforge.net/project/aoo-extensions/2359/1/dict-fa.oxt?r=http%3A%2F%2Fextensions.openoffice.org%2Fen%2Fproject%2Fpersian-spellchecker-dictionary&ts=1374091518&use_mirror=garr + Farsi + French Français @@ -203,6 +209,18 @@ http://extensions.libreoffice.org/extension-center/lower-sorbian-dictionary/releases/1.4.6/lower_sorbian_spelling_dictionary-1.4.6.oxt Lower Sorbian dictionary 1.4.6 + + Malay + Malay + http://ftp.sunet.se/pub/Office/OpenOffice.org/contrib/dictionaries/ms_MY.zip + Malay Spellchecker v0.1 - 07/10/04 + + + Macedonian + Macedonian + http://ftp.sunet.se/pub/Office/OpenOffice.org/contrib/dictionaries/mk_MK.zip + Macedonian dictionary was created by Taras Bendik + Norwegian Norsk @@ -221,6 +239,12 @@ http://extensions.libreoffice.org/extension-center/vero-verificador-ortografico-e-hifenizador-em-portugues-do-brasil/pscreleasefolder.2012-01-04.1563120832/2.1/vero_pt_br_v210aoc.oxt VERO - VERificador Ortográfico e hifenizador em Português do Brasil 2.1 + + Portuguese (Portugal) + Português + http://ftp.sunet.se/pub/Office/OpenOffice.org/contrib/dictionaries/pt_PT.zip + Versão 20.5.2002 + Romanian română diff --git a/src/Resources/OpenOfficeDictionaries.xml.zip b/src/Resources/OpenOfficeDictionaries.xml.zip index 58c601548..9ca9c16f1 100644 Binary files a/src/Resources/OpenOfficeDictionaries.xml.zip and b/src/Resources/OpenOfficeDictionaries.xml.zip differ