Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-network: fix unbalanced and confusing markup in DHCP translation

Browse source 
The string `<%s>...<%s>` is invalid HTML and will confuse translation software
like poedit as well as human translators. It is not clear that `<%s>...<%s>`
is supposed to interpolate into both a start and end tag and `<%s>` might be
mistaken as a quoted form of `%s` like `«%s»` or `〈%s〉`.

Replace the string with `<a href="%s">...</a>` to make it immediately clear
that the acronym is surrounded by an HTML anchor, only pass the destination
URL via string formatting to avoid mistranslations there.

Fixes: 3bfcf99a68 ("luci-mod-network: fix unbalanced and confusing markup in DHCP translation")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2021-12-01 16:40:31 +01:00
parent 91bbefa64e
commit b8d3ca6f82
35 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/luci-base/po/ar/base.po
View file

@ -1883,7 +1883,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "إلغاء الارتباط عند الإقرار القليل"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "تجاهل استجابات المنبع RFC1918"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/bg/base.po
View file

@ -1855,7 +1855,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Дисоцииране при ниско потвърждение"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/bn_BD/base.po
View file

@ -1829,7 +1829,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/ca/base.po
View file

@ -1871,7 +1871,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Descarta les respostes RFC1918 des de dalt."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/cs/base.po
View file

@ -1889,7 +1889,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Zrušit spojení při nízkém počtu ACK potvrzení"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Vyřadit upstream RFC1918 odpovědi."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/de/base.po
View file

@ -1944,7 +1944,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Trennung bei schlechtem Antwortverhalten"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Eingehende RFC1918-Antworten verwerfen."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/el/base.po
View file

@ -1862,7 +1862,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Αγνόησε τις απαντήσεις ανοδικής ροής RFC1918."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/en/base.po
View file

@ -1852,7 +1852,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/es/base.po
View file

@ -1953,7 +1953,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Desasociarse en un reconocimiento bajo"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Descartar respuestas RFC1918 ascendentes."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/fi/base.po
View file

@ -1900,7 +1900,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Poista heikon kuittauksen yhteydet"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Hylkää ulkoverkosta tulevat RFC1918-vastaukset."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/fr/base.po
View file

@ -1933,7 +1933,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Désassossier sur la reconnaissance basse (Low Acknowledgement)"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Rejeter les réponses RFC1918 en amont."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/he/base.po
View file

@ -1850,7 +1850,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/hi/base.po
View file

@ -1831,7 +1831,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/hu/base.po
View file

@ -1905,7 +1905,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Hozzárendelés megszüntetése alacsony nyugtázásnál"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Külső RFC1918 válaszok elvetése."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/it/base.po
View file

@ -1910,7 +1910,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Disconnetti client in caso di Acknowledgement scarso"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Scarta risposte RFC1918 upstream."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/ja/base.po
View file

@ -1911,7 +1911,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "確認応答が不安定な場合、接続解除"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "アップストリームのRFC1918応答を破棄します。"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/ko/base.po
View file

@ -1866,7 +1866,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/mr/base.po
View file

@ -1829,7 +1829,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/ms/base.po
View file

@ -1833,7 +1833,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/nb_NO/base.po
View file

@ -1869,7 +1869,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Forkast oppstrøms RFC1918 svar."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/nl/base.po
View file

@ -1839,7 +1839,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/pl/base.po
View file

@ -1927,7 +1927,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Rozłączaj przy niskim stanie ramek ACK"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Odrzuć odpowiedzi nadrzędne zawierające adresy RFC1918."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/pt/base.po
View file

@ -1950,7 +1950,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Desassociar quando tiver baixa confirmação"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Descartar respostas RFC1918 a montante."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/pt_BR/base.po
View file

@ -1966,7 +1966,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Desassocie quando houver baixa confirmação de recebimento"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
"Descartar respostas dos servidores externos para redes privadas (RFC1918)."

2
modules/luci-base/po/ro/base.po
View file

@ -1889,7 +1889,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Dezasociere la recunoaștere scăzută"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/ru/base.po
View file

@ -1949,7 +1949,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Не ассоциировать при низком подтверждении"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Отбрасывать ответы восходящего потока, содержащие адреса RFC1918."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/sk/base.po
View file

@ -1849,7 +1849,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/sv/base.po
View file

@ -1843,7 +1843,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/templates/base.pot
View file

@ -1820,7 +1820,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/tr/base.po
View file

@ -1923,7 +1923,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Düşük Onayda İlişkilendirmeyi Kes"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Yukarı akış RFC1918 yanıtlarını yoksay."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/uk/base.po
View file

@ -1932,7 +1932,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Роз'єднувати за низького підтвердження"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Відкиньте відповіді вгору за течією, що містять адреси RFC1918."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/vi/base.po
View file

@ -1877,7 +1877,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "Hủy liên kết với xác nhận mức thấp"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "Hủy phản hồi ngược RFC1918."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/zh_Hans/base.po
View file

@ -1867,7 +1867,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "在低 Ack 应答时断开连接"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "丢弃 RFC1918 上行响应。"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-base/po/zh_Hant/base.po
View file

@ -1871,7 +1871,7 @@ msgid "Disassociate On Low Acknowledgement"
msgstr "低確認(Low Acknowledgement)時取消連線"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:302
msgid "Discard upstream responses containing <%s>RFC1918<%s> addresses."
msgid "Discard upstream responses containing <a href="%s">RFC1918</a> addresses."
msgstr "丟棄上游RFC1918 虛擬IP網路的回應。"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:198

2
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -299,7 +299,7 @@ return view.extend({
o = s.taboption('general', form.Flag, 'rebind_protection',
_('Rebind protection'),
_('Discard upstream responses containing <%s>RFC1918<%s> addresses.').format('a href="https://datatracker.ietf.org/doc/html/rfc1918" target="_blank" rel="noreferrer noopener"', '/a'));
_('Discard upstream responses containing <a href="%s">RFC1918</a> addresses.').format('https://datatracker.ietf.org/doc/html/rfc1918'));
o.rmempty = false;
o = s.taboption('general', form.Flag, 'rebind_localhost',