From 94c46a04c4e49ee8e6f72903e4cb88bafb7eb16a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=90=E6=AE=87?=
<95160953+xishang0128@users.noreply.github.com>
Date: Sun, 22 Dec 2024 14:52:33 +0800
Subject: [PATCH] Update Provider.kt
---
.../java/com/github/kr328/clash/core/model/Provider.kt | 2 +-
.../main/java/com/github/kr328/clash/design/util/I18n.kt | 1 +
design/src/main/res/values-zh/strings.xml | 9 +++++----
design/src/main/res/values/strings.xml | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/com/github/kr328/clash/core/model/Provider.kt b/core/src/main/java/com/github/kr328/clash/core/model/Provider.kt
index 7a2bf899c..d4425ca40 100644
--- a/core/src/main/java/com/github/kr328/clash/core/model/Provider.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/model/Provider.kt
@@ -17,7 +17,7 @@ data class Provider(
}
enum class VehicleType {
- HTTP, File, Compatible
+ HTTP, File, Inline, Compatible
}
override fun writeToParcel(parcel: Parcel, flags: Int) {
diff --git a/design/src/main/java/com/github/kr328/clash/design/util/I18n.kt b/design/src/main/java/com/github/kr328/clash/design/util/I18n.kt
index 96ac583ff..95fd36ee1 100644
--- a/design/src/main/java/com/github/kr328/clash/design/util/I18n.kt
+++ b/design/src/main/java/com/github/kr328/clash/design/util/I18n.kt
@@ -29,6 +29,7 @@ fun Provider.type(context: Context): String {
val vehicle = when (vehicleType) {
Provider.VehicleType.HTTP -> context.getString(R.string.http)
Provider.VehicleType.File -> context.getString(R.string.file)
+ Provider.VehicleType.Inline -> context.getString(R.string.inline)
Provider.VehicleType.Compatible -> context.getString(R.string.compatible)
}
diff --git a/design/src/main/res/values-zh/strings.xml b/design/src/main/res/values-zh/strings.xml
index cf60e1e13..3c16da479 100644
--- a/design/src/main/res/values-zh/strings.xml
+++ b/design/src/main/res/values-zh/strings.xml
@@ -190,6 +190,7 @@
%1$s(%2$s)
规则
HTTP
+ 内联
兼容
更新 %1$s: %2$s
更新全部
@@ -216,8 +217,8 @@
GeoIP Fallback 区域代码
允许应用绕过
允许其他应用绕过 VPN
- 允许Ipv6
- 通过 VpnService 代理Ipv6流量
+ 允许 Ipv6
+ 通过 VpnService 代理 Ipv6 流量
Clash Meta Wiki
Meta Features
Unified Delay
@@ -245,10 +246,10 @@
导入 Country 数据库
导入失败
数据库类型错误
- 只支持 %1$s 格式的Geo数据库
+ 只支持 %1$s 格式的 Geo 数据库
%1$s 已导入
更新配置 %s 成功
- 更新配置 %1$s 失败: %2$s
+ 更新配置 %1$s 失败:%2$s
External Control
Clash.Meta 服务已启动
Clash.Meta 服务已停止
diff --git a/design/src/main/res/values/strings.xml b/design/src/main/res/values/strings.xml
index 622adbb94..85f8a6ba5 100644
--- a/design/src/main/res/values/strings.xml
+++ b/design/src/main/res/values/strings.xml
@@ -278,6 +278,7 @@
%1$s(%2$s)
Rule
HTTP
+ Inline
Compatible
Update %1$s: %2$s
Update All