Skip to content

Commit 8cb4f2f

Browse files
2dust2dust
committed
Adjusted the server configuration right-click menu
1 parent 4d3db56 commit 8cb4f2f

File tree

9 files changed

+96
-69
lines changed

9 files changed

+96
-69
lines changed

‎v2rayN/ServiceLib/Resx/ResUI.Designer.cs

Lines changed: 19 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,22 +1395,25 @@
13951395
<data name="TbPorts7Tips" xml:space="preserve">
13961396
<value>مخفی و پورت می شود، با کاما (،) جدا می شود</value>
13971397
</data>
1398-
<data name="menuSetDefaultMultipleServerXray" xml:space="preserve">
1399-
<value>چند سرور Xray (چند انتخابی)</value>
1398+
<data name="menuSetDefaultMultipleServer" xml:space="preserve">
1399+
<value>Multi-server to custom configuration</value>
14001400
</data>
14011401
<data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
1402-
<value>چند سرور تصادفی</value>
1402+
<value>Multi-server Random by Xray</value>
14031403
</data>
14041404
<data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
1405-
<value>چند سرور گردشی</value>
1405+
<value>Multi-server RoundRobin by Xray</value>
14061406
</data>
14071407
<data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
1408-
<value>چند سرور کمترین تأخیر</value>
1408+
<value>Multi-server LeastPing by Xray</value>
14091409
</data>
14101410
<data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
1411-
<value>چند سرور پایدارترین</value>
1411+
<value>Multi-server LeastLoad by Xray</value>
14121412
</data>
14131413
<data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
1414-
<value>چند سرور کمترین تأخیر sing-box (چند انتخابی)</value>
1414+
<value>Multi-server LeastPing by sing-box</value>
14151415
</data>
1416-
</root>
1416+
<data name="menuExportConfig" xml:space="preserve">
1417+
<value>Export server</value>
1418+
</data>
1419+
</root>

‎v2rayN/ServiceLib/Resx/ResUI.hu.resx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,22 +1395,25 @@
13951395
<data name="TbPorts7Tips" xml:space="preserve">
13961396
<value>Will cover the port, separate with commas (,)</value>
13971397
</data>
1398-
<data name="menuSetDefaultMultipleServerXray" xml:space="preserve">
1399-
<value>Többszerveres Xray (többválasztásos)</value>
1398+
<data name="menuSetDefaultMultipleServer" xml:space="preserve">
1399+
<value>Multi-server to custom configuration</value>
14001400
</data>
14011401
<data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
1402-
<value>Többszerveres véletlenszerű</value>
1402+
<value>Multi-server Random by Xray</value>
14031403
</data>
14041404
<data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
1405-
<value>Többszerveres körforgásos</value>
1405+
<value>Multi-server RoundRobin by Xray</value>
14061406
</data>
14071407
<data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
1408-
<value>Többszerveres legkisebb késleltetésű</value>
1408+
<value>Multi-server LeastPing by Xray</value>
14091409
</data>
14101410
<data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
1411-
<value>Többszerveres legstabilabb</value>
1411+
<value>Multi-server LeastLoad by Xray</value>
14121412
</data>
14131413
<data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
1414-
<value>Többszerveres legkisebb késleltetésű sing-box (többválasztásos)</value>
1414+
<value>Multi-server LeastPing by sing-box</value>
14151415
</data>
1416-
</root>
1416+
<data name="menuExportConfig" xml:space="preserve">
1417+
<value>Export server</value>
1418+
</data>
1419+
</root>

‎v2rayN/ServiceLib/Resx/ResUI.resx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,22 +1395,25 @@
13951395
<data name="TbPorts7Tips" xml:space="preserve">
13961396
<value>Will cover the port, separate with commas (,)</value>
13971397
</data>
1398-
<data name="menuSetDefaultMultipleServerXray" xml:space="preserve">
1399-
<value>Multi-Server Xray</value>
1398+
<data name="menuSetDefaultMultipleServer" xml:space="preserve">
1399+
<value>Multi-server to custom configuration</value>
14001400
</data>
14011401
<data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
1402-
<value>Multi-Server Random</value>
1402+
<value>Multi-server Random by Xray</value>
14031403
</data>
14041404
<data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
1405-
<value>Multi-Server RoundRobin</value>
1405+
<value>Multi-server RoundRobin by Xray</value>
14061406
</data>
14071407
<data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
1408-
<value>Multi-Server LeastPing</value>
1408+
<value>Multi-server LeastPing by Xray</value>
14091409
</data>
14101410
<data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
1411-
<value>Multi-Server LeastLoad</value>
1411+
<value>Multi-server LeastLoad by Xray</value>
14121412
</data>
14131413
<data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
1414-
<value>Multi-Server lowest latency sing-box</value>
1414+
<value>Multi-server LeastPing by sing-box</value>
14151415
</data>
1416-
</root>
1416+
<data name="menuExportConfig" xml:space="preserve">
1417+
<value>Export server</value>
1418+
</data>
1419+
</root>

