Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

fix(i18n): substitute backend name and localize remaining strings

ExTvfb59bfe96eaa
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
index 44fcee0..585e99d 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
@@ -564,7 +564,7 @@ private fun PortForwardSection(
onRemove: (PortForwardRule) -> Unit,
) {
PodroidListRow(
- label = stringResource(R.string.port_forwards_count).replace("{count}", rules.size.toString()),
+ label = stringResource(R.string.port_forwards_count, rules.size),
rightSlot = { PodroidInlineAction(label = stringResource(R.string.add_btn), onClick = onAdd) },
)
rules.forEach { rule ->
@@ -758,6 +758,7 @@ private fun AddPortForwardDialog(
var protocol by remember { mutableStateOf("tcp") }
var error by remember { mutableStateOf<String?>(null) }
val invalidPortsMsg = stringResource(R.string.enter_valid_ports)
+ val context = LocalContext.current
AlertDialog(
onDismissRequest = onDismiss,
@@ -816,7 +817,7 @@ private fun AddPortForwardDialog(
return@TextButton
}
val added = onAdd(hp, gp, protocol)
- if (!added) error = "Port $hp (${protocol.uppercase()}) is already forwarded"
+ if (!added) error = context.getString(R.string.port_already_forwarded, hp, protocol.uppercase())
}) {
Text(stringResource(R.string.add))
}
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 82ef248..d34866e 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -99,9 +99,10 @@
<string name="udp">UDP</string>
<string name="both">两者</string>
<string name="enter_valid_ports">输入有效的端口号 (1-65535)</string>
+ <string name="port_already_forwarded">端口 %1$d (%2$s) 已转发</string>
<string name="reset">重置</string>
<string name="remove">删除</string>
- <string name="port_forwards_count">端口转发 ({count})</string>
+ <string name="port_forwards_count">端口转发 (%1$d)</string>
<string name="none">无</string>
<string name="active">活动</string>
<string name="off">关闭</string>
@@ -213,6 +214,6 @@
<string name="usb_passthrough_unavailable">此后端不可用:USB 设备直通需要 QEMU 控制套接字,而 AVF 后端不提供此功能。您可在设置中随时更改。</string>
<string name="usb_passthrough_settings_label">USB 设备直通</string>
<string name="usb_passthrough_settings_description_available">在虚拟机中热插拔外部 USB 设备(Wi-Fi、存储、串口等)。设备连接时会询问许可。启动时添加 USB 控制器,因此需要重启虚拟机以应用更改。</string>
- <string name="usb_passthrough_settings_description_unavailable">${backend} 后端不可用:USB 设备直通需要 QEMU 的 QMP 控制套接字,而 AVF 后端不提供此功能。</string>
- <string name="downloads_sharing_unavailable">此 ${backend} 构建不可用 - AVF 要求特权系统应用安装(Google 的终端应用通过这种方式绕过);第三方 APK 无法跨越 SELinux 域读取 /storage/emulated/Download。</string>
+ <string name="usb_passthrough_settings_description_unavailable">%1$s 后端不可用:USB 设备直通需要 QEMU 的 QMP 控制套接字,而 AVF 后端不提供此功能。</string>
+ <string name="downloads_sharing_unavailable">此 %1$s 构建不可用 - AVF 要求特权系统应用安装(Google 的终端应用通过这种方式绕过);第三方 APK 无法跨越 SELinux 域读取 /storage/emulated/Download。</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index afa5585..12cbbdf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,9 +99,10 @@
<string name="udp">UDP</string>
<string name="both">Both</string>
<string name="enter_valid_ports">Enter valid port numbers (1–65535)</string>
+ <string name="port_already_forwarded">Port %1$d (%2$s) is already forwarded</string>
<string name="reset">Reset</string>
<string name="remove">Remove</string>
- <string name="port_forwards_count">Port forwards ({count})</string>
+ <string name="port_forwards_count">Port forwards (%1$d)</string>
<string name="none">None</string>
<string name="active">active</string>
<string name="off">Off</string>
@@ -212,6 +213,6 @@
<string name="usb_passthrough_unavailable">Not available on this backend: USB passthrough needs QEMU control socket, which the AVF backend does not provide. You can change this later in Settings.</string>
<string name="usb_passthrough_settings_label">USB passthrough</string>
<string name="usb_passthrough_settings_description_available">Hot-plugs external USB devices (Wi-Fi, storage, serial, etc.) into the VM. Each device asks for permission when attached. Adds a USB controller at boot, so restart the VM to apply.</string>
- <string name="usb_passthrough_settings_description_unavailable">Not available on the ${backend} backend: USB passthrough rides QEMU\'s QMP control socket, which the AVF backend doesn\'t provide.</string>
- <string name="downloads_sharing_unavailable">Not available on this ${backend} build — AVF requires a privileged system-app install (Google\'s Terminal app cheats this way); third-party APKs can\'t cross SELinux domains to read /storage/emulated/Download.</string>
+ <string name="usb_passthrough_settings_description_unavailable">Not available on the %1$s backend: USB passthrough rides QEMU\'s QMP control socket, which the AVF backend doesn\'t provide.</string>
+ <string name="downloads_sharing_unavailable">Not available on this %1$s build — AVF requires a privileged system-app install (Google\'s Terminal app cheats this way); third-party APKs can\'t cross SELinux domains to read /storage/emulated/Download.</string>
</resources>