diff --git a/fe-app-podkop/locales/podkop.pot b/fe-app-podkop/locales/podkop.pot index 4bd7f778..989e15ee 100644 --- a/fe-app-podkop/locales/podkop.pot +++ b/fe-app-podkop/locales/podkop.pot @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 "" diff --git a/fe-app-podkop/locales/podkop.ru.po b/fe-app-podkop/locales/podkop.ru.po index 5afebc47..6c543473 100644 --- a/fe-app-podkop/locales/podkop.ru.po +++ b/fe-app-podkop/locales/podkop.ru.po @@ -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 "Входящий" @@ -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" @@ -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 "Сетевой интерфейс источника" @@ -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. Предыдущие варианты были удалены." @@ -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 "Вы можете выбрать выходной сетевой интерфейс, по умолчанию он определяется автоматически." diff --git a/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts b/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts index b13f0bc0..5d495c8d 100644 --- a/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts +++ b/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts @@ -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: '', }, { @@ -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: '', }, ], diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js index b280531c..66ff1f73 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js @@ -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: "" }, { @@ -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: "" } ] diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js index dc619bcb..ecc5b486 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js @@ -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; @@ -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; @@ -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; diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js index 6c89ed34..8ba8327e 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js @@ -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; @@ -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"; diff --git a/luci-app-podkop/po/ru/podkop.po b/luci-app-podkop/po/ru/podkop.po index 5afebc47..6c543473 100644 --- a/luci-app-podkop/po/ru/podkop.po +++ b/luci-app-podkop/po/ru/podkop.po @@ -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 "Входящий" @@ -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" @@ -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 "Сетевой интерфейс источника" @@ -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. Предыдущие варианты были удалены." @@ -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 "Вы можете выбрать выходной сетевой интерфейс, по умолчанию он определяется автоматически." diff --git a/luci-app-podkop/po/templates/podkop.pot b/luci-app-podkop/po/templates/podkop.pot index 4bd7f778..989e15ee 100644 --- a/luci-app-podkop/po/templates/podkop.pot +++ b/luci-app-podkop/po/templates/podkop.pot @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 "" diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop index d1218ebe..0e85bc79 100755 --- a/podkop/files/usr/bin/podkop +++ b/podkop/files/usr/bin/podkop @@ -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 @@ -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"