diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 3ffdcee..d306b75 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index e442349..5bd7d30 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 68f3fe7..38a450e 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -533,7 +533,7 @@ Partial Class Einstellungen Me.CB_Merge.FormattingEnabled = True Me.CB_Merge.IntegralHeight = False Me.CB_Merge.ItemHeight = 23 - Me.CB_Merge.Items.AddRange(New Object() {"[Merge Disabeld]"}) + Me.CB_Merge.Items.AddRange(New Object() {"[merge disabled]"}) Me.CB_Merge.Location = New System.Drawing.Point(265, 25) Me.CB_Merge.Name = "CB_Merge" Me.CB_Merge.Size = New System.Drawing.Size(175, 29) diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 4c84cac..8c4f82a 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -1230,14 +1230,14 @@ Public Class Einstellungen ElseIf CB_Format.Text = "MP4" Then CB_Merge.SelectedIndex = 0 CB_Merge.Items.Clear() - CB_Merge.Items.Add("[Merge Disabeld]") 'mov_text + CB_Merge.Items.Add("[merge disabled]") 'mov_text CB_Merge.Items.Add("mov_text") 'CB_Merge.Items.Add("srt") CB_Merge.SelectedItem = Main.MergeSubsFormat ElseIf CB_Format.Text = "MKV" Then CB_Merge.SelectedIndex = 0 CB_Merge.Items.Clear() - CB_Merge.Items.Add("[Merge Disabeld]") + CB_Merge.Items.Add("[merge disabled]") CB_Merge.Items.Add("copy") CB_Merge.Items.Add("srt") CB_Merge.SelectedItem = Main.MergeSubsFormat