From 11c203ad19683c3d037372572a91259bfd44ab5a Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 2 Nov 2025 16:24:57 +0800
Subject: [PATCH] Update UI and localization for policy group

---
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      |   4 +-
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |   2 +-
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |   2 +-
 v2rayN/ServiceLib/Resx/ResUI.resx             |   2 +-
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |   2 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |   6 +-
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |   6 +-
 .../Views/AddGroupServerWindow.axaml          | 149 ++++++++++--------
 v2rayN/v2rayN/Views/AddGroupServerWindow.xaml |  99 +++++++-----
 9 files changed, 149 insertions(+), 123 deletions(-)

diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index ea649da5..b0721398 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -19,7 +19,7 @@ namespace ServiceLib.Resx {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class ResUI {
@@ -1663,7 +1663,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Server List 的本地化字符串。
+        ///   查找类似 Configuration List 的本地化字符串。
         /// </summary>
         public static string menuServerList {
             get {
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 64d74cd9..17ace05c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1537,7 +1537,7 @@
     <value>Remove Child Configuration</value>
   </data>
   <data name="menuServerList" xml:space="preserve">
-    <value>Server List</value>
+    <value>Configuration List</value>
   </data>
   <data name="TbFallback" xml:space="preserve">
     <value>Fallback</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index ce57a3ba..e0052822 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1537,7 +1537,7 @@
     <value>Remove Child Configuration</value>
   </data>
   <data name="menuServerList" xml:space="preserve">
-    <value>Server List</value>
+    <value>Configuration List</value>
   </data>
   <data name="TbFallback" xml:space="preserve">
     <value>Fallback</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 03bd9660..b3e31748 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1537,7 +1537,7 @@
     <value>Remove Child Configuration</value>
   </data>
   <data name="menuServerList" xml:space="preserve">
-    <value>Server List</value>
+    <value>Configuration List</value>
   </data>
   <data name="TbFallback" xml:space="preserve">
     <value>Fallback</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index dd7604fc..bdd464ef 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1537,7 +1537,7 @@
     <value>Remove Child Configuration</value>
   </data>
   <data name="menuServerList" xml:space="preserve">
-    <value>Server List</value>
+    <value>Configuration List</value>
   </data>
   <data name="TbFallback" xml:space="preserve">
     <value>Fallback</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 87443803..0f8ffb10 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1528,13 +1528,13 @@
     <value>添加链式代理</value>
   </data>
   <data name="menuAddChildServer" xml:space="preserve">
-    <value>添加子项</value>
+    <value>添加子配置</value>
   </data>
   <data name="menuRemoveChildServer" xml:space="preserve">
-    <value>删除子项</value>
+    <value>删除子配置</value>
   </data>
   <data name="menuServerList" xml:space="preserve">
-    <value>子项列表</value>
+    <value>子配置项</value>
   </data>
   <data name="TbFallback" xml:space="preserve">
     <value>故障转移</value>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index c12f023b..5fb6e2f2 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1528,13 +1528,13 @@
     <value>添加鏈式代理</value>
   </data>
   <data name="menuAddChildServer" xml:space="preserve">
-    <value>添加子項</value>
+    <value>添加子配置</value>
   </data>
   <data name="menuRemoveChildServer" xml:space="preserve">
-    <value>刪除子項</value>
+    <value>刪除子配置</value>
   </data>
   <data name="menuServerList" xml:space="preserve">
-    <value>子項清單</value>
+    <value>子配置項</value>
   </data>
   <data name="TbFallback" xml:space="preserve">
     <value>容錯移轉</value>
diff --git a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
index 4279dc4a..8e49ad77 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
@@ -33,97 +33,106 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <Grid DockPanel.Dock="Top" RowDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+        <Grid
+            Grid.Row="0"
+            ColumnDefinitions="180,Auto,Auto"
+            DockPanel.Dock="Top"
+            RowDefinitions="Auto,Auto,Auto,Auto">
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                Text="{x:Static resx:ResUI.menuServers}" />
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Text="{x:Static resx:ResUI.TbRemarks}" />
+            <TextBox
+                x:Name="txtRemarks"
+                Grid.Row="1"
+                Grid.Column="1"
+                Width="400"
+                Margin="{StaticResource Margin4}" />
+
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Text="{x:Static resx:ResUI.TbCoreType}" />
+            <ComboBox
+                x:Name="cmbCoreType"
+                Grid.Row="2"
+                Grid.Column="1"
+                Width="200"
+                Margin="{StaticResource Margin4}" />
 
             <Grid
-                Grid.Row="0"
-                ColumnDefinitions="180,Auto,Auto"
-                RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                x:Name="gridPolicyGroup"
+                Grid.Row="3"
+                Grid.Column="0"
+                Grid.ColumnSpan="3"
+                ColumnDefinitions="180,Auto,Auto">
                 <TextBlock
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Margin="{StaticResource Margin4}"
-                    Text="{x:Static resx:ResUI.menuServers}" />
-
-                <TextBlock
-                    Grid.Row="1"
                     Grid.Column="0"
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Text="{x:Static resx:ResUI.TbRemarks}" />
-                <TextBox
-                    x:Name="txtRemarks"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="{StaticResource Margin4}" />
-
-                <TextBlock
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    Text="{x:Static resx:ResUI.TbCoreType}" />
+                    Text="{x:Static resx:ResUI.TbPolicyGroupType}" />
                 <ComboBox
-                    x:Name="cmbCoreType"
-                    Grid.Row="2"
+                    x:Name="cmbPolicyGroupType"
                     Grid.Column="1"
                     Width="200"
                     Margin="{StaticResource Margin4}" />
+            </Grid>
+        </Grid>
 
+        <TabControl DockPanel.Dock="Top">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
                 <Grid
-                    x:Name="gridPolicyGroup"
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="3"
-                    ColumnDefinitions="180,Auto,Auto">
+                    Margin="{StaticResource Margin8}"
+                    ColumnDefinitions="180,Auto,Auto"
+                    RowDefinitions="Auto,Auto,Auto">
+
                     <TextBlock
+                        Grid.Row="0"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbPolicyGroupType}" />
+                        Text="{x:Static resx:ResUI.menuSubscription}" />
                     <ComboBox
-                        x:Name="cmbPolicyGroupType"
+                        x:Name="cmbSubChildItems"
+                        Grid.Row="0"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource Margin4}" />
+                        Margin="{StaticResource Margin4}"
+                        DisplayMemberBinding="{Binding Remarks}"
+                        ItemsSource="{Binding SubItems}" />
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.LvFilter}" />
+                    <TextBox
+                        x:Name="txtFilter"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center" />
                 </Grid>
+            </TabItem>
+        </TabControl>
 
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    Text="{x:Static resx:ResUI.menuSubscription}" />
-                <ComboBox
-                    x:Name="cmbSubChildItems"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Width="200"
-                    Margin="{StaticResource Margin4}"
-                    DisplayMemberBinding="{Binding Remarks}"
-                    ItemsSource="{Binding SubItems}" />
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="2"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" />
-
-                <TextBlock
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    Text="{x:Static resx:ResUI.LvFilter}" />
-                <TextBox
-                    x:Name="txtFilter"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center" />
-            </Grid>
-        </Grid>
         <TabControl>
             <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
                 <DataGrid
diff --git a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
index b46d3dcd..cb823229 100644
--- a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
@@ -39,6 +39,7 @@
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
+
         <Grid DockPanel.Dock="Top">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -48,8 +49,6 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0">
@@ -132,47 +131,65 @@
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbPolicyGroupType}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
-
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.menuSubscription}" />
-                <ComboBox
-                    x:Name="cmbSubChildItems"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Width="200"
-                    Margin="{StaticResource Margin4}"
-                    DisplayMemberPath="Remarks"
-                    Style="{StaticResource DefComboBox}" />
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="2"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" />
-
-                <TextBlock
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.LvFilter}" />
-                <TextBox
-                    x:Name="txtFilter"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Margin="{StaticResource Margin4}"
-                    VerticalAlignment="Center"
-                    AcceptsReturn="True"
-                    Style="{StaticResource DefTextBox}" />
             </Grid>
         </Grid>
+
+        <TabControl DockPanel.Dock="Top">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
+                <Grid Margin="{StaticResource Margin8}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.menuSubscription}" />
+                    <ComboBox
+                        x:Name="cmbSubChildItems"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin4}"
+                        DisplayMemberPath="Remarks"
+                        Style="{StaticResource DefComboBox}" />
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.LvFilter}" />
+                    <TextBox
+                        x:Name="txtFilter"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        AcceptsReturn="True"
+                        Style="{StaticResource DefTextBox}" />
+                </Grid>
+            </TabItem>
+        </TabControl>
+
         <TabControl>
             <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
                 <DataGrid