Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class CoreTestService : Service() {
channelType = NotificationChannelType.CORE_TEST,
context = this,
title = getString(R.string.app_name),
content = getString(R.string.connection_runing_task_left, event.text)
content = getString(R.string.connection_running_task_left, event.text)
)
MessageHelper.sendMsg2UI(this, AppConfig.MSG_MEASURE_CONFIG_NOTIFY, event.text)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class MainViewModel(
_uiState.update {
it.copy(
statusText = dataSource.getString(
R.string.connection_runing_task_left,
R.string.connection_running_task_left,
event.progress
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@ fun RoutingEditScreen(
)
FormDropdownField(
label = stringResource(R.string.routing_settings_outbound_tag),
placeholder = stringResource(
R.string.routing_settings_outbound_tag_hint,
stringResource(R.string.server_lab_remarks)
),
value = outboundTag,
options = outboundSuggestions,
onValueChange = { outboundTag = it },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class ServerCustomConfigActivity : BaseComponentActivity() {
e
)
toast(
"${getString(R.string.toast_malformed_josn)} " +
"${getString(R.string.toast_malformed_json)} " +
"${e.cause?.message.orEmpty()}"
)
return false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -453,14 +453,14 @@ fun SettingsScreen(
onCheckedChange = { mux = it }
)
SettingsEditItem(
title = stringResource(R.string.title_pref_mux_concurency),
title = stringResource(R.string.title_pref_mux_concurrency),
value = muxConcurrency,
enabled = mux,
keyboardNumber = true,
onValueChanged = { muxConcurrency = it }
)
SettingsEditItem(
title = stringResource(R.string.title_pref_mux_xudp_concurency),
title = stringResource(R.string.title_pref_mux_xudp_concurrency),
value = muxXudpConcurrency,
enabled = mux,
keyboardNumber = true,
Expand Down
342 changes: 187 additions & 155 deletions V2rayNG/app/src/main/res/values-ar/strings.xml

Large diffs are not rendered by default.

346 changes: 187 additions & 159 deletions V2rayNG/app/src/main/res/values-bn/strings.xml

Large diffs are not rendered by default.

107 changes: 64 additions & 43 deletions V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml

Large diffs are not rendered by default.

172 changes: 100 additions & 72 deletions V2rayNG/app/src/main/res/values-fa/strings.xml

Large diffs are not rendered by default.

115 changes: 58 additions & 57 deletions V2rayNG/app/src/main/res/values-ru/strings.xml

Large diffs are not rendered by default.

364 changes: 197 additions & 167 deletions V2rayNG/app/src/main/res/values-vi/strings.xml

Large diffs are not rendered by default.

157 changes: 84 additions & 73 deletions V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

Large diffs are not rendered by default.

145 changes: 79 additions & 66 deletions V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion V2rayNG/app/src/main/res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
<item>6</item>
</string-array>

<string-array name="vpn_interface_address">
<string-array name="vpn_interface_address" translatable="false">
<item>10.10.14.x</item>
<item>10.1.0.x</item>
<item>10.0.0.x</item>
Expand Down
106 changes: 52 additions & 54 deletions V2rayNG/app/src/main/res/values/strings.xml

Large diffs are not rendered by default.