Skip to content
Open
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
10 changes: 5 additions & 5 deletions fe-app-podkop/locales/podkop.pot
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ msgid "Domain Resolver"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:326
msgid "Dont Touch My DHCP!"
msgid "Don't Touch My DHCP!"
msgstr ""

#: src/podkop/tabs/dashboard/initController.ts:241
Expand Down Expand Up @@ -860,7 +860,7 @@ msgid "Sing-box installed"
msgstr ""

#: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:87
msgid "Sing-box listening ports"
msgid "Sing-box is listening ports"
msgstr ""

#: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:82
Expand All @@ -872,7 +872,7 @@ msgid "Sing-box service exist"
msgstr ""

#: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:67
msgid "Sing-box version is compatible (newer than 1.12.4)"
msgid "Sing-box version is compatible (1.12.4 or newer)"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:89
Expand Down Expand Up @@ -1087,7 +1087,7 @@ msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links"
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Use #name for naming, at the end of link"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:334
Expand All @@ -1103,5 +1103,5 @@ msgid "YACD Secret Key"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:127
msgid "You can select Output Network Interface, by default autodetect"
msgid "You can select the Output Network Interface; by default, it is set to autodetect"
msgstr ""
16 changes: 8 additions & 8 deletions fe-app-podkop/locales/podkop.ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ msgstr "Не паникуйте, всё можно исправить, прос
msgid "Domain Resolver"
msgstr "Резолвер доменов"

msgid "Dont Touch My DHCP!"
msgstr "Dont Touch My DHCP!"
msgid "Don't Touch My DHCP!"
msgstr "Don't Touch My DHCP!"

msgid "Downlink"
msgstr "Входящий"
Expand Down Expand Up @@ -623,7 +623,7 @@ msgstr "Автостарт sing-box отключен"
msgid "Sing-box installed"
msgstr "Sing-box установлен"

msgid "Sing-box listening ports"
msgid "Sing-box is listening ports"
msgstr "Sing-box слушает порты"

msgid "Sing-box process running"
Expand All @@ -632,8 +632,8 @@ msgstr "Процесс sing-box запущен"
msgid "Sing-box service exist"
msgstr "Сервис sing-box существует"

msgid "Sing-box version is compatible (newer than 1.12.4)"
msgstr "Версия Sing-box совместима (новее 1.12.4)"
msgid "Sing-box version is compatible (1.12.4 or newer)"
msgstr "Версия Sing-box совместима (1.12.4 или новее)"

msgid "Source Network Interface"
msgstr "Сетевой интерфейс источника"
Expand Down Expand Up @@ -773,8 +773,8 @@ msgstr "Посмотреть логи"
msgid "Visit Wiki"
msgstr "Перейти в wiki"

msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links"
msgstr ""
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Use #name for naming, at the end of link"
msgstr "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Используйте #имя для именования, в конце ссылки"

msgid "Warning: %s cannot be used together with %s. Previous selections have been removed."
msgstr "Предупреждение: %s нельзя использовать вместе с %s. Предыдущие варианты были удалены."
Expand All @@ -785,5 +785,5 @@ msgstr "Предупреждение: Russia inside может быть испо
msgid "YACD Secret Key"
msgstr "Секретный ключ YACD"