‎v2rayN/ServiceLib/Resx/ResUI.ru.resx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,22 +1395,25 @@
13951395
<data name="TbPorts7Tips" xml:space="preserve">
13961396
<value>Will cover the port, separate with commas (,)</value>
13971397
</data>
1398-
<data name="menuSetDefaultMultipleServerXray" xml:space="preserve">
1399-
<value>Мультисерверный Xray (множественный выбор)</value>
1398+
<data name="menuSetDefaultMultipleServer" xml:space="preserve">
1399+
<value>Multi-server to custom configuration</value>
14001400
</data>
14011401
<data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
1402-
<value>Мультисерверный случайный</value>
1402+
<value>Multi-server Random by Xray</value>
14031403
</data>
14041404
<data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
1405-
<value>Мультисерверный круговой</value>
1405+
<value>Multi-server RoundRobin by Xray</value>
14061406
</data>
14071407
<data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
1408-
<value>Мультисерверная минимальная задержка</value>
1408+
<value>Multi-server LeastPing by Xray</value>
14091409
</data>
14101410
<data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
1411-
<value>Мультисерверный наиболее стабильный</value>
1411+
<value>Multi-server LeastLoad by Xray</value>
14121412
</data>
14131413
<data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
1414-
<value>Мультисерверная минимальная задержка sing-box (множественный выбор)</value>
1414+
<value>Multi-server LeastPing by sing-box</value>
1415+
</data>
1416+
<data name="menuExportConfig" xml:space="preserve">
1417+
<value>Export server</value>
14151418
</data>
14161419
</root>

‎v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,22 +1392,25 @@
13921392
<data name="TbPorts7Tips" xml:space="preserve">
13931393
<value>会覆盖端口，多组时用逗号 (,) 隔开</value>
13941394
</data>
1395-
<data name="menuSetDefaultMultipleServerXray" xml:space="preserve">
1396-
<value>多服务器 Xray (多选)</value>
1395+
<data name="menuSetDefaultMultipleServer" xml:space="preserve">
1396+
<value>多服务器产生自定义配置 (多选)</value>
13971397
</data>
13981398
<data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
1399-
<value>多服务器随机</value>
1399+
<value>多服务器随机 Xray</value>
14001400
</data>
14011401
<data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
1402-
<value>多服务器轮询</value>
1402+
<value>多服务器负载均衡 Xray</value>
14031403
</data>
14041404
<data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
1405-
<value>多服务器最低延迟</value>
1405+
<value>多服务器最低延迟 Xray</value>
14061406
</data>
14071407
<data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
1408-
<value>多服务器最稳定</value>
1408+
<value>多服务器最稳定 Xray</value>
14091409
</data>
14101410
<data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
1411-
<value>多服务器最低延迟 sing-box (多选)</value>
1411+
<value>多服务器最低延迟 sing-box</value>
1412+
</data>
1413+
<data name="menuExportConfig" xml:space="preserve">
1414+
<value>导出服务器</value>
14121415
</data>
14131416
</root>

‎v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,22 +1392,25 @@
13921392
<data name="TbPorts7Tips" xml:space="preserve">
13931393
<value>會覆蓋端口，多組時用逗號 (,) 隔開</value>
13941394
</data>
1395-
<data name="menuSetDefaultMultipleServerXray" xml:space="preserve">
1396-
<value>多伺服器 Xray (多選)</value>
1395+
<data name="menuSetDefaultMultipleServer" xml:space="preserve">
1396+
<value>多伺服器產生自訂配置 (多選)</value>
13971397
</data>
13981398
<data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
1399-
<value>多伺服器隨機</value>
1399+
<value>多伺服器隨機 Xray</value>
14001400
</data>
14011401
<data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
1402-
<value>多伺服器輪詢</value>
1402+
<value>多伺服器負載平衡 Xray</value>
14031403
</data>
14041404
<data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
1405-
<value>多伺服器最低延遲</value>
1405+
<value>多伺服器最低延遲 Xray</value>
14061406
</data>
14071407
<data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
1408-
<value>多伺服器最穩定</value>
1408+
<value>多伺服器最穩定 Xray</value>
14091409
</data>
14101410
<data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
1411-
<value>多伺服器最低延遲 sing-box (多選)</value>
1411+
<value>多伺服器最低延遲 sing-box</value>
14121412
</data>
1413-
</root>
1413+
<data name="menuExportConfig" xml:space="preserve">
1414+
<value>匯出伺服器</value>
1415+
</data>
1416+
</root>

‎v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,14 @@
9999
<MenuItem x:Name="menuCopyServer" Header="{x:Static resx:ResUI.menuCopyServer}" />
100100
<MenuItem x:Name="menuShareServer" Header="{x:Static resx:ResUI.menuShareServer}" />
101101
<Separator />
102-
<MenuItem Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerXray}">
102+
<MenuItem Header="{x:Static resx:ResUI.menuSetDefaultMultipleServer}">
103103
<MenuItem x:Name="menuSetDefaultMultipleServerXrayRandom" Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerXrayRandom}" />
104104
<MenuItem x:Name="menuSetDefaultMultipleServerXrayRoundRobin" Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerXrayRoundRobin}" />
105105
<MenuItem x:Name="menuSetDefaultMultipleServerXrayLeastPing" Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerXrayLeastPing}" />
106106
<MenuItem x:Name="menuSetDefaultMultipleServerXrayLeastLoad" Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerXrayLeastLoad}" />
107+
<Separator />
108+
<MenuItem x:Name="menuSetDefaultMultipleServerSingBoxLeastPing" Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerSingBoxLeastPing}" />
107109
</MenuItem>
108-
<MenuItem x:Name="menuSetDefaultMultipleServerSingBoxLeastPing" Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerSingBoxLeastPing}" />
109110
<Separator />
110111
<MenuItem x:Name="menuMixedTestServer" Header="{x:Static resx:ResUI.menuMixedTestServer}" />
111112
<MenuItem x:Name="menuTcpingServer" Header="{x:Static resx:ResUI.menuTcpingServer}" />
@@ -138,11 +139,10 @@
138139
</MenuItem>
139140
<MenuItem x:Name="menuSelectAll" Header="{x:Static resx:ResUI.menuSelectAll}" />
140141
<Separator />
141-
<MenuItem Header="{x:Static resx:ResUI.menuExport2ClientConfig}">
142+
<MenuItem Header="{x:Static resx:ResUI.menuExportConfig}">
142143
<MenuItem x:Name="menuExport2ClientConfig" Header="{x:Static resx:ResUI.menuExport2ClientConfig}" />
143144
<MenuItem x:Name="menuExport2ClientConfigClipboard" Header="{x:Static resx:ResUI.menuExport2ClientConfigClipboard}" />
144-
</MenuItem>
145-
<MenuItem Header="{x:Static resx:ResUI.menuExport2ShareUrl}">
145+
<Separator />
146146
<MenuItem x:Name="menuExport2ShareUrl" Header="{x:Static resx:ResUI.menuExport2ShareUrl}" />
147147
<MenuItem x:Name="menuExport2ShareUrlBase64" Header="{x:Static resx:ResUI.menuExport2ShareUrlBase64}" />
148148
</MenuItem>

‎v2rayN/v2rayN/Views/ProfilesView.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
Height="{StaticResource MenuItemHeight}"
121121
Header="{x:Static resx:ResUI.menuShareServer}" />
122122
<Separator />
123-
<MenuItem Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerXray}">
123+
<MenuItem Header="{x:Static resx:ResUI.menuSetDefaultMultipleServer}">
124124
<MenuItem
125125
x:Name="menuSetDefaultMultipleServerXrayRandom"
126126
Height="{StaticResource MenuItemHeight}"
@@ -137,11 +137,12 @@
137137
x:Name="menuSetDefaultMultipleServerXrayLeastLoad"
138138
Height="{StaticResource MenuItemHeight}"
139139
Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerXrayLeastLoad}" />
140+
<Separator />
141+
<MenuItem
142+
x:Name="menuSetDefaultMultipleServerSingBoxLeastPing"
143+
Height="{StaticResource MenuItemHeight}"
144+
Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerSingBoxLeastPing}" />
140145
</MenuItem>
141-
<MenuItem
142-
x:Name="menuSetDefaultMultipleServerSingBoxLeastPing"
143-
Height="{StaticResource MenuItemHeight}"
144-
Header="{x:Static resx:ResUI.menuSetDefaultMultipleServerSingBoxLeastPing}" />
145146
<Separator />
146147
<MenuItem
147148
x:Name="menuMixedTestServer"
@@ -211,7 +212,7 @@
211212
Height="{StaticResource MenuItemHeight}"
212213
Header="{x:Static resx:ResUI.menuSelectAll}" />
213214
<Separator />
214-
<MenuItem Header="{x:Static resx:ResUI.menuExport2ClientConfig}">
215+
<MenuItem Header="{x:Static resx:ResUI.menuExportConfig}">
215216
<MenuItem
216217
x:Name="menuExport2ClientConfig"
217218
Height="{StaticResource MenuItemHeight}"
@@ -220,8 +221,7 @@
220221
x:Name="menuExport2ClientConfigClipboard"
221222
Height="{StaticResource MenuItemHeight}"
222223
Header="{x:Static resx:ResUI.menuExport2ClientConfigClipboard}" />
223-
</MenuItem>
224-
<MenuItem Header="{x:Static resx:ResUI.menuExport2ShareUrl}">
224+
<Separator />
225225
<MenuItem
226226
x:Name="menuExport2ShareUrl"
227227
Height="{StaticResource MenuItemHeight}"

0 commit comments

Comments
 (0)