From 00acd457f76fd5e32f42478643f744ef6b0fc668 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 28 Sep 2026 00:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Sync=202026-09-28=2000:29:47?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-fwlive/Makefile | 2 +- .../luci-static/resources/fwlive/chips.js | 8 +++++++- luci-app-fwlive/po/de/luci-app-fwlive.po | 18 +++++++++++------- luci-app-fwlive/po/ru/luci-app-fwlive.po | 18 +++++++++++------- .../po/templates/luci-app-fwlive.pot | 18 +++++++++++------- luci-app-fwlive/po/zh_Hans/luci-app-fwlive.po | 18 +++++++++++------- wwand-ipad/Makefile | 4 ++-- 7 files changed, 54 insertions(+), 32 deletions(-) diff --git a/luci-app-fwlive/Makefile b/luci-app-fwlive/Makefile index 972f926db..975e78b86 100644 --- a/luci-app-fwlive/Makefile +++ b/luci-app-fwlive/Makefile @@ -12,7 +12,7 @@ LUCI_DEPENDS:=+luci-base +logd +jsonfilter +coreutils-timeout LUCI_PKGARCH:=all PKG_VERSION:=0.1.46 -PKG_RELEASE:=44 +PKG_RELEASE:=45 # Reproducible build: honor SOURCE_DATE_EPOCH from the build environment (set by docker-sdk.sh / CI). ifdef SOURCE_DATE_EPOCH diff --git a/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js b/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js index 5bf346fb9..ec24545ee 100644 --- a/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js +++ b/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js @@ -12,7 +12,7 @@ * state - shallow copy: { filters, chipFields } * callbacks - { onInvert(field, ev), onClear(field, ev), onClearAll(ev) } * - * Chips use the labels presentation (include: "is", exclude: "not" + light ≠). + * Chips use the labels presentation (include: "is"/"contains", exclude: "not"/"does not contain" + light ≠). * Modules must not mutate state. host is cleared then rebuilt (idempotent replace). */ @@ -31,6 +31,12 @@ function chipValueNodes(spec, val) { const valueNode = p.negate ? E('span', { 'class': 'fwlive-chip-strike' }, [p.value]) : p.value; if (!p.negate) { + if (key === 'q' || key === 'src' || key === 'dst') + return [ + E('span', { 'class': 'fwlive-chip-polarity' }, [_('contains')]), + ' ', + log.formatFilterChipLabel(label, val) + ]; return [ E('span', { 'class': 'fwlive-chip-polarity' }, [_('is')]), ' ', diff --git a/luci-app-fwlive/po/de/luci-app-fwlive.po b/luci-app-fwlive/po/de/luci-app-fwlive.po index 65992075f..d4dc42aef 100644 --- a/luci-app-fwlive/po/de/luci-app-fwlive.po +++ b/luci-app-fwlive/po/de/luci-app-fwlive.po @@ -115,7 +115,7 @@ msgstr "Klassisch (grün/rot)" msgid "Classic uses green/red; Accessible uses teal/orange" msgstr "Klassisch verwendet grün/rot; Barrierefrei verwendet teal/orange" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:150 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:156 msgid "Clear all" msgstr "Alle löschen" @@ -300,7 +300,7 @@ msgstr "Wird aktiviert…" msgid "Exclude" msgstr "Ausschließen" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Exclude instead" msgstr "Stattdessen ausschließen" @@ -409,7 +409,7 @@ msgstr "" msgid "Inbound" msgstr "Eingehend" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Include instead" msgstr "Stattdessen einschließen" @@ -579,7 +579,7 @@ msgstr "Protokoll — häufige Werte" msgid "Quick search" msgstr "Schnellsuche" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:109 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:115 msgid "Remove filter" msgstr "Filter entfernen" @@ -888,7 +888,11 @@ msgstr "Puffer voll" msgid "default 10/minute" msgstr "Standard 10/Minute" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:44 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:36 +msgid "contains" +msgstr "enthält" + +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:50 msgid "does not contain" msgstr "enthält nicht" @@ -897,7 +901,7 @@ msgstr "enthält nicht" msgid "drop" msgstr "verworfen" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:35 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:41 msgid "is" msgstr "ist" @@ -914,7 +918,7 @@ msgstr "lädt…" msgid "none" msgstr "keine" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:49 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:55 msgid "not" msgstr "nicht" diff --git a/luci-app-fwlive/po/ru/luci-app-fwlive.po b/luci-app-fwlive/po/ru/luci-app-fwlive.po index 89fa2129e..0ea45a406 100644 --- a/luci-app-fwlive/po/ru/luci-app-fwlive.po +++ b/luci-app-fwlive/po/ru/luci-app-fwlive.po @@ -112,7 +112,7 @@ msgstr "Классический (зелёный/красный)" msgid "Classic uses green/red; Accessible uses teal/orange" msgstr "Классический — зелёный/красный; доступный — бирюзовый/оранжевый" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:150 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:156 msgid "Clear all" msgstr "Очистить всё" @@ -294,7 +294,7 @@ msgstr "Включение…" msgid "Exclude" msgstr "Исключить" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Exclude instead" msgstr "Исключить вместо этого" @@ -402,7 +402,7 @@ msgstr "" msgid "Inbound" msgstr "Входящий" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Include instead" msgstr "Включить вместо этого" @@ -570,7 +570,7 @@ msgstr "Протокол — частые значения" msgid "Quick search" msgstr "Быстрый поиск" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:109 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:115 msgid "Remove filter" msgstr "Удалить фильтр" @@ -874,7 +874,11 @@ msgstr "буфер заполнен" msgid "default 10/minute" msgstr "по умолчанию 10/мин" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:44 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:36 +msgid "contains" +msgstr "содержит" + +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:50 msgid "does not contain" msgstr "не содержит" @@ -883,7 +887,7 @@ msgstr "не содержит" msgid "drop" msgstr "отброшен" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:35 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:41 msgid "is" msgstr "есть" @@ -900,7 +904,7 @@ msgstr "загрузка…" msgid "none" msgstr "нет" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:49 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:55 msgid "not" msgstr "не" diff --git a/luci-app-fwlive/po/templates/luci-app-fwlive.pot b/luci-app-fwlive/po/templates/luci-app-fwlive.pot index 85a5ede12..0068ef483 100644 --- a/luci-app-fwlive/po/templates/luci-app-fwlive.pot +++ b/luci-app-fwlive/po/templates/luci-app-fwlive.pot @@ -93,7 +93,7 @@ msgstr "" msgid "Classic uses green/red; Accessible uses teal/orange" msgstr "" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:150 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:156 msgid "Clear all" msgstr "" @@ -259,7 +259,7 @@ msgstr "" msgid "Exclude" msgstr "" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Exclude instead" msgstr "" @@ -353,7 +353,7 @@ msgstr "" msgid "Inbound" msgstr "" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Include instead" msgstr "" @@ -510,7 +510,7 @@ msgstr "" msgid "Quick search" msgstr "" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:109 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:115 msgid "Remove filter" msgstr "" @@ -783,7 +783,11 @@ msgstr "" msgid "default 10/minute" msgstr "" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:44 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:36 +msgid "contains" +msgstr "" + +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:50 msgid "does not contain" msgstr "" @@ -792,7 +796,7 @@ msgstr "" msgid "drop" msgstr "" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:35 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:41 msgid "is" msgstr "" @@ -809,7 +813,7 @@ msgstr "" msgid "none" msgstr "" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:49 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:55 msgid "not" msgstr "" diff --git a/luci-app-fwlive/po/zh_Hans/luci-app-fwlive.po b/luci-app-fwlive/po/zh_Hans/luci-app-fwlive.po index f9970446c..8a0980e18 100644 --- a/luci-app-fwlive/po/zh_Hans/luci-app-fwlive.po +++ b/luci-app-fwlive/po/zh_Hans/luci-app-fwlive.po @@ -105,7 +105,7 @@ msgstr "经典（绿/红）" msgid "Classic uses green/red; Accessible uses teal/orange" msgstr "经典使用绿/红；无障碍使用青绿/橙色" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:150 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:156 msgid "Clear all" msgstr "全部清除" @@ -276,7 +276,7 @@ msgstr "正在启用…" msgid "Exclude" msgstr "排除" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Exclude instead" msgstr "改为排除" @@ -379,7 +379,7 @@ msgstr "" msgid "Inbound" msgstr "入站" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:86 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:92 msgid "Include instead" msgstr "改为包含" @@ -542,7 +542,7 @@ msgstr "协议 — 常用值" msgid "Quick search" msgstr "快速搜索" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:109 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:115 msgid "Remove filter" msgstr "移除筛选" @@ -829,7 +829,11 @@ msgstr "缓冲区已满" msgid "default 10/minute" msgstr "默认 10 条/分钟" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:44 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:36 +msgid "contains" +msgstr "包含" + +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:50 msgid "does not contain" msgstr "不包含" @@ -838,7 +842,7 @@ msgstr "不包含" msgid "drop" msgstr "丢弃" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:35 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:41 msgid "is" msgstr "是" @@ -855,7 +859,7 @@ msgstr "加载中…" msgid "none" msgstr "无" -#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:49 +#: openwrt-feed/luci-app-fwlive/htdocs/luci-static/resources/fwlive/chips.js:55 msgid "not" msgstr "非" diff --git a/wwand-ipad/Makefile b/wwand-ipad/Makefile index 4498b132d..a1885968e 100644 --- a/wwand-ipad/Makefile +++ b/wwand-ipad/Makefile @@ -16,11 +16,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wwand-ipad PKG_VERSION:=0.1.0_p21 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ddimension/ipad.git -PKG_SOURCE_VERSION:=32610f6591938b36705478ffd04e14d1b0ed51be +PKG_SOURCE_VERSION:=6c057a00a80eea8140c7f985ddeeaeed43d06cf4 PKG_MIRROR_HASH:=skip PKG_LICENSE:=GPL-2.0-only Apache-2.0