msgid "You can select Output Network Interface, by default autodetect"
msgid "You can select the Output Network Interface; by default, it is set to autodetect"
msgstr "Вы можете выбрать выходной сетевой интерфейс, по умолчанию он определяется автоматически."
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export async function runSingBoxCheck() {
},
{
state: data.sing_box_version_ok ? 'success' : 'error',
key: _('Sing-box version is compatible (newer than 1.12.4)'),
key: _('Sing-box version is compatible (1.12.4 or newer)'),
value: '',
},
{
Expand All @@ -84,7 +84,7 @@ export async function runSingBoxCheck() {
},
{
state: data.sing_box_ports_listening ? 'success' : 'error',
key: _('Sing-box listening ports'),
key: _('Sing-box is listening ports'),
value: '',
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2633,7 +2633,7 @@ async function runSingBoxCheck() {
},
{
state: data.sing_box_version_ok ? "success" : "error",
key: _("Sing-box version is compatible (newer than 1.12.4)"),
key: _("Sing-box version is compatible (1.12.4 or newer)"),
value: ""
},
{
Expand All @@ -2653,7 +2653,7 @@ async function runSingBoxCheck() {
},
{
state: data.sing_box_ports_listening ? "success" : "error",
key: _("Sing-box listening ports"),
key: _("Sing-box is listening ports"),
value: ""
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function createSectionContent(section) {
form.TextValue,
"proxy_string",
_("Proxy Configuration URL"),
_("vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links")
_("vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Use #name for naming, at the end of link")
);
o.depends("proxy_config_type", "url");
o.rows = 5;
Expand Down Expand Up @@ -86,7 +86,7 @@ function createSectionContent(section) {
form.DynamicList,
"selector_proxy_links",
_("Selector Proxy Links"),
_("vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links")
_("vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Use #name for naming, at the end of link")
);
o.depends("proxy_config_type", "selector");
o.rmempty = false;
Expand All @@ -109,7 +109,7 @@ function createSectionContent(section) {
form.DynamicList,
"urltest_proxy_links",
_("URLTest Proxy Links"),
_("vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links")
_("vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Use #name for naming, at the end of link")
);
o.depends("proxy_config_type", "urltest");
o.rmempty = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function createSettingsContent(section) {
form.Flag,
"enable_output_network_interface",
_("Enable Output Network Interface"),
_("You can select Output Network Interface, by default autodetect"),
_("You can select the Output Network Interface; by default, it is set to autodetect"),
);
o.default = "0";
o.rmempty = false;
Expand Down Expand Up @@ -323,7 +323,7 @@ function createSettingsContent(section) {
o = section.option(
form.Flag,
"dont_touch_dhcp",
_("Dont Touch My DHCP!"),
_("Don't Touch My DHCP!"),
_("Podkop will not modify your DHCP configuration"),
);
o.default = "0";
Expand Down
16 changes: 8 additions & 8 deletions luci-app-podkop/po/ru/podkop.po
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ msgstr "Не паникуйте, всё можно исправить, прос
msgid "Domain Resolver"
msgstr "Резолвер доменов"

msgid "Dont Touch My DHCP!"
msgstr "Dont Touch My DHCP!"
msgid "Don't Touch My DHCP!"
msgstr "Don't Touch My DHCP!"

msgid "Downlink"
msgstr "Входящий"
Expand Down Expand Up @@ -623,7 +623,7 @@ msgstr "Автостарт sing-box отключен"
msgid "Sing-box installed"
msgstr "Sing-box установлен"

msgid "Sing-box listening ports"
msgid "Sing-box is listening ports"
msgstr "Sing-box слушает порты"

msgid "Sing-box process running"
Expand All @@ -632,8 +632,8 @@ msgstr "Процесс sing-box запущен"
msgid "Sing-box service exist"
msgstr "Сервис sing-box существует"

msgid "Sing-box version is compatible (newer than 1.12.4)"
msgstr "Версия Sing-box совместима (новее 1.12.4)"
msgid "Sing-box version is compatible (1.12.4 or newer)"
msgstr "Версия Sing-box совместима (1.12.4 или новее)"

msgid "Source Network Interface"
msgstr "Сетевой интерфейс источника"
Expand Down Expand Up @@ -773,8 +773,8 @@ msgstr "Посмотреть логи"
msgid "Visit Wiki"
msgstr "Перейти в wiki"

msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links"
msgstr ""
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Use #name for naming, at the end of link"
msgstr "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Используйте #имя для именования, в конце ссылки"

msgid "Warning: %s cannot be used together with %s. Previous selections have been removed."
msgstr "Предупреждение: %s нельзя использовать вместе с %s. Предыдущие варианты были удалены."
Expand All @@ -785,5 +785,5 @@ msgstr "Предупреждение: Russia inside может быть испо
msgid "YACD Secret Key"
msgstr "Секретный ключ YACD"

msgid "You can select Output Network Interface, by default autodetect"
msgid "You can select the Output Network Interface; by default, it is set to autodetect"
msgstr "Вы можете выбрать выходной сетевой интерфейс, по умолчанию он определяется автоматически."
10 changes: 5 additions & 5 deletions luci-app-podkop/po/templates/podkop.pot
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ msgid "Domain Resolver"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:326
msgid "Dont Touch My DHCP!"
msgid "Don't Touch My DHCP!"
msgstr ""

#: src/podkop/tabs/dashboard/initController.ts:241
Expand Down Expand Up @@ -860,7 +860,7 @@ msgid "Sing-box installed"
msgstr ""

#: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:87
msgid "Sing-box listening ports"
msgid "Sing-box is listening ports"
msgstr ""

#: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:82
Expand All @@ -872,7 +872,7 @@ msgid "Sing-box service exist"
msgstr ""

#: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:67
msgid "Sing-box version is compatible (newer than 1.12.4)"
msgid "Sing-box version is compatible (1.12.4 or newer)"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:89
Expand Down Expand Up @@ -1087,7 +1087,7 @@ msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links"
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links. Use #name for naming, at the end of link"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:334
Expand All @@ -1103,5 +1103,5 @@ msgid "YACD Secret Key"
msgstr ""

#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:127
msgid "You can select Output Network Interface, by default autodetect"
msgid "You can select the Output Network Interface; by default, it is set to autodetect"
msgstr ""
6 changes: 3 additions & 3 deletions podkop/files/usr/bin/podkop
Original file line number Diff line number Diff line change
Expand Up @@ -2439,7 +2439,7 @@ global_check() {
fi

if [ "$sing_box_version_ok" -eq 1 ]; then
print_global "✅ Sing-box version is compatible (newer than 1.12.4)"
print_global "✅ Sing-box version is compatible (1.12.4 or newer)"
else
print_global "❌ Sing-box version is not compatible (older than 1.12.4)"
fi
Expand All @@ -2463,9 +2463,9 @@ global_check() {
fi

if [ "$sing_box_ports_listening" -eq 1 ]; then
print_global "✅ Sing-box listening ports"
print_global "✅ Sing-box is listening ports"
else
print_global "❌ Sing-box listening ports"
print_global "❌ Sing-box is listening ports"
fi
else
print_global "❌ Failed to get sing-box info"
Expand Down