Skip to content

Commit

Permalink
luci-base: clarify apply-settings strings
Browse files Browse the repository at this point in the history 
Signed-off-by: Paul Donald <[email protected]>
  • Loading branch information
@systemcrash
systemcrash committed Jun 6, 2024
1 parent fd9166c commit a6f8361
Show file tree
Hide file tree
Showing 39 changed files with 1,421 additions and 1,062 deletions.
9 changes: 5 additions & 4 deletions modules/luci-base/htdocs/luci-static/resources/ui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4732,8 +4732,9 @@ var UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {

UI.prototype.changes.displayStatus('warning', [
E('h4', _('Connectivity change')),
E('p', _('The network access to this device could be interrupted by changing settings of the "%h" interface.').format(affected)),
E('p', _('If the IP address used to access LuCI changes, a <strong>manual reconnect to the new IP</strong> is required within %d seconds to confirm the settings, otherwise modifications will be reverted.').format(L.env.apply_rollback)),
E('p', _('"%h" interface changes could inhibit access to this device.').format(affected)),
E('p', _('Any IP change requires <strong>connecting to the new IP</strong> within %d seconds to retain the changes.').format(L.env.apply_rollback)),
E('p', _('Choose how to apply changes:')),
E('div', { 'class': 'right' }, [
E('button', {
'class': 'btn',
Expand All @@ -4742,11 +4743,11 @@ var UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
E('button', {
'class': 'btn cbi-button-action important',
'click': resolveFn.bind(null, true)
}, [ _('Apply with revert after connectivity loss') ]), ' ',
}, [ _('Apply, reverting if GUI remains unreachable') ]), ' ',
E('button', {
'class': 'btn cbi-button-negative important',
'click': resolveFn.bind(null, false)
}, [ _('Apply and keep settings') ])
}, [ _('Apply, committing now') ])

This comment has been minimized.

Sign in to view

Copy link
@castillofrancodamian

castillofrancodamian Jun 6, 2024

Contributor

Is it okay for you to use the word "committing"? That's a very developer word. In Spanish it cannot be translated and make it look good.

This comment has been minimized.

Sign in to view

Copy link
@systemcrash

systemcrash Jun 6, 2024

Author Contributor

It's colloquial and bears no direct relationship to development. Commitments and committees have existed for millenia before git... 😉

This comment has been minimized.

Sign in to view

Copy link
@castillofrancodamian

castillofrancodamian Jun 19, 2024

Contributor

Could you explain to me what the word "commit" means and its function in OpenWrt? So I try to find a better translation because that word and "committing" sound strange when translated into Spanish.

This comment has been minimized.

Sign in to view

Copy link
@jow-

jow- Jun 19, 2024

Contributor

Apply = restart services with the pending, unwritten config changes
Commit = write pending config changes to /etc/config/*

This comment has been minimized.

Sign in to view

Copy link
@systemcrash

systemcrash Jun 19, 2024

Author Contributor

See 2-6: https://www.dictionary.com/browse/commit

They all abstractly mean the same thing.

This comment has been minimized.

Sign in to view

Copy link
@systemcrash

systemcrash Jun 19, 2024

Author Contributor

es: comprometerse
])
]);
});
Expand Down
51 changes: 26 additions & 25 deletions modules/luci-base/po/ar/base.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ msgstr ""
msgid "!known (not known)"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4735
msgid "\"%h\" interface changes could inhibit access to this device."
msgstr ""

#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js:649
msgctxt "Yet unknown nftables table family (\"family\" table \"name\")"
msgid "\"%h\" table \"%h\""
Expand Down Expand Up @@ -1085,6 +1089,12 @@ msgstr "mount مجهول"
msgid "Anonymous Swap"
msgstr "swap مجهول"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4736
msgid ""
"Any IP change requires <strong>connecting to the new IP</strong> within %d "
"seconds to retain the changes."
msgstr ""

#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js:518
msgctxt "nft match any traffic"
msgid "Any packet"
Expand All @@ -1097,15 +1107,11 @@ msgstr ""
msgid "Any zone"
msgstr "أي منطقة"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4749
msgid "Apply and keep settings"
msgstr ""

#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:119
msgid "Apply backup?"
msgstr "تطبيق النسخ الاحتياطي؟"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4775
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4776
msgid "Apply request failed with status <code>%h</code>"
msgstr "فشل تطبيق الطلب بالحالة <code> h% </code>"

Expand All @@ -1115,8 +1121,12 @@ msgstr "فشل تطبيق الطلب بالحالة <code> h% </code>"
msgid "Apply unchecked"
msgstr "تطبيق ملحوظ"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4745
msgid "Apply with revert after connectivity loss"
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4750
msgid "Apply, committing now"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4746
msgid "Apply, reverting if GUI remains unreachable"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4685
Expand Down Expand Up @@ -1561,7 +1571,7 @@ msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:2976
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4251
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4741
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4742
#: modules/luci-compat/luasrc/view/cbi/delegator.htm:14
#: modules/luci-compat/luasrc/view/cbi/simpleform.htm:52
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:188
Expand Down Expand Up @@ -1692,7 +1702,7 @@ msgstr ""
msgid "Changes"
msgstr "التغييرات"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4811
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4812
msgid "Changes have been reverted."
msgstr "تم التراجع عن التغييرات."

Expand Down Expand Up @@ -1736,6 +1746,10 @@ msgstr "جارٍ التحقق من الأرشيف …"
msgid "Checking image…"
msgstr "جارٍ فحص الصورة …"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4737
msgid "Choose how to apply changes:"
msgstr ""

#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:429
msgid "Choose mtdblock"
msgstr "اختر mtdblock"
Expand Down Expand Up @@ -4599,13 +4613,6 @@ msgstr ""
"إذا تم تحديد ذلك ، فقم بتركيب الجهاز من خلال تسمية القسم بدلاً من عقدة الجهاز "
"الثابت"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4736
msgid ""
"If the IP address used to access LuCI changes, a <strong>manual reconnect to "
"the new IP</strong> is required within %d seconds to confirm the settings, "
"otherwise modifications will be reverted."
msgstr ""

#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1052
#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/ipip6.js:70
#: protocols/luci-proto-mbim/htdocs/luci-static/resources/protocol/mbim.js:134
Expand Down Expand Up @@ -8243,11 +8250,11 @@ msgstr "يرجع"
msgid "Revert changes"
msgstr "التغيرات المرتدة"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4820
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4821
msgid "Revert request failed with status <code>%h</code>"
msgstr "فشل طلب العودة مع الحالة <code> h% </code>"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4800
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4801
msgid "Reverting configuration…"
msgstr "جارٍ إعادة التكوين …"

Expand Down Expand Up @@ -9866,12 +9873,6 @@ msgstr ""
msgid "The netfilter components below are only regarded when running fw4."
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4735
msgid ""
"The network access to this device could be interrupted by changing settings "
"of the \"%h\" interface."
msgstr ""

#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2160
msgid "The network name is already used"
msgstr "تم استخدام اسم الشبكة من قبل"
Expand Down Expand Up @@ -10047,7 +10048,7 @@ msgstr ""
msgid "There are no active leases"
msgstr "لا توجد إيجارات نشطة"

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4767
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4768
msgid "There are no changes to apply"
msgstr "لا توجد تغييرات لتطبيقها"

Expand Down
51 changes: 26 additions & 25 deletions modules/luci-base/po/ast/base.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ msgstr ""
msgid "!known (not known)"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4735
msgid "\"%h\" interface changes could inhibit access to this device."
msgstr ""

#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js:649
msgctxt "Yet unknown nftables table family (\"family\" table \"name\")"
msgid "\"%h\" table \"%h\""
Expand Down Expand Up @@ -1065,6 +1069,12 @@ msgstr ""
msgid "Anonymous Swap"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4736
msgid ""
"Any IP change requires <strong>connecting to the new IP</strong> within %d "
"seconds to retain the changes."
msgstr ""

#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js:518
msgctxt "nft match any traffic"
msgid "Any packet"
Expand All @@ -1077,15 +1087,11 @@ msgstr ""
msgid "Any zone"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4749
msgid "Apply and keep settings"
msgstr ""

#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:119
msgid "Apply backup?"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4775
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4776
msgid "Apply request failed with status <code>%h</code>"
msgstr ""

Expand All @@ -1095,8 +1101,12 @@ msgstr ""
msgid "Apply unchecked"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4745
msgid "Apply with revert after connectivity loss"
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4750
msgid "Apply, committing now"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4746
msgid "Apply, reverting if GUI remains unreachable"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4685
Expand Down Expand Up @@ -1538,7 +1548,7 @@ msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:2976
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4251
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4741
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4742
#: modules/luci-compat/luasrc/view/cbi/delegator.htm:14
#: modules/luci-compat/luasrc/view/cbi/simpleform.htm:52
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:188
Expand Down Expand Up @@ -1661,7 +1671,7 @@ msgstr ""
msgid "Changes"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4811
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4812
msgid "Changes have been reverted."
msgstr ""

Expand Down Expand Up @@ -1705,6 +1715,10 @@ msgstr ""
msgid "Checking image…"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4737
msgid "Choose how to apply changes:"
msgstr ""

#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:429
msgid "Choose mtdblock"
msgstr ""
Expand Down Expand Up @@ -4502,13 +4516,6 @@ msgid ""
"device node"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4736
msgid ""
"If the IP address used to access LuCI changes, a <strong>manual reconnect to "
"the new IP</strong> is required within %d seconds to confirm the settings, "
"otherwise modifications will be reverted."
msgstr ""

#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1052
#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/ipip6.js:70
#: protocols/luci-proto-mbim/htdocs/luci-static/resources/protocol/mbim.js:134
Expand Down Expand Up @@ -8082,11 +8089,11 @@ msgstr ""
msgid "Revert changes"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4820
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4821
msgid "Revert request failed with status <code>%h</code>"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4800
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4801
msgid "Reverting configuration…"
msgstr ""

Expand Down Expand Up @@ -9645,12 +9652,6 @@ msgstr ""
msgid "The netfilter components below are only regarded when running fw4."
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4735
msgid ""
"The network access to this device could be interrupted by changing settings "
"of the \"%h\" interface."
msgstr ""

#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2160
msgid "The network name is already used"
msgstr ""
Expand Down Expand Up @@ -9810,7 +9811,7 @@ msgstr ""
msgid "There are no active leases"
msgstr ""

#: modules/luci-base/htdocs/luci-static/resources/ui.js:4767
#: modules/luci-base/htdocs/luci-static/resources/ui.js:4768
msgid "There are no changes to apply"
msgstr ""

Expand Down
Loading

0 comments on commit a6f8361

Please sign in to comment.