From 837cfbd03bd5cf1a0f02892abdaa59bbd6c0e641 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:36:30 +0800
Subject: [PATCH] Optimize UI prompts
---
v2rayN/ServiceLib/Resx/ResUI.Designer.cs | 2 +-
v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx | 2 +-
v2rayN/ServiceLib/Resx/ResUI.hu.resx | 2 +-
v2rayN/ServiceLib/Resx/ResUI.resx | 4 ++--
v2rayN/ServiceLib/Resx/ResUI.ru.resx | 2 +-
v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx | 2 +-
v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx | 2 +-
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml | 12 ++++++++----
v2rayN/v2rayN/Views/AddServerWindow.xaml | 4 ++++
9 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 1af33d3c..f50b2e9f 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2483,7 +2483,7 @@ namespace ServiceLib.Resx {
}
///
- /// 查找类似 Address(Ip,Ipv6) 的本地化字符串。
+ /// 查找类似 Address(Ipv4,Ipv6) 的本地化字符串。
///
public static string TbLocalAddress {
get {
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 090ebd83..aa607f50 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1319,7 +1319,7 @@
Previous proxy remarks
- آدرس (IP, IPv6)
+ آدرس (IPv4, IPv6)
Reserved(2,3,4)
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index e1741f12..135ace66 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1100,7 +1100,7 @@
Fenntartva (2,3,4)
- Cím (Ip,Ipv6)
+ Cím (Ipv4,Ipv6)
obfs jelszó
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index dc599d69..4d10c88d 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1100,7 +1100,7 @@
Reserved(2,3,4)
- Address(Ip,Ipv6)
+ Address(Ipv4,Ipv6)
obfs password
@@ -1402,4 +1402,4 @@
Will cover the port, separate with commas (,)
-
\ No newline at end of file
+
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 3e61dc81..1e997842 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1052,7 +1052,7 @@
obfs password
- Address(Ip,Ipv6)
+ Address(Ipv4,Ipv6)
Default domain strategy for outbound
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 2511fc95..f1607f41 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1097,7 +1097,7 @@
Reserved(2,3,4)
- Address(Ip,Ipv6)
+ Address(Ipv4,Ipv6)
混淆密码(obfs password)
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index e7b76800..5f7d3bff 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1326,7 +1326,7 @@
Reserved(2,3,4)
- Address(Ip,Ipv6)
+ Address(Ipv4,Ipv6)
使用系統hosts
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 187a1289..ef1885af 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -349,7 +349,8 @@
Grid.Row="3"
Grid.Column="1"
Width="400"
- Margin="{StaticResource Margin4}" />
+ Margin="{StaticResource Margin4}"
+ Watermark="1000:2000,3000:4000" />
+ Margin="{StaticResource Margin4}"
+ Watermark="2,3,4" />
+ Margin="{StaticResource Margin4}"
+ Watermark="Ipv4,Ipv6" />
+ HorizontalAlignment="Left"
+ Watermark="1500" />