From 67bf3487a0e982de4543f92b6ce638c09bbcebc7 Mon Sep 17 00:00:00 2001
From: Chernykh Aleksandr <dernet4@gmail.com>
Date: Fri, 5 Dec 2025 00:13:02 +0300
Subject: [PATCH 1/4] PasswordDialogWindow

---
 src/KeyKeeper/PasswordDialog.axaml      | 30 +++++++++++++++++++++
 src/KeyKeeper/PasswordDialog.axaml.cs   | 36 +++++++++++++++++++++++++
 src/KeyKeeper/Views/MainWindow.axaml.cs | 23 ++++++++++++----
 3 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 src/KeyKeeper/PasswordDialog.axaml
 create mode 100644 src/KeyKeeper/PasswordDialog.axaml.cs

diff --git a/src/KeyKeeper/PasswordDialog.axaml b/src/KeyKeeper/PasswordDialog.axaml
new file mode 100644
index 0000000..5435275
--- /dev/null
+++ b/src/KeyKeeper/PasswordDialog.axaml
@@ -0,0 +1,30 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="KeyKeeper.Views.PasswordDialog"
+        Title="Создание хранилища"
+        Width="300"
+        Height="200">
+    
+    <StackPanel Margin="20" VerticalAlignment="Center">
+        
+        <TextBlock Text="Введите мастер-пароль:" Margin="0,0,0,5"/>
+        <TextBox x:Name="PasswordBox" 
+                 Margin="0,0,0,15"/>
+        
+        <TextBlock Text="Подтвердите пароль:" Margin="0,0,0,5"/>
+        <TextBox x:Name="ConfirmBox" 
+                 Margin="0,0,0,20"/>
+        
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
+            <Button Content="Отмена" 
+                    Width="80"
+                    Click="OnCancelClick"/>
+            
+            <Button Content="Создать" 
+                    Width="80"
+                    Click="OnCreateClick"/>
+        </StackPanel>
+        
+    </StackPanel>
+    
+</Window>
\ No newline at end of file
diff --git a/src/KeyKeeper/PasswordDialog.axaml.cs b/src/KeyKeeper/PasswordDialog.axaml.cs
new file mode 100644
index 0000000..9374128
--- /dev/null
+++ b/src/KeyKeeper/PasswordDialog.axaml.cs
@@ -0,0 +1,36 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace KeyKeeper.Views
+{
+    public partial class PasswordDialog : Window
+    {
+        public string Password { get; private set; } = "";
+        public bool Created { get; private set; } = false;
+
+        public PasswordDialog()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void OnCreateClick(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var passwordBox = this.FindControl<TextBox>("PasswordBox");
+            Password = passwordBox?.Text ?? "";
+            Created = true;
+            Close();
+        }
+
+        private void OnCancelClick(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            Created = false;
+            Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/MainWindow.axaml.cs b/src/KeyKeeper/Views/MainWindow.axaml.cs
index b55c457..58f1cb7 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml.cs
+++ b/src/KeyKeeper/Views/MainWindow.axaml.cs
@@ -21,6 +21,7 @@ namespace KeyKeeper.Views
 
         private async void CreateNewVault_Click(object sender, RoutedEventArgs e)
         {
+            // 1. Открываем проводник
             var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
             {
                 Title = "Создать новое хранилище паролей",
@@ -39,12 +40,24 @@ namespace KeyKeeper.Views
             {
                 if (file.TryGetLocalPath() is string path)
                 {
-                    (DataContext as MainWindowViewModel)!.CreateVault(path);
-                    OpenRepositoryWindow(new PassStoreFileAccessor(path, true, new StoreCreationOptions()
+                    // 2. Открываем окно с паролем
+                    var passwordDialog = new PasswordDialog();
+                    await passwordDialog.ShowDialog(this);
+
+                    // 3. Если нажали "Создать"
+                    if (passwordDialog.Created)
                     {
-                        Key = new PasswordStore.Crypto.CompositeKey("blablabla", null),
-                        LockTimeoutSeconds = 800,
-                    }));
+                        // 4. Создаем хранилище с паролем
+                        var compositeKey = new PasswordStore.Crypto.CompositeKey(passwordDialog.Password, null);
+                        (DataContext as MainWindowViewModel)!.CreateVault(path);
+
+                        // 5. Открываем окно хранилища
+                        OpenRepositoryWindow(new PassStoreFileAccessor(path, true, new StoreCreationOptions()
+                        {
+                            Key = compositeKey,
+                            LockTimeoutSeconds = 800,
+                        }));
+                    }
                 }
             }
         }

From 77b3aba94fecdb4f199a0b31ec1bdb022724c4ce Mon Sep 17 00:00:00 2001
From: Chernykh Aleksandr <dernet4@gmail.com>
Date: Fri, 5 Dec 2025 01:02:53 +0300
Subject: [PATCH 2/4] commit

---
 src/KeyKeeper/PasswordEntryDialog.axaml    | 18 +++++
 src/KeyKeeper/PasswordEntryDialog.axaml.cs | 36 ++++++++++
 src/KeyKeeper/RepositoryWindow.axaml.cs    | 14 ++--
 src/KeyKeeper/Views/MainWindow.axaml.cs    | 77 ++++++++++++----------
 4 files changed, 107 insertions(+), 38 deletions(-)
 create mode 100644 src/KeyKeeper/PasswordEntryDialog.axaml
 create mode 100644 src/KeyKeeper/PasswordEntryDialog.axaml.cs

diff --git a/src/KeyKeeper/PasswordEntryDialog.axaml b/src/KeyKeeper/PasswordEntryDialog.axaml
new file mode 100644
index 0000000..6481f11
--- /dev/null
+++ b/src/KeyKeeper/PasswordEntryDialog.axaml
@@ -0,0 +1,18 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="KeyKeeper.PasswordEntryDialog"
+        Title="Введите пароль"
+        Width="300"
+        Height="180">
+    
+    <StackPanel Margin="20" VerticalAlignment="Center">
+        <TextBlock Text="Введите мастер-пароль:" Margin="0,0,0,15"/>
+        <TextBox x:Name="PasswordBox" Margin="0,0,0,20"/>
+        
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
+            <Button Content="Отмена" Width="80" Click="CancelButton_Click"/>
+            <Button Content="Открыть" Width="80" Click="OpenButton_Click"/>
+        </StackPanel>
+    </StackPanel>
+    
+</Window>
\ No newline at end of file
diff --git a/src/KeyKeeper/PasswordEntryDialog.axaml.cs b/src/KeyKeeper/PasswordEntryDialog.axaml.cs
new file mode 100644
index 0000000..612c416
--- /dev/null
+++ b/src/KeyKeeper/PasswordEntryDialog.axaml.cs
@@ -0,0 +1,36 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace KeyKeeper
+{
+    public partial class PasswordEntryDialog : Window
+    {
+        public string Password { get; private set; } = "";
+        public bool Opened { get; private set; } = false;
+
+        public PasswordEntryDialog()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void OpenButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var passwordBox = this.FindControl<TextBox>("PasswordBox");
+            Password = passwordBox?.Text ?? "";
+            Opened = true;
+            Close();
+        }
+
+        private void CancelButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            Opened = false;
+            Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/KeyKeeper/RepositoryWindow.axaml.cs b/src/KeyKeeper/RepositoryWindow.axaml.cs
index 5bb3fc9..1a4e1bd 100644
--- a/src/KeyKeeper/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/RepositoryWindow.axaml.cs
@@ -7,9 +7,10 @@ using KeyKeeper.PasswordStore.Crypto;
 
 namespace KeyKeeper;
 
-public partial class RepositoryWindow: Window
+public partial class RepositoryWindow : Window
 {
-    public IPassStore? PassStore { private get; init; }
+    public IPassStore? PassStore { get; init; }
+    public string? MasterPassword { get; init; }  // ��� �������� ������
 
     public RepositoryWindow()
     {
@@ -19,7 +20,12 @@ public partial class RepositoryWindow: Window
     protected override void OnOpened(EventArgs e)
     {
         base.OnOpened(e);
-        if (PassStore!.Locked)
-            PassStore.Unlock(new CompositeKey("blablabla", null));
+
+        // ������������ ��������� ���� �����
+        if (PassStore != null && PassStore.Locked && !string.IsNullOrEmpty(MasterPassword))
+        {
+            var compositeKey = new CompositeKey(MasterPassword, null);
+            PassStore.Unlock(compositeKey);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/MainWindow.axaml.cs b/src/KeyKeeper/Views/MainWindow.axaml.cs
index 58f1cb7..6abb269 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml.cs
+++ b/src/KeyKeeper/Views/MainWindow.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using KeyKeeper.PasswordStore;
+using KeyKeeper.PasswordStore.Crypto;
 using KeyKeeper.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -21,7 +22,6 @@ namespace KeyKeeper.Views
 
         private async void CreateNewVault_Click(object sender, RoutedEventArgs e)
         {
-            // 1. Открываем проводник
             var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
             {
                 Title = "Создать новое хранилище паролей",
@@ -29,34 +29,32 @@ namespace KeyKeeper.Views
                 DefaultExtension = "kkp",
                 FileTypeChoices = new[]
                 {
-                    new FilePickerFileType("Хранилище KeyKeeper")
-                    {
-                        Patterns = new[] { "*.kkp" }
-                    }
-                }
+            new FilePickerFileType("Хранилище KeyKeeper")
+            {
+                Patterns = new[] { "*.kkp" }
+            }
+        }
             });
 
             if (file != null)
             {
                 if (file.TryGetLocalPath() is string path)
                 {
-                    // 2. Открываем окно с паролем
                     var passwordDialog = new PasswordDialog();
                     await passwordDialog.ShowDialog(this);
-
-                    // 3. Если нажали "Создать"
-                    if (passwordDialog.Created)
+                    if (passwordDialog.Created && !string.IsNullOrEmpty(passwordDialog.Password))
                     {
-                        // 4. Создаем хранилище с паролем
-                        var compositeKey = new PasswordStore.Crypto.CompositeKey(passwordDialog.Password, null);
-                        (DataContext as MainWindowViewModel)!.CreateVault(path);
-
-                        // 5. Открываем окно хранилища
-                        OpenRepositoryWindow(new PassStoreFileAccessor(path, true, new StoreCreationOptions()
-                        {
-                            Key = compositeKey,
-                            LockTimeoutSeconds = 800,
-                        }));
+                        var compositeKey = new CompositeKey(passwordDialog.Password, null);
+                        var passStoreAccessor = new PassStoreFileAccessor(
+                            filename: path,
+                            create: true,
+                            createOptions: new StoreCreationOptions()
+                            {
+                                Key = compositeKey,
+                                LockTimeoutSeconds = 800
+                            });
+                        IPassStore passStore = passStoreAccessor;
+                        OpenRepositoryWindow(passStore, passwordDialog.Password);
                     }
                 }
             }
@@ -64,22 +62,21 @@ namespace KeyKeeper.Views
 
         private async void OpenExistingVault_Click(object sender, RoutedEventArgs e)
         {
-            // Открываем диалог выбора файла
             var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 Title = "Открыть хранилище паролей",
                 AllowMultiple = false,
                 FileTypeFilter = new[]
                 {
-                    new FilePickerFileType("Хранилище KeyKeeper")
-                    {
-                        Patterns = new[] { "*.kkp" }
-                    },
-                    new FilePickerFileType("Все файлы")
-                    {
-                        Patterns = new[] { "*.*" }
-                    }
-                }
+            new FilePickerFileType("Хранилище KeyKeeper")
+            {
+                Patterns = new[] { "*.kkp" }
+            },
+            new FilePickerFileType("Все файлы")
+            {
+                Patterns = new[] { "*.*" }
+            }
+        }
             });
 
             if (files.Count > 0)
@@ -87,20 +84,32 @@ namespace KeyKeeper.Views
                 var file = files[0];
                 if (file.TryGetLocalPath() is string path)
                 {
-                    (DataContext as MainWindowViewModel)!.OpenVault(path);
-                    OpenRepositoryWindow(new PassStoreFileAccessor(path, false, null));
+                    var passwordDialog = new PasswordEntryDialog();
+                    await passwordDialog.ShowDialog(this);
+                    if (passwordDialog.Opened && !string.IsNullOrEmpty(passwordDialog.Password))
+                    {
+                        var passStoreAccessor = new PassStoreFileAccessor(
+                            filename: path,
+                            create: false,
+                            createOptions: null);
+                        IPassStore passStore = passStoreAccessor;
+                        (DataContext as MainWindowViewModel)!.OpenVault(path);
+                        OpenRepositoryWindow(passStore, passwordDialog.Password);
+                    }
                 }
             }
         }
 
-        private void OpenRepositoryWindow(IPassStore store)
+        private void OpenRepositoryWindow(IPassStore passStore, string masterPassword)
         {
             var repositoryWindow = new RepositoryWindow()
             {
                 DataContext = this.DataContext,
-                PassStore = store,
+                PassStore = passStore,
+                MasterPassword = masterPassword,
                 WindowStartupLocation = WindowStartupLocation.CenterScreen
             };
+
             repositoryWindow.Closed += (s, e) => this.Show();
             repositoryWindow.Show();
             this.Hide();

From 6c96b6c410456fa9d89b915088d376423328ce78 Mon Sep 17 00:00:00 2001
From: Chernykh Aleksandr <dernet4@gmail.com>
Date: Fri, 5 Dec 2025 02:05:23 +0300
Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0,=20=D1=87=D1=82=D0=BE=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D1=81=D0=BE=D0=B2=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E=D1=82?=
 =?UTF-8?q?,=20=D0=B8=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8C=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/KeyKeeper/PasswordDialog.axaml      | 50 ++++++++++++++++++-------
 src/KeyKeeper/PasswordDialog.axaml.cs   | 41 ++++++++++++++++++--
 src/KeyKeeper/PasswordEntryDialog.axaml | 22 ++++++++---
 3 files changed, 91 insertions(+), 22 deletions(-)

diff --git a/src/KeyKeeper/PasswordDialog.axaml b/src/KeyKeeper/PasswordDialog.axaml
index 5435275..5014d8d 100644
--- a/src/KeyKeeper/PasswordDialog.axaml
+++ b/src/KeyKeeper/PasswordDialog.axaml
@@ -1,28 +1,52 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="KeyKeeper.Views.PasswordDialog"
+        x:Class="KeyKeeper.PasswordDialog"
         Title="Создание хранилища"
-        Width="300"
-        Height="200">
+        Width="350"
+        Height="230">
     
     <StackPanel Margin="20" VerticalAlignment="Center">
         
-        <TextBlock Text="Введите мастер-пароль:" Margin="0,0,0,5"/>
-        <TextBox x:Name="PasswordBox" 
-                 Margin="0,0,0,15"/>
+        <TextBlock Text="Set Master Password" 
+                   FontSize="16"
+                   FontWeight="Bold"
+                   Margin="0,0,0,15"/>
         
-        <TextBlock Text="Подтвердите пароль:" Margin="0,0,0,5"/>
-        <TextBox x:Name="ConfirmBox" 
-                 Margin="0,0,0,20"/>
+        <!-- Поле для пароля (звездочки) -->
+        <StackPanel Margin="0,0,0,10">
+            <TextBlock Text="Password:" Margin="0,0,0,5"/>
+            <TextBox x:Name="PasswordBox" 
+                     PasswordChar="*"
+                     Width="250"/>
+        </StackPanel>
         
+        <!-- Поле для подтверждения (звездочки) -->
+        <StackPanel Margin="0,0,0,15">
+            <TextBlock Text="Confirm Password:" Margin="0,0,0,5"/>
+            <TextBox x:Name="ConfirmPasswordBox" 
+                     PasswordChar="*"
+                     Width="250"/>
+        </StackPanel>
+        
+        <!-- Сообщение об ошибке -->
+        <TextBlock x:Name="ErrorText"
+                   Text="Passwords do not match"
+                   Foreground="Red"
+                   FontSize="12"
+                   Margin="0,0,0,10"
+                   IsVisible="False"/>
+        
+        <!-- Кнопки -->
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
-            <Button Content="Отмена" 
+            <Button Content="Cancel" 
                     Width="80"
-                    Click="OnCancelClick"/>
+                    Height="30"
+                    Click="CancelButton_Click"/>
             
-            <Button Content="Создать" 
+            <Button Content="Create" 
                     Width="80"
-                    Click="OnCreateClick"/>
+                    Height="30"
+                    Click="CreateButton_Click"/>
         </StackPanel>
         
     </StackPanel>
diff --git a/src/KeyKeeper/PasswordDialog.axaml.cs b/src/KeyKeeper/PasswordDialog.axaml.cs
index 9374128..a1513ed 100644
--- a/src/KeyKeeper/PasswordDialog.axaml.cs
+++ b/src/KeyKeeper/PasswordDialog.axaml.cs
@@ -1,8 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Interactivity;
 
-namespace KeyKeeper.Views
+namespace KeyKeeper
 {
     public partial class PasswordDialog : Window
     {
@@ -19,15 +20,47 @@ namespace KeyKeeper.Views
             AvaloniaXamlLoader.Load(this);
         }
 
-        private void OnCreateClick(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void CreateButton_Click(object sender, RoutedEventArgs e)
         {
+            // �������� �������� �� �����
             var passwordBox = this.FindControl<TextBox>("PasswordBox");
-            Password = passwordBox?.Text ?? "";
+            var confirmBox = this.FindControl<TextBox>("ConfirmPasswordBox");
+            var errorText = this.FindControl<TextBlock>("ErrorText");
+
+            string password = passwordBox?.Text ?? "";
+            string confirmPassword = confirmBox?.Text ?? "";
+
+            // ���������, ��� ������ �� ������
+            if (string.IsNullOrEmpty(password) || string.IsNullOrEmpty(confirmPassword))
+            {
+                ShowError("������ �� ����� ���� ������");
+                return;
+            }
+
+            // ��������� ���������� �������
+            if (password != confirmPassword)
+            {
+                ShowError("������ �� ���������");
+                return;
+            }
+
+            // ������ ��������� - ���������
+            Password = password;
             Created = true;
             Close();
         }
 
-        private void OnCancelClick(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private void ShowError(string message)
+        {
+            var errorText = this.FindControl<TextBlock>("ErrorText");
+            if (errorText != null)
+            {
+                errorText.Text = message;
+                errorText.IsVisible = true;
+            }
+        }
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e)
         {
             Created = false;
             Close();
diff --git a/src/KeyKeeper/PasswordEntryDialog.axaml b/src/KeyKeeper/PasswordEntryDialog.axaml
index 6481f11..64cee8f 100644
--- a/src/KeyKeeper/PasswordEntryDialog.axaml
+++ b/src/KeyKeeper/PasswordEntryDialog.axaml
@@ -1,17 +1,29 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="KeyKeeper.PasswordEntryDialog"
-        Title="Введите пароль"
+        Title="Enter Master Password"
         Width="300"
         Height="180">
     
     <StackPanel Margin="20" VerticalAlignment="Center">
-        <TextBlock Text="Введите мастер-пароль:" Margin="0,0,0,15"/>
-        <TextBox x:Name="PasswordBox" Margin="0,0,0,20"/>
+        <TextBlock Text="Enter master password:" Margin="0,0,0,15"/>
+        
+        <!-- Поле для ввода пароля с звездочками -->
+        <TextBox x:Name="PasswordBox" 
+                 PasswordChar="*"
+                 Margin="0,0,0,20"
+                 Width="250"/>
         
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
-            <Button Content="Отмена" Width="80" Click="CancelButton_Click"/>
-            <Button Content="Открыть" Width="80" Click="OpenButton_Click"/>
+            <Button Content="Cancel" 
+                    Width="80"
+                    Height="30"
+                    Click="CancelButton_Click"/>
+            
+            <Button Content="Open" 
+                    Width="80"
+                    Height="30"
+                    Click="OpenButton_Click"/>
         </StackPanel>
     </StackPanel>
     

From 0093ca4d0c46252a15930e720346308e45e70a0c Mon Sep 17 00:00:00 2001
From: Chernykh Aleksandr <dernet4@gmail.com>
Date: Fri, 5 Dec 2025 02:10:41 +0300
Subject: [PATCH 4/4] =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=BF=D0=B8=D1=81=D0=B8?=
 =?UTF-8?q?=20=D0=BE=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F=D1=85=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B0=D0=BD=D0=B3=D0=BB=D0=B8=D0=B9=D1=81=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/KeyKeeper/PasswordDialog.axaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/KeyKeeper/PasswordDialog.axaml.cs b/src/KeyKeeper/PasswordDialog.axaml.cs
index a1513ed..18047fc 100644
--- a/src/KeyKeeper/PasswordDialog.axaml.cs
+++ b/src/KeyKeeper/PasswordDialog.axaml.cs
@@ -33,14 +33,14 @@ namespace KeyKeeper
             // ���������, ��� ������ �� ������
             if (string.IsNullOrEmpty(password) || string.IsNullOrEmpty(confirmPassword))
             {
-                ShowError("������ �� ����� ���� ������");
+                ShowError("Password cannot be empty");
                 return;
             }
 
             // ��������� ���������� �������
             if (password != confirmPassword)
             {
-                ShowError("������ �� ���������");
+                ShowError("Passwords don't match");
                 return;
             }