From 62403f68ca3b7c604455da23286adf936af7e6c7 Mon Sep 17 00:00:00 2001
From: test <test@gmail.com>
Date: Sat, 1 Apr 2023 11:41:46 +0800
Subject: [PATCH] merge languate

---
 ProxySuper.WPF/App.xaml                       | 1 -
 ProxySuper.WPF/Resources/Languages/en.xaml    | 1 +
 ProxySuper.WPF/Resources/Languages/fa_IR.xaml | 1 +
 ProxySuper.WPF/Resources/Languages/tw_cn.xaml | 2 ++
 ProxySuper.WPF/Resources/Languages/zh_cn.xaml | 2 ++
 ProxySuper.WPF/Views/HomeView.xaml            | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ProxySuper.WPF/App.xaml b/ProxySuper.WPF/App.xaml
index 931bdcc..daea7fd 100644
--- a/ProxySuper.WPF/App.xaml
+++ b/ProxySuper.WPF/App.xaml
@@ -11,7 +11,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <!--Language-->
                 <ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
-                <ResourceDictionary Source="/Resources/Languages/fa_IR.xaml" />
                 <!--style-->
                 <ResourceDictionary>
                     <Style TargetType="{x:Type TextBox}">
diff --git a/ProxySuper.WPF/Resources/Languages/en.xaml b/ProxySuper.WPF/Resources/Languages/en.xaml
index a126fac..e2ab589 100644
--- a/ProxySuper.WPF/Resources/Languages/en.xaml
+++ b/ProxySuper.WPF/Resources/Languages/en.xaml
@@ -22,6 +22,7 @@
     <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
     <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
     <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">Fr</sys:String>
 
     <sys:String x:Key="MainMenuHelper">Helper</sys:String>
     <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
diff --git a/ProxySuper.WPF/Resources/Languages/fa_IR.xaml b/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
index 5be3b35..b62eeaf 100644
--- a/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
+++ b/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
@@ -22,6 +22,7 @@
     <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
     <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
     <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">Fr</sys:String>
 
     <sys:String x:Key="MainMenuHelper">Helper</sys:String>
     <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
diff --git a/ProxySuper.WPF/Resources/Languages/tw_cn.xaml b/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
index 478ce1c..c2bfbcc 100644
--- a/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
@@ -22,6 +22,8 @@
     <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
     <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
     <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">法语</sys:String>
+
     <sys:String x:Key="MainMenuHelper">幫助</sys:String>
     <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
     <sys:String x:Key="MainMenuHelperUseRoot">啓用Root賬戶</sys:String>
diff --git a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
index 48fe1a3..c9d3d73 100644
--- a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
@@ -22,6 +22,8 @@
     <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
     <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
     <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
+    <sys:String x:Key="MainMenuLanguageFr">法语</sys:String>
+    
     <sys:String x:Key="MainMenuHelper">帮助</sys:String>
     <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
     <sys:String x:Key="MainMenuHelperUseRoot">启用Root账户</sys:String>
diff --git a/ProxySuper.WPF/Views/HomeView.xaml b/ProxySuper.WPF/Views/HomeView.xaml
index 1e64f25..063487a 100644
--- a/ProxySuper.WPF/Views/HomeView.xaml
+++ b/ProxySuper.WPF/Views/HomeView.xaml
@@ -33,6 +33,7 @@
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageEn}" Click="SetEnglish"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageTw}" Click="SetTwCN"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageCn}" Click="SetSimpleChinese"></MenuItem>
+                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageFr}" Click="SetIrFA"></MenuItem>
             </MenuItem>
 
             <MenuItem Header="{DynamicResource MainMenuHelper}" Padding="10,3">