Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions OpenUtau/Strings/Strings.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ OpenUtau aims to be an open source editing environment for UTAU community, with
<system:String x:Key="menu.view">View</system:String>

<system:String x:Key="mergevoicebank.back">Back</system:String>
<system:String x:Key="mergevoicebank.error">Failed to merge singer.</system:String>
<system:String x:Key="mergevoicebank.merge">Merge</system:String>
<system:String x:Key="mergevoicebank.next">Next</system:String>
<system:String x:Key="mergevoicebank.selectsinger">This tool will merge another voicebank into current voicebank as new voice colors.
Expand Down
7 changes: 3 additions & 4 deletions OpenUtau/ViewModels/MergeVoicebankViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Serilog;
using Serilog;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
Expand Down Expand Up @@ -335,9 +335,8 @@ void AddFolder(string fromDir, string toDir)
using (var stream = File.Open(yamlFile, FileMode.Create)) {
bankConfig.Save(stream);
}

} catch (Exception e) {
var customEx = new MessageCustomizableException("Failed to merge voicebank", "<translate:errors.failed.merge>: voicebank", e);
var customEx = new MessageCustomizableException("Failed to merge singer", "<translate:mergevoicebank.error>", e);
DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(customEx));
} finally {
new Task(() =>
Expand All @@ -349,4 +348,4 @@ void AddFolder(string fromDir, string toDir)
});
}
}
}
}
Loading