robojerk/Libation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rmcrackan:master' into master

Browse source
This commit is contained in:
Mbucari 2022-06-23 11:35:09 -06:00 • committed by GitHub
commit 184ba84600
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/LibationWinForms/Dialogs/AccountsDialog.cs
View file

@ -252,7 +252,7 @@ namespace LibationWinForms.Dialogs
{
MessageBoxLib.ShowAdminAlert(
this,
$"An error occured while exporting account:\r\n{account.AccountName}",
$"An error occurred while exporting account:\r\n{account.AccountName}",
"Error Exporting Account",
ex);
}
@ -294,7 +294,7 @@ namespace LibationWinForms.Dialogs
{
MessageBoxLib.ShowAdminAlert(
this,
$"An error occured while importing an account from:\r\n{ofd.FileName}\r\n\r\nIs the file encrypted?",
$"An error occurred while importing an account from:\r\n{ofd.FileName}\r\n\r\nIs the file encrypted?",
"Error Importing Account",
ex);
}

2
Source/LibationWinForms/Form1.ScanNotification.cs
View file

@ -3,7 +3,7 @@ using ApplicationServices;
namespace LibationWinForms
{
// This is for the Scanning notificationin the upper right. This shown for manual scanning and auto-scan
// This is for the Scanning notification in the upper right. This shown for manual scanning and auto-scan
public partial class Form1
{
private void Configure_ScanNotification()

2
Source/LibationWinForms/LibationWinForms.csproj
View file

@ -29,7 +29,7 @@
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.7.3" />
<PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.2.1" />
<PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.3.1" />
</ItemGroup>
<ItemGroup>

2
Source/LibationWinForms/Program.cs
View file

@ -87,7 +87,7 @@ namespace LibationWinForms
var defaultLibationFilesDir = Configuration.UserProfile;
// check for existing settigns in default location
// check for existing settings in default location
var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
if (Configuration.SettingsFileIsValid(defaultSettingsFile))
config.SetLibationFiles(defaultLibationFilesDir);

2
Source/LibationWinForms/Updater.cs
View file

@ -29,7 +29,7 @@ namespace LibationWinForms
return;
var dialogResult = MessageBox.Show(string.Format(
$"There is a new version avilable. Would you like to update?\r\n\r\nAfter you close Libation, the upgrade will start automatically."),
$"There is a new version available. Would you like to update?\r\n\r\nAfter you close Libation, the upgrade will start automatically."),
"Update Available",
MessageBoxButtons.YesNo,
MessageBoxIcon.Information);