Skip to content

Commit 94c46a0

Browse files
committed
Update Provider.kt
1 parent c513a19 commit 94c46a0

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

core/src/main/java/com/github/kr328/clash/core/model/Provider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ data class Provider(
1717
}
1818

1919
enum class VehicleType {
20-
HTTP, File, Compatible
20+
HTTP, File, Inline, Compatible
2121
}
2222

2323
override fun writeToParcel(parcel: Parcel, flags: Int) {

design/src/main/java/com/github/kr328/clash/design/util/I18n.kt

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ fun Provider.type(context: Context): String {
2929
val vehicle = when (vehicleType) {
3030
Provider.VehicleType.HTTP -> context.getString(R.string.http)
3131
Provider.VehicleType.File -> context.getString(R.string.file)
32+
Provider.VehicleType.Inline -> context.getString(R.string.inline)
3233
Provider.VehicleType.Compatible -> context.getString(R.string.compatible)
3334
}
3435

design/src/main/res/values-zh/strings.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
<string name="format_provider_type">%1$s(%2$s)</string>
191191
<string name="rule">规则</string>
192192
<string name="http">HTTP</string>
193+
<string name="inline">内联</string>
193194
<string name="compatible">兼容</string>
194195
<string name="format_update_provider_failure">更新 %1$s: %2$s</string>
195196
<string name="update_all">更新全部</string>
@@ -216,8 +217,8 @@
216217
<string name="geoip_fallback_code">GeoIP Fallback 区域代码</string>
217218
<string name="allow_bypass">允许应用绕过</string>
218219
<string name="allow_bypass_summary">允许其他应用绕过 VPN</string>
219-
<string name="allow_ipv6">允许Ipv6</string>
220-
<string name="allow_ipv6_summary">通过 VpnService 代理Ipv6流量</string>
220+
<string name="allow_ipv6">允许 Ipv6</string>
221+
<string name="allow_ipv6_summary">通过 VpnService 代理 Ipv6 流量</string>
221222
<string name="clash_meta_wiki">Clash Meta Wiki</string>
222223
<string name="meta_features">Meta Features</string>
223224
<string name="unified_delay">Unified Delay</string>
@@ -245,10 +246,10 @@
245246
<string name="import_country_file">导入 Country 数据库</string>
246247
<string name="geofile_import_failed">导入失败</string>
247248
<string name="geofile_unknown_db_format">数据库类型错误</string>
248-
<string name="geofile_unknown_db_format_message">只支持 %1$s 格式的Geo数据库</string>
249+
<string name="geofile_unknown_db_format_message">只支持 %1$s 格式的 Geo 数据库</string>
249250
<string name="geofile_imported">%1$s 已导入</string>
250251
<string name="toast_profile_updated_complete">更新配置 %s 成功</string>
251-
<string name="toast_profile_updated_failed">更新配置 %1$s 失败: %2$s</string>
252+
<string name="toast_profile_updated_failed">更新配置 %1$s 失败%2$s</string>
252253
<string name="external_control_activity">External Control</string>
253254
<string name="external_control_started">Clash.Meta 服务已启动</string>
254255
<string name="external_control_stopped">Clash.Meta 服务已停止</string>

design/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
<string name="format_provider_type">%1$s(%2$s)</string>
279279
<string name="rule">Rule</string>
280280
<string name="http">HTTP</string>
281+
<string name="inline">Inline</string>
281282
<string name="compatible">Compatible</string>
282283
<string name="format_update_provider_failure">Update %1$s: %2$s</string>
283284
<string name="update_all">Update All</string>

0 commit comments

Comments
 (0)