summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-app-aria2/luasrc/model/cbi/aria2.lua2
-rw-r--r--applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua4
-rw-r--r--applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js25
-rw-r--r--applications/luci-app-opkg/luasrc/controller/opkg.lua6
-rw-r--r--applications/luci-app-opkg/po/ca/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/cs/opkg.po250
-rw-r--r--applications/luci-app-opkg/po/de/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/el/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/en/opkg.po201
-rw-r--r--applications/luci-app-opkg/po/es/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/fr/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/he/opkg.po135
-rw-r--r--applications/luci-app-opkg/po/hu/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/it/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/ja/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/ko/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/ms/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/no/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/pl/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/pt-br/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/pt/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/ro/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/ru/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/sk/opkg.po135
-rw-r--r--applications/luci-app-opkg/po/sv/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/templates/opkg.pot135
-rw-r--r--applications/luci-app-opkg/po/tr/opkg.po135
-rw-r--r--applications/luci-app-opkg/po/uk/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/vi/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/zh-cn/opkg.po137
-rw-r--r--applications/luci-app-opkg/po/zh-tw/opkg.po137
-rw-r--r--applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua8
-rwxr-xr-xapplications/luci-app-statistics/root/usr/bin/stat-genconfig2
-rw-r--r--modules/luci-base/po/es/base.po89
-rw-r--r--themes/luci-theme-material/luasrc/view/themes/material/header.htm2
36 files changed, 2105 insertions, 1903 deletions
diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua
index 9e9df9aa71..d36610b49a 100644
--- a/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua
+++ b/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua
@@ -135,7 +135,7 @@ o = s:taboption("task", Value, "max_concurrent_downloads", translate("Max concur
o.placeholder = "5"
o = s:taboption("task", Value, "max_connection_per_server", translate("Max connection per server"), "1-16")
-o.datetype = "range(1, 16)"
+o.datatype = "range(1, 16)"
o.placeholder = "1"
o = s:taboption("task", Value, "min_split_size", translate("Min split size"), "1M-1024M")
diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua
index 0eda5d83e0..2496259bad 100644
--- a/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua
+++ b/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua
@@ -190,7 +190,7 @@ o.optional = false
o = s:option(Value, "hostname", translate("Hostname or address of UPS"))
o.optional = false
-s.datetype = "host"
+s.datatype = "host"
o = s:option(Value, "port", translate("Port"))
o.optional = true
@@ -219,7 +219,7 @@ o.optional = false
o = s:option(Value, "hostname", translate("Hostname or address of UPS"))
o.optional = false
-s.datetype = "host"
+s.datatype = "host"
o = s:option(Value, "port", translate("Port"))
o.optional = true
diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
index 4a36b0a3c3..20fbf430be 100644
--- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
+++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
@@ -134,7 +134,12 @@ function display(pattern)
var btn, ver;
if (currentDisplayMode === 'updates') {
- var avail = packages.available.pkgs[name];
+ var avail = packages.available.pkgs[name],
+ inst = packages.installed.pkgs[name];
+
+ if (!inst || !inst.installed)
+ continue;
+
if (!avail || compareVersion(avail.version, pkg.version) <= 0)
continue;
@@ -149,23 +154,28 @@ function display(pattern)
}, _('Upgrade…'));
}
else if (currentDisplayMode === 'installed') {
+ if (!pkg.installed)
+ continue;
+
ver = truncateVersion(pkg.version || '-');
btn = E('div', {
'class': 'btn cbi-button-negative',
'data-package': name,
'click': handleRemove
- }, _('Remove'));
+ }, _('Remove…'));
}
else {
+ var inst = packages.installed.pkgs[name];
+
ver = truncateVersion(pkg.version || '-');
- if (!packages.installed.pkgs[name])
+ if (!inst || !inst.installed)
btn = E('div', {
'class': 'btn cbi-button-action',
'data-package': name,
'click': handleInstall
}, _('Install…'));
- else if (packages.installed.pkgs[name].version != pkg.version)
+ else if (inst.installed && inst.version != pkg.version)
btn = E('div', {
'class': 'btn cbi-button-positive',
'data-package': name,
@@ -579,6 +589,10 @@ function handleInstall(ev)
desc || '',
errs || inst || '',
E('div', { 'class': 'right' }, [
+ E('label', { 'class': 'cbi-checkbox', 'style': 'float:left; padding-top:.5em' }, [
+ E('input', { 'type': 'checkbox', 'name': 'overwrite' }), ' ',
+ _('Overwrite files from other package(s)')
+ ]),
E('div', {
'class': 'btn',
'click': L.hideModal
@@ -734,6 +748,7 @@ function handleOpkg(ev)
var cmd = ev.target.getAttribute('data-command'),
pkg = ev.target.getAttribute('data-package'),
rem = document.querySelector('input[name="autoremove"]'),
+ owr = document.querySelector('input[name="overwrite"]'),
url = 'admin/system/opkg/exec/' + encodeURIComponent(cmd);
var dlg = L.showModal(_('Executing package manager'), [
@@ -741,7 +756,7 @@ function handleOpkg(ev)
_('Waiting for the <em>opkg %h</em> command to complete…').format(cmd))
]);
- L.post(url, { package: pkg, autoremove: rem ? rem.checked : false }, function(xhr, res) {
+ L.post(url, { package: pkg, autoremove: rem ? rem.checked : false, overwrite: owr ? owr.checked : false }, function(xhr, res) {
dlg.removeChild(dlg.lastChild);
if (res.stdout)
diff --git a/applications/luci-app-opkg/luasrc/controller/opkg.lua b/applications/luci-app-opkg/luasrc/controller/opkg.lua
index 74aa166184..39c5d1fb85 100644
--- a/applications/luci-app-opkg/luasrc/controller/opkg.lua
+++ b/applications/luci-app-opkg/luasrc/controller/opkg.lua
@@ -26,13 +26,17 @@ end
function action_exec(command, package)
local sys = require "luci.sys"
- local cmd = { "/bin/opkg", "--force-removal-of-dependent-packages", "--force-overwrite" }
+ local cmd = { "/bin/opkg", "--force-removal-of-dependent-packages" }
local pkg = luci.http.formvalue("package")
if luci.http.formvalue("autoremove") == "true" then
cmd[#cmd + 1] = "--autoremove"
end
+ if luci.http.formvalue("overwrite") == "true" then
+ cmd[#cmd + 1] = "--force-overwrite"
+ end
+
cmd[#cmd + 1] = command
if pkg then
diff --git a/applications/luci-app-opkg/po/ca/opkg.po b/applications/luci-app-opkg/po/ca/opkg.po
index ec0802498f..b15c51684e 100644
--- a/applications/luci-app-opkg/po/ca/opkg.po
+++ b/applications/luci-app-opkg/po/ca/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Accions"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr "Disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Cancel·la"
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Configuració"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Descripció"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,12 +75,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Descarrega i instal·la el paquet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Error"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -92,44 +92,44 @@ msgstr "Filtre"
msgid "Free space"
msgstr "Espai lliure"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Instal·la"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Instal·la"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Instal·la"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Vés a la pàgina de configuració"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Descarrega i instal·la el paquet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -137,25 +137,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "No hi ha informació disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Cerca paquet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Total disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "No connectat"
@@ -164,13 +164,17 @@ msgstr "No connectat"
msgid "OK"
msgstr "D'acord"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Configuració d&#39;OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nom del paquet"
@@ -184,52 +188,55 @@ msgstr "Nom del paquet"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Treu"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Treu…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Treu"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Restableix"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Desa"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Configuració de dispositiu"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Mida"
@@ -242,21 +249,21 @@ msgstr "Mida (.ipk)"
msgid "Software"
msgstr "Programari"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -276,39 +283,39 @@ msgstr "Actualitza les llistes"
msgid "Updates"
msgstr "Actualitza les llistes"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versió"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Esperant que s'acabi l'ordre..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "desconegut"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/cs/opkg.po b/applications/luci-app-opkg/po/cs/opkg.po
index 2c452705c2..a93ddb9f24 100644
--- a/applications/luci-app-opkg/po/cs/opkg.po
+++ b/applications/luci-app-opkg/po/cs/opkg.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-31 13:59+0200\n"
+"Project-Id-Version: \n"
+"PO-Revision-Date: 2019-06-19 12:13+0200\n"
"Last-Translator: koli <lukas.koluch@gmail.com>\n"
"Language-Team: none\n"
"Language: cs\n"
@@ -9,78 +9,81 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Poedit 2.2.1\n"
+"POT-Creation-Date: \n"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
msgid "Actions"
msgstr "Akce"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
-msgstr ""
+msgstr "Automatické odstranění nepoužívaných závislostí"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
msgid "Available"
msgstr "Dostupné"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
"custom repository entries. The configuration in the other files may be "
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
+"Níže je uveden seznam různých konfiguračních souborů, které <em>opkg</em> "
+"používá. Použijte <em>opkg.conf</em> pro globální nastavení a "
+"<em>customfeeds.conf</em> pro vlastní položky úložiště. Konfigurace v jiných "
+"souborech může být změněna, ale obvykle není spravována <em>sysupgrade</em>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Storno"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
msgid "Clear"
-msgstr ""
+msgstr "Prázdný"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
-#, fuzzy
msgid "Configure opkg…"
-msgstr "Nastavení"
+msgstr "Nakonfigurujte opkg…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
-msgstr ""
+msgstr "Závislosti"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Popis"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
-msgstr ""
+msgstr "Podrobnosti o balíčku <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
-msgstr ""
+msgstr "Propustit"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
-msgstr ""
+msgstr "Zobrazuji %d-%d z %d"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
msgid "Download and install package"
msgstr "Stáhnout a nainstalovat balíček"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
-msgstr "Chyba"
+msgstr "Chyby"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
-msgstr ""
+msgstr "Spuštění správce balíčků"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
msgid "Filter"
@@ -90,223 +93,224 @@ msgstr "Filtr"
msgid "Free space"
msgstr "Volné místo"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Instalovat"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
-#, fuzzy
msgid "Installed"
-msgstr "Instalovat"
+msgstr "Instalací"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
+"Instalace balíků z nedůvěryhodných zdrojů je potenciálním bezpečnostním "
+"rizikem! Opravdu se pokusíte nainstalovat <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
-msgstr "Instalovat"
+msgstr "Instalovat…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
-msgstr "Přejít na související konfigurační stránku"
+msgstr "Načítání konfiguračních dat…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
-msgstr ""
+msgstr "Načítání informací o balíčku…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
-msgstr "Stáhnout a nainstalovat balíček"
+msgstr "Ručně nainstalujte balíček"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
-msgstr ""
+msgstr "Vyžaduje upgrade"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
msgid "Next page"
-msgstr ""
+msgstr "Další stránka"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Údaje nejsou k dispozici"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
-msgstr "Vyhledat balíček"
+msgstr "Žádné balíčky"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
-msgstr ""
+msgstr "Žádné balíčky odpovídající \"<strong>%h</strong>\"."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
-msgstr "Dostupná celkem"
+msgstr "Není dostupný"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
-msgstr "Nepřipojeno"
+msgstr "Není instalován"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
-msgstr "Konfigurace balíčků OPKG"
+msgstr "Konfigurace OPKG"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Název balíčku"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
-#, fuzzy
msgid "Package name or URL…"
-msgstr "Název balíčku"
+msgstr "Název balíčku nebo adresa URLL…"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
msgid "Previous page"
-msgstr ""
+msgstr "Předchozí stránka"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
-msgstr ""
+msgstr "Opravdu se pokusíte nainstalovat <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Odstranit"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Odstranit…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
-msgstr ""
+msgstr "Odstraňte balíček <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Odstranit"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
-msgstr ""
+msgstr "Vyžadovat cca. %.1024mB velikost pro balíčky %d instalaci."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
-msgstr ""
+msgstr "Vyžadovat verzi %h %h, instalovaná %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
+"Požadovaný balíček závislostí <em>%h</em> není dostupný v žádném úložišti."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
-msgstr ""
+msgstr "Vyžaduje aktualizaci na %h %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Reset"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Uložit"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
-msgstr "Nastavení zařízení"
+msgstr "Ukládání konfiguračních dat…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Velikost"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
msgid "Size (.ipk)"
-msgstr ""
+msgstr "Velikost (.ipk)"
#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
msgid "Software"
msgstr "Software"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
-msgstr ""
+msgstr "Příkaz <em>opkg %h</em> byl označen kódem <code>%d</code>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
+"Nainstalovaná verze balíku <em>%h</em> není kompatibilní, vyžaduje instalaci "
+"%s, ale %s."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
-msgstr ""
+msgstr "Balík <em>%h</em> není k dispozici v žádném nakonfigurovaném úložišti."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
msgstr ""
+"Verze balíčku <em>%h</em> není kompatibilní, vyžaduje %s, ale k dispozici je "
+"pouze %s."
#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
msgid "Type to filter…"
-msgstr ""
+msgstr "Začněte psát pro filtrování…"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
-#, fuzzy
msgid "Update lists…"
-msgstr "Aktualizovat seznamy"
+msgstr "Aktualizovat seznamy…"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
-#, fuzzy
msgid "Updates"
-msgstr "Aktualizovat seznamy"
+msgstr "Aktualizace"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
-msgstr ""
+msgstr "Upgrade…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Verze"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
-msgstr ""
+msgstr "Verze nekompatibilní"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
-msgstr "Čekání na dokončení příkazu..."
+msgstr "Čekání na dokončení příkazu <em>opkg %h</em> …"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "neznámý"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
-msgstr ""
+msgstr "~%.1024mB komprimován"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
-msgstr ""
+msgstr "~%.1024mB nainstalován"
diff --git a/applications/luci-app-opkg/po/de/opkg.po b/applications/luci-app-opkg/po/de/opkg.po
index 4d899e40e6..5efd9a0dfb 100644
--- a/applications/luci-app-opkg/po/de/opkg.po
+++ b/applications/luci-app-opkg/po/de/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Aktionen"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr "Unbenutzte Abhängigkeiten automatisch entfernen"
@@ -25,7 +25,7 @@ msgstr "Unbenutzte Abhängigkeiten automatisch entfernen"
msgid "Available"
msgstr "Verfügbar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -39,10 +39,10 @@ msgstr ""
"Konfigurationsdateien kann zwar geändert werden, wird aber überlicherweise "
"bei Systemupdates zurückgesetzt."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Abbrechen"
@@ -54,25 +54,25 @@ msgstr "Zurücksetzen"
msgid "Configure opkg…"
msgstr "Konfiguriere opkg…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr "Abhängigkeiten"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Beschreibung"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr "Details für Paket <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "Schließen"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr "Einträge %d-%d von %d"
@@ -80,11 +80,11 @@ msgstr "Einträge %d-%d von %d"
msgid "Download and install package"
msgstr "Paket herunterladen und installieren"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr "Fehler"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr "Paketmanager ausführen"
@@ -96,18 +96,18 @@ msgstr "Filter"
msgid "Free space"
msgstr "Freier Platz"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Installieren"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr "Installiert"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
@@ -116,23 +116,23 @@ msgstr ""
"Sicherheitsrisiko! Soll wirklich versucht werden, <em>%h</em> zu "
"installieren?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr "Installieren…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr "Lade Konfigurationsdaten…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr "Lade Paketinformationen…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr "Paket manuell installieren"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr "Aktualisierung benötigt"
@@ -140,23 +140,23 @@ msgstr "Aktualisierung benötigt"
msgid "Next page"
msgstr "Nächste Seite"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Keine Informationen verfügbar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr "Keine Pakete"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr "Keine auf \"<strong>%h</strong>\" zutreffenden Pakete."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr "Nicht verfügbar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr "Nicht installiert"
@@ -164,12 +164,16 @@ msgstr "Nicht installiert"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr "OPKG-Konfiguration"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr "Überschreiben von Dateien anderer Pakete erlauben"
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Paketname"
@@ -182,53 +186,56 @@ msgstr "Paketname oder URL…"
msgid "Previous page"
msgstr "Vorige Seite"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr "Soll wirklich versucht werden, <em>%h</em> zu installieren?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Entfernen"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Entfernen…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr "Paket <em>%h</em> entfernen"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Entfernen"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
"Benötige etwa %.1024mB Speicherplatz für die Installation von %d Pakete(n)."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
"Benötigtes abhängiges Paket <em>%h</em> ist in keinem Repository verfügbar."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr "Benötigt Update auf Version %h %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Zurücksetzen"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Speichern"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr "Speichere Konfigurationsdaten…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Größe"
@@ -241,12 +248,12 @@ msgstr "Größe (.ipk)"
msgid "Software"
msgstr "Paketverwaltung"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
"Das <em>opkg %h</em> Kommando wurde mit Fehlercode <code>%d</code> beendet."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
@@ -254,12 +261,12 @@ msgstr ""
"Die installierte Version von Paket <em>%h</em> ist nicht kompatibel, "
"benötige Version %s während %s installiert ist."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
"Das Paket <em>%h</em> ist in keinem konfiguriertem Repository verfügbar."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -279,39 +286,39 @@ msgstr "Listen aktualisieren…"
msgid "Updates"
msgstr "Aktualisierungen"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr "Aktualisieren…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Version"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr "Version inkompatibel"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Warte auf das <em>opkg %h</em> Kommando…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "unbekannt"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr "ca. %.1024mB komprimiert"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr "ca. %.1024mB installiert"
diff --git a/applications/luci-app-opkg/po/el/opkg.po b/applications/luci-app-opkg/po/el/opkg.po
index 29919b48d3..647c8e43d0 100644
--- a/applications/luci-app-opkg/po/el/opkg.po
+++ b/applications/luci-app-opkg/po/el/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Ενέργειες"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr "Διαθέσιμο"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Ακύρωση"
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Παραμετροποίηση"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Περιγραφή"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,12 +75,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Κατέβασμα και εγκατάσταση πακέτου"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Σφάλμα"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -92,44 +92,44 @@ msgstr "Φίλτρο"
msgid "Free space"
msgstr "Ελεύθερος χώρος"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Εγκατάσταση"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Εγκατάσταση"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Εγκατάσταση"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Μετάβαση στη σχετική σελίδα ρυθμίσεων"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Κατέβασμα και εγκατάσταση πακέτου"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -137,25 +137,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Δεν υπάρχουν πληροφορίες διαθέσιμες"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Εύρεση πακέτου"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Διαθέσιμο Συνολικά"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Εγκατάσταση"
@@ -164,13 +164,17 @@ msgstr "Εγκατάσταση"
msgid "OK"
msgstr "Εντάξει"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Παραμετροποίηση OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Όνομα πακέτου"
@@ -184,52 +188,55 @@ msgstr "Όνομα πακέτου"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Αφαίρεση"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Αφαίρεση…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Αρχικοποίηση"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Αποθήκευση"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Παραμετροποίηση Συσκευής"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Μέγεθος"
@@ -242,21 +249,21 @@ msgstr ""
msgid "Software"
msgstr "Λογισμικό"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -274,38 +281,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Έκδοση"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/en/opkg.po b/applications/luci-app-opkg/po/en/opkg.po
index 7b14c301b2..49422f6e15 100644
--- a/applications/luci-app-opkg/po/en/opkg.po
+++ b/applications/luci-app-opkg/po/en/opkg.po
@@ -15,17 +15,17 @@ msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
msgid "Actions"
-msgstr "Actions"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
msgid "Available"
-msgstr "Available"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,103 +33,97 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
-msgstr "Cancel"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
msgid "Clear"
msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
-#, fuzzy
msgid "Configure opkg…"
-msgstr "Configuration"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
-msgstr "Description"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
msgid "Download and install package"
-msgstr "Download and install package"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
-msgstr "Error"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
msgid "Filter"
-msgstr "Filter"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
msgid "Free space"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
-msgstr "Install"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
-#, fuzzy
msgid "Installed"
-msgstr "Install"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
-msgstr "Install"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
-msgstr "Go to relevant configuration page"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
-msgstr "Download and install package"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -137,101 +131,102 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
-msgstr "Find package"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
-msgstr "(%s available)"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
-msgstr "Install"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
msgid "OK"
-msgstr "OK"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
-msgstr "OPKG-Configuration"
+msgstr ""
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
-msgstr "Package name"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
-#, fuzzy
msgid "Package name or URL…"
-msgstr "Package name"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Remove"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr ""
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
-msgstr "Reset"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
-msgstr "Save"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
-#, fuzzy
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
-msgstr "Device Configuration"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
-msgstr "Size"
+msgstr ""
#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
msgid "Size (.ipk)"
@@ -240,23 +235,23 @@ msgstr ""
#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
msgid "Software"
-msgstr "Software"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -274,38 +269,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
-msgstr "Version"
+msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/es/opkg.po b/applications/luci-app-opkg/po/es/opkg.po
index e2cb925e3c..aa4c5c0f1a 100644
--- a/applications/luci-app-opkg/po/es/opkg.po
+++ b/applications/luci-app-opkg/po/es/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Acciones"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr "Eliminar automáticamente las dependencias no utilizadas"
@@ -25,7 +25,7 @@ msgstr "Eliminar automáticamente las dependencias no utilizadas"
msgid "Available"
msgstr "Disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -38,10 +38,10 @@ msgstr ""
"personalizadas del repositorio. La configuración en los otros archivos puede "
"cambiarse, pero por lo general no se conserva mediante <em>sysupgrade</em>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Cancelar"
@@ -53,25 +53,25 @@ msgstr "Limpiar"
msgid "Configure opkg…"
msgstr "Configurar opkg..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr "Dependencias"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Descripción"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr "Detalles para el paquete <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "Descartar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr "Mostrando %d-%d de %d"
@@ -79,11 +79,11 @@ msgstr "Mostrando %d-%d de %d"
msgid "Download and install package"
msgstr "Descargar e instalar paquete"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr "Errores"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr "Ejecutando el gestor de paquetes"
@@ -95,18 +95,18 @@ msgstr "Filtro"
msgid "Free space"
msgstr "Espacio libre"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Instalar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr "Instalado"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
@@ -114,23 +114,23 @@ msgstr ""
"¡Instalar paquetes de fuentes no confiables es un riesgo potencial de "
"seguridad! ¿Realmente intentas instalar <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr "Instalar..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr "Cargando datos de configuración..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr "Cargando información del paquete..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr "Instalar manualmente el paquete"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr "Necesita actualización"
@@ -138,23 +138,23 @@ msgstr "Necesita actualización"
msgid "Next page"
msgstr "Siguiente página"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "No hay información disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr "Sin paquetes"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr "No hay paquetes que coincidan con \"<strong>%h</strong>\"."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr "No disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr "No instalado"
@@ -162,12 +162,16 @@ msgstr "No instalado"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr "Configuración de OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nombre del paquete"
@@ -180,54 +184,57 @@ msgstr "Nombre del paquete o URL..."
msgid "Previous page"
msgstr "Pagina anterior"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr "¿Realmente intentas instalar <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Desinstalar"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Desinstalar…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr "Eliminar paquete <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Desinstalar"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
"Requiere un tamaño aproximado de %.1024mB para que se instale/n %d paquete/s"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
"El paquete de dependencia requerido <em>%h</em> no está disponible en ningún "
"repositorio."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr "Requiere actualización a %h %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Reiniciar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Guardar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr "Guardando datos de configuración..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Tamaño"
@@ -240,11 +247,11 @@ msgstr "Tamaño (.ipk)"
msgid "Software"
msgstr "Software"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr "El comando <em>opkg %h</em> falló con el código <code>%d</code>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
@@ -252,12 +259,12 @@ msgstr ""
"La versión instalada del paquete <em>%h</em> no es compatible, requiere %s "
"mientras que %s está instalado."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
"El paquete <em>%h</em> no está disponible en ningún repositorio configurado."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -277,39 +284,39 @@ msgstr "Actualizar listas..."
msgid "Updates"
msgstr "Actualizaciones"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr "Actualizar..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versión"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr "Versión incompatible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Esperando que el comando <em>opkg %h</em> se complete..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "desconocido"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr "~%.1024mB comprimido"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr "~%.1024mB instalado"
diff --git a/applications/luci-app-opkg/po/fr/opkg.po b/applications/luci-app-opkg/po/fr/opkg.po
index 015a6b66a5..c1b014a5db 100644
--- a/applications/luci-app-opkg/po/fr/opkg.po
+++ b/applications/luci-app-opkg/po/fr/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Actions"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr "Disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Annuler"
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Configuration"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Description"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,12 +75,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Télécharge et installe le paquet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Erreur"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -92,44 +92,44 @@ msgstr "Filtrer"
msgid "Free space"
msgstr "Espace libre"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Installer"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Installer"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Installer"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Aller à la page de configuration correspondante"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Télécharge et installe le paquet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -137,25 +137,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Information indisponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Trouver un paquet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Total disponible"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Non connecté"
@@ -164,13 +164,17 @@ msgstr "Non connecté"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Configuration OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nom du paquet"
@@ -184,52 +188,55 @@ msgstr "Nom du paquet"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Désinstaller"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Désinstaller…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Désinstaller"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Remise à zéro"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Sauvegarder"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Configuration de l'équipement"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Taille"
@@ -242,21 +249,21 @@ msgstr ""
msgid "Software"
msgstr "Logiciels"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -276,39 +283,39 @@ msgstr "Mettre les listes à jour"
msgid "Updates"
msgstr "Mettre les listes à jour"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Version"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "En attente de la fin de la commande..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "inconnu"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/he/opkg.po b/applications/luci-app-opkg/po/he/opkg.po
index 0834cabd07..96cabcf3a9 100644
--- a/applications/luci-app-opkg/po/he/opkg.po
+++ b/applications/luci-app-opkg/po/he/opkg.po
@@ -15,7 +15,7 @@ msgstr ""
msgid "Actions"
msgstr "פעולות"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
msgid "Available"
msgstr "זמין"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,10 +31,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "בטל"
@@ -47,25 +47,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "הגדרות"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "תיאור"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -73,12 +73,12 @@ msgstr ""
msgid "Download and install package"
msgstr "הורד והתקן חבילות"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "שגיאה"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -90,42 +90,42 @@ msgstr ""
msgid "Free space"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "הגדרות נפוצות"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "הורד והתקן חבילות"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -133,25 +133,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "חבילות זמינות"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "סה\"כ פנוי"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "לא מחובר"
@@ -160,13 +160,17 @@ msgstr "לא מחובר"
msgid "OK"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "הגדרות"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "שם החבילה"
@@ -180,52 +184,55 @@ msgstr "שם החבילה"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr ""
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "הגדרות מכשיר"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr ""
@@ -238,21 +245,21 @@ msgstr ""
msgid "Software"
msgstr "תוכנה"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -270,38 +277,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "גרסה"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/hu/opkg.po b/applications/luci-app-opkg/po/hu/opkg.po
index ca44a7c09c..038248c113 100644
--- a/applications/luci-app-opkg/po/hu/opkg.po
+++ b/applications/luci-app-opkg/po/hu/opkg.po
@@ -15,7 +15,7 @@ msgstr ""
msgid "Actions"
msgstr "Műveletek"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
msgid "Available"
msgstr "Elérhető"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,10 +31,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Mégsem"
@@ -47,25 +47,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Beállítás"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Leírás"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -73,12 +73,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Csomag letöltése és telepítése"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Hiba"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -90,44 +90,44 @@ msgstr "Szűrő"
msgid "Free space"
msgstr "Szabad hely"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Telepítés"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Telepítés"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Telepítés"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Ugrás a tárgyhoz tartozó beállításokhoz"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Csomag letöltése és telepítése"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -135,25 +135,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Nincs elérhető információ"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Csomag keresése"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Összes elérhető"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Nincs kapcsolódva"
@@ -162,13 +162,17 @@ msgstr "Nincs kapcsolódva"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "OPKG-Beállítások"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Csomagnév"
@@ -182,52 +186,55 @@ msgstr "Csomagnév"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Eltávolítás"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Eltávolítás…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Eltávolítás"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Visszaállítás"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Mentés"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Eszköz beállítások"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Méret"
@@ -240,21 +247,21 @@ msgstr ""
msgid "Software"
msgstr "Szoftver"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -274,39 +281,39 @@ msgstr "Listák frissítése"
msgid "Updates"
msgstr "Listák frissítése"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Verzió"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Várakozás a parancs befejezésére..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "ismeretlen"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/it/opkg.po b/applications/luci-app-opkg/po/it/opkg.po
index ee187e3b40..1e94abfe39 100644
--- a/applications/luci-app-opkg/po/it/opkg.po
+++ b/applications/luci-app-opkg/po/it/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Azioni"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr "Disponibile"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Annulla"
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Configurazione"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Descrizione"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,12 +75,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Scarica e installa pacchetto"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Errore"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -92,44 +92,44 @@ msgstr "Filtro"
msgid "Free space"
msgstr "Spazio libero"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Installa"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Installa"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Installa"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Vai alla pagina di configurazione relativa"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Scarica e installa pacchetto"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -137,25 +137,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Nessuna informazione disponibile"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Cerca pacchetto"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Totale"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Non connesso"
@@ -164,13 +164,17 @@ msgstr "Non connesso"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Configurazione di OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nome pacchetto"
@@ -184,52 +188,55 @@ msgstr "Nome pacchetto"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Rimuovi"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Rimuovi…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Reset"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Salva"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Configurazione del dispositivo"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Dimensione"
@@ -242,21 +249,21 @@ msgstr ""
msgid "Software"
msgstr "Software"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -276,39 +283,39 @@ msgstr "Aggiorna liste"
msgid "Updates"
msgstr "Aggiorna liste"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versione"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "In attesa del comando da completare..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "sconosciuto"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/ja/opkg.po b/applications/luci-app-opkg/po/ja/opkg.po
index 45b32863cb..851a5bede1 100644
--- a/applications/luci-app-opkg/po/ja/opkg.po
+++ b/applications/luci-app-opkg/po/ja/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "操作"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr "使用されない依存パッケージを自動的に削除"
@@ -25,7 +25,7 @@ msgstr "使用されない依存パッケージを自動的に削除"
msgid "Available"
msgstr "利用可能"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -37,10 +37,10 @@ msgstr ""
"ポジトリの登録に使用します。これら以外のファイル内の設定を変更しても、通常は "
"<em>sysupgrade</em> 時に保持されません。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "キャンセル"
@@ -52,25 +52,25 @@ msgstr "クリア"
msgid "Configure opkg…"
msgstr "opkg を設定…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr "依存関係"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "詳細"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr "<em>%h</em> パッケージの詳細"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "閉じる"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr "%d - %d を表示中(全 %d)"
@@ -78,11 +78,11 @@ msgstr "%d - %d を表示中(全 %d)"
msgid "Download and install package"
msgstr "パッケージのダウンロードとインストール"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr "エラー"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr "パッケージ マネージャーを実行中"
@@ -94,18 +94,18 @@ msgstr "フィルタ"
msgid "Free space"
msgstr "ディスクの空き容量"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "インストール"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr "インストール済"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
@@ -113,23 +113,23 @@ msgstr ""
"信頼されていない提供元からのパッケージのインストールは、セキュリティ リスクを"
"伴います! <em>%h</em> のインストールを試行してもよろしいですか?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr "インストール…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr "設定データをロード中…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr "パッケージ情報をロード中…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr "パッケージの手動インストール"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr "要アップグレード"
@@ -137,23 +137,23 @@ msgstr "要アップグレード"
msgid "Next page"
msgstr "次のページ"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "情報がありません"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr "パッケージがありません"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr "\"<strong>%h</strong>\" に一致するパッケージはありません。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr "利用不可"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr "未インストール"
@@ -161,12 +161,16 @@ msgstr "未インストール"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr "OPKG 設定"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "パッケージ名"
@@ -179,52 +183,55 @@ msgstr "パッケージ名または URL…"
msgid "Previous page"
msgstr "前のページ"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr "<em>%h</em> のインストールを試行してもよろしいですか?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "削除"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "削除…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr "<em>%h</em> パッケージを削除"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "削除"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr "インストールには約 %.1024mB の領域が必要です(上記 %d パッケージ)。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
"必須の依存パッケージ <em>%h</em> は、設定済みのリポジトリでは利用できません。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr "%h %h への更新が必要です"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "リセット"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "保存"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr "設定データを保存中…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "サイズ"
@@ -237,11 +244,11 @@ msgstr "サイズ (.ipk)"
msgid "Software"
msgstr "ソフトウェア"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr "<em>opkg %h</em> コマンドが失敗しました。(コード <code>%d</code>)"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
@@ -249,11 +256,11 @@ msgstr ""
"<em>%h</em> のインストール済みバージョンは互換性がありません。 %s が、インス"
"トールされている %s には必要です。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr "<em>%h</em> パッケージは、設定済みのリポジトリでは利用できません。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -273,39 +280,39 @@ msgstr "リストを更新…"
msgid "Updates"
msgstr "更新"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr "アップグレード…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "バージョン"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr "互換性の無いバージョン"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "<em>opkg %h</em コマンドを実行中です…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "不明"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr "~ %.1024mB(圧縮後)"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr "~ %.1024mB(インストール後)"
diff --git a/applications/luci-app-opkg/po/ko/opkg.po b/applications/luci-app-opkg/po/ko/opkg.po
index 0c03e5f39e..98b4884e77 100644
--- a/applications/luci-app-opkg/po/ko/opkg.po
+++ b/applications/luci-app-opkg/po/ko/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "관리 도구"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr ""
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "설정"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "설명"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,11 +75,11 @@ msgstr ""
msgid "Download and install package"
msgstr "패키지 다운로드 후 설치"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -91,44 +91,44 @@ msgstr "필터"
msgid "Free space"
msgstr "여유 공간"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "설치"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "설치"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "설치"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "공통 설정"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "패키지 다운로드 후 설치"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -136,25 +136,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "이용 가능한 정보가 없습니다"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "패키지 찾기"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "총 이용 가능한 양"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "연결되지 않음"
@@ -163,13 +163,17 @@ msgstr "연결되지 않음"
msgid "OK"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "OPKG-설정"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "패키지 이름"
@@ -183,52 +187,55 @@ msgstr "패키지 이름"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "제거"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "제거…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "제거"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "초기화"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "저장"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "장치 설정"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Size"
@@ -241,21 +248,21 @@ msgstr "크기 (.ipk)"
msgid "Software"
msgstr "소프트웨어"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -273,39 +280,39 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "버전"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "실행한 명령이 끝나기를 기다리는 중입니다..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/ms/opkg.po b/applications/luci-app-opkg/po/ms/opkg.po
index f1cde1fd85..123959f5cc 100644
--- a/applications/luci-app-opkg/po/ms/opkg.po
+++ b/applications/luci-app-opkg/po/ms/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Aksi"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr "Boleh didapati"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Batal"
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Konfigurasi"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Keterangan"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,12 +75,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Turun dan memasang pakej"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Kesalahan"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -92,44 +92,44 @@ msgstr "Penapis"
msgid "Free space"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Memasang"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Memasang"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Memasang"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Menuju ke halaman konfigurasi yang relevan"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Turun dan memasang pakej"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -137,25 +137,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Cari pakej"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "(%s sedia)"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Memasang"
@@ -164,13 +164,17 @@ msgstr "Memasang"
msgid "OK"
msgstr "Baik"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "OPKG-Konfigurasi"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nama pakej"
@@ -184,51 +188,54 @@ msgstr "Nama pakej"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Menghapuskan"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Menghapuskan…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Menghapuskan"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Reset"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Simpan"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Saiz"
@@ -241,21 +248,21 @@ msgstr ""
msgid "Software"
msgstr "Perisian"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -273,38 +280,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versi"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/no/opkg.po b/applications/luci-app-opkg/po/no/opkg.po
index fe140cdc01..26ec3833e0 100644
--- a/applications/luci-app-opkg/po/no/opkg.po
+++ b/applications/luci-app-opkg/po/no/opkg.po
@@ -12,7 +12,7 @@ msgstr ""
msgid "Actions"
msgstr "Handlinger"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
msgid "Available"
msgstr "Tilgjengelig"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -28,10 +28,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Avbryt"
@@ -44,25 +44,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Konfigurasjon"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Beskrivelse"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -70,12 +70,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Last ned og installer pakken"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Feil"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -87,44 +87,44 @@ msgstr "Filter"
msgid "Free space"
msgstr "Ledig plass"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Installer"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Installer"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Installer"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Gå til relevant konfigurasjonen side"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Last ned og installer pakken"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -132,25 +132,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Ingen informasjon tilgjengelig"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Finn pakke"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Totalt Tilgjengelig"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Ikke tilkoblet"
@@ -159,13 +159,17 @@ msgstr "Ikke tilkoblet"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "<abbr title=\"Open PacKaGe Management\">OPKG</abbr>-Konfigurasjon"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Pakkenavn"
@@ -179,52 +183,55 @@ msgstr "Pakkenavn"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Avinstaller"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Avinstaller…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Avinstaller"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Nullstill"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Lagre"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Enhet Konfigurasjon"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Størrelse"
@@ -237,21 +244,21 @@ msgstr ""
msgid "Software"
msgstr "Programvare"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -271,39 +278,39 @@ msgstr "Oppdater lister"
msgid "Updates"
msgstr "Oppdater lister"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versjon"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Venter på at kommando fullføres..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "ukjent"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/pl/opkg.po b/applications/luci-app-opkg/po/pl/opkg.po
index 52fcb62e1a..9e8a5e8c3e 100644
--- a/applications/luci-app-opkg/po/pl/opkg.po
+++ b/applications/luci-app-opkg/po/pl/opkg.po
@@ -18,7 +18,7 @@ msgstr ""
msgid "Actions"
msgstr "Akcje"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr "Automatycznie usuwaj nieużywane zależności"
@@ -26,7 +26,7 @@ msgstr "Automatycznie usuwaj nieużywane zależności"
msgid "Available"
msgstr "Dostępne"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -39,10 +39,10 @@ msgstr ""
"Konfiguracja w innych plikach może zostać zmieniona, ale zwykle nie jest "
"zachowywana przez <em>sysupgrade</em>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Anuluj"
@@ -55,25 +55,25 @@ msgstr "Wyczyść"
msgid "Configure opkg…"
msgstr "Konfiguruj opkg…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr "Zależności"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Opis"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr "Szczegóły pakietu <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "Odrzuć"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr "Wyświetlanie %d-%d z %d"
@@ -81,12 +81,12 @@ msgstr "Wyświetlanie %d-%d z %d"
msgid "Download and install package"
msgstr "Pobierz i zainstaluj pakiet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Błąd"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr "Wykonywanie menedżera pakietów"
@@ -98,19 +98,19 @@ msgstr "Filtr"
msgid "Free space"
msgstr "Wolna przestrzeń"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Instaluj"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Zainstalowane"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
@@ -118,26 +118,26 @@ msgstr ""
"Instalowanie pakietów z niezaufanych źródeł jest potencjalnym zagrożeniem "
"bezpieczeństwa! Czy na pewno chcesz zainstalować pakiet <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Instaluj…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Ładowanie danych konfiguracyjnych…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr "Ładowanie informacji o pakiecie…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Zainstaluj ręcznie pakiet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
#, fuzzy
msgid "Needs upgrade"
msgstr "Wymuś uaktualnienie"
@@ -146,25 +146,25 @@ msgstr "Wymuś uaktualnienie"
msgid "Next page"
msgstr "Następna strona"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Brak dostępnych informacji"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Brak pakietów"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr "Brak pasujących pakietów \"<strong>%h</strong>\"."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Niedostępne"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Nie zainstalowany"
@@ -173,13 +173,17 @@ msgstr "Nie zainstalowany"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Konfiguracja OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nazwa pakietu"
@@ -193,53 +197,56 @@ msgstr "Nazwa pakietu lub URL…"
msgid "Previous page"
msgstr "Poprzednia strona"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr "Czy na pewno chcesz zainstalować pakiet <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Usuń"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Usuń…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr "Usuń pakiet <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Usuń"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr "Wymaga ok. %.1024mB rozmiaru pakietu %d do zainstalowania."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
"Wymagana zależność <em>%h</em> nie jest dostępna w żadnym repozytorium."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr "Wymaga aktualizacji do %h %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Resetuj"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Zapisz"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Zatwierdzanie konfiguracji…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Rozmiar"
@@ -252,13 +259,13 @@ msgstr "Rozmiar (.ipk)"
msgid "Software"
msgstr "Oprogramowanie"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
"Polecenie <em>opkg %h</em> zakończyło się niepomyślnie z kodem <code>%d</"
"code>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
@@ -266,12 +273,12 @@ msgstr ""
"Zainstalowana wersja pakietu <em>%h</em> nie jest zgodna, wymaga %s podczas "
"gdy %s jest już zainstalowana."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
"Pakiet <em>%h</em> nie jest dostępny w żadnym skonfigurowanym repozytorium."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -293,40 +300,40 @@ msgstr "Aktualizuj listy…"
msgid "Updates"
msgstr "Aktualizacje"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr "Zaktualizuj…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Wersja"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr "Wersja niekompatybilna"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Oczekiwanie na wykonanie polecenia <em>opkg %h</em>…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "nieznane"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr "~%.1024mB skompresowany"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr "~%.1024mB zainstalowany"
diff --git a/applications/luci-app-opkg/po/pt-br/opkg.po b/applications/luci-app-opkg/po/pt-br/opkg.po
index fc4d27996c..3bb622645e 100644
--- a/applications/luci-app-opkg/po/pt-br/opkg.po
+++ b/applications/luci-app-opkg/po/pt-br/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Ações"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr "Disponível"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Cancelar"
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Configuração"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Descrição"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "Dispensar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,12 +75,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Baixe e instale o pacote"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Erro"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -92,44 +92,44 @@ msgstr "Filtro"
msgid "Free space"
msgstr "Espaço livre"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Instalar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Instalar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Instalar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Iniciando a aplicação da configuração..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Baixe e instale o pacote"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
#, fuzzy
msgid "Needs upgrade"
msgstr "Forçar a atualização"
@@ -138,25 +138,25 @@ msgstr "Forçar a atualização"
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Nenhuma informação disponível"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Procurar pacote"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Total Disponível"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Não conectado"
@@ -165,13 +165,17 @@ msgstr "Não conectado"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Configuração-OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nome do Pacote"
@@ -185,52 +189,55 @@ msgstr "Nome do Pacote"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Remover"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Remover…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Remover"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Limpar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Salvar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Iniciando a aplicação da configuração..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Tamanho"
@@ -243,21 +250,21 @@ msgstr "Tamanho (.ipk)"
msgid "Software"
msgstr "Software"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -277,39 +284,39 @@ msgstr "Atualizar listas"
msgid "Updates"
msgstr "Atualizar listas"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versão"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Esperando o término do comando..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "desconhecido"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/pt/opkg.po b/applications/luci-app-opkg/po/pt/opkg.po
index 4da51900a8..5726f02f4b 100644
--- a/applications/luci-app-opkg/po/pt/opkg.po
+++ b/applications/luci-app-opkg/po/pt/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "Acções"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Available"
msgstr "Disponível"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,10 +33,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Cancelar"
@@ -49,25 +49,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Configuração"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Descrição"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -75,12 +75,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Descarregar e instalar pacote"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Erro"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -92,44 +92,44 @@ msgstr "Filtro"
msgid "Free space"
msgstr "Espaço livre"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Instalar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Instalar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Instalar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Ir para a página respectiva de configuração"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Descarregar e instalar pacote"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -137,25 +137,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Sem informação disponível"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Procurar pacote"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Total Disponível"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Não ligado"
@@ -164,13 +164,17 @@ msgstr "Não ligado"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Configuração-OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Nome do pacote"
@@ -184,52 +188,55 @@ msgstr "Nome do pacote"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Remover"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Remover…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Remover"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Reset"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Salvar"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Configuração do Dispositivo"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Tamanho"
@@ -242,21 +249,21 @@ msgstr ""
msgid "Software"
msgstr "Software"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -276,39 +283,39 @@ msgstr "Actualizar listas"
msgid "Updates"
msgstr "Actualizar listas"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versão"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "A aguardar que o comando termine..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "desconhecido"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/ro/opkg.po b/applications/luci-app-opkg/po/ro/opkg.po
index 994750754e..7f60665667 100644
--- a/applications/luci-app-opkg/po/ro/opkg.po
+++ b/applications/luci-app-opkg/po/ro/opkg.po
@@ -16,7 +16,7 @@ msgstr ""
msgid "Actions"
msgstr "Actiune"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
msgid "Available"
msgstr "Disponibil"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -32,10 +32,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Anuleaza"
@@ -48,25 +48,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Configurare"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Descriere"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -74,12 +74,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Descarca si instaleaza pachetul"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Eroare"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -91,44 +91,44 @@ msgstr "Filtreaza"
msgid "Free space"
msgstr "Spatiu liber"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Instalati"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Instalati"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Instalati"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Configurarea obisnuita"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Descarca si instaleaza pachetul"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -136,25 +136,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Nici o informatie disponibila"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Gaseste pachet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Total disponibil"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Nu este conectat"
@@ -163,13 +163,17 @@ msgstr "Nu este conectat"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Configuratia-OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Numele pachetului"
@@ -183,52 +187,55 @@ msgstr "Numele pachetului"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Elimina"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Elimina…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Elimina"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Reset"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Salveaza"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Configurarea dispozitivului"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Marime"
@@ -241,21 +248,21 @@ msgstr ""
msgid "Software"
msgstr "Software"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -273,38 +280,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versiune"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "necunoscut"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/ru/opkg.po b/applications/luci-app-opkg/po/ru/opkg.po
index 8b51784568..7a1f81d0a0 100644
--- a/applications/luci-app-opkg/po/ru/opkg.po
+++ b/applications/luci-app-opkg/po/ru/opkg.po
@@ -19,7 +19,7 @@ msgstr ""
msgid "Actions"
msgstr "Действия"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr "Автоматически удалять неиспользуемые зависимости"
@@ -27,7 +27,7 @@ msgstr "Автоматически удалять неиспользуемые
msgid "Available"
msgstr "Доступно"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -40,10 +40,10 @@ msgstr ""
"Конфигурация в других файлах может производтся, но такие настройки могут не "
"сохраняться утилитой <em>sysupgrade</em>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Отменить"
@@ -55,25 +55,25 @@ msgstr "Очистить"
msgid "Configure opkg…"
msgstr "Настройки менеджера пакетов..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr "Зависимости"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Описание"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr "Подробная информация о пакете <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "Отклонить"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr "Показано %d-%d из %d"
@@ -81,11 +81,11 @@ msgstr "Показано %d-%d из %d"
msgid "Download and install package"
msgstr "Загрузить и установить пакет"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr "Ошибки"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr "Запуск менеджера пакетов"
@@ -97,18 +97,18 @@ msgstr "Фильтр"
msgid "Free space"
msgstr "Свободное место"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Установить"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr "Установлено"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
@@ -116,23 +116,23 @@ msgstr ""
"Установка пакетов из недоверенных источников может привести к угрозе "
"безопасности! Вы действительно хотите установить <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr "Установить..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr "Загрузка данных конфигурации..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr "Загрузка информации о пакете..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr "Ручная установка пакета"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr "Требуется обновление"
@@ -140,23 +140,23 @@ msgstr "Требуется обновление"
msgid "Next page"
msgstr "Следующая страница"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Нет доступной информации"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr "Нет пакетов"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr "Нет пакетов соответствующих запросу «<strong>%h</strong>»."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr "Не доступно"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr "Не установлено"
@@ -164,12 +164,16 @@ msgstr "Не установлено"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr "Настройка OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Имя пакета"
@@ -182,54 +186,57 @@ msgstr "Имя пакета или URL..."
msgid "Previous page"
msgstr "Предыдущая страница"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr "Вы действительно хотите установить <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Удалить"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Удалить…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr "Удалить пакет <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Удалить"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
"Требуется примерно %.1024mБ свободного пространства для установки %d пакетов"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
"Требуемый в качестве зависимости пакет <em>%h</em> не доступен ни в одном из "
"сконфигурированных репозиториев."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr "Требуется обновить до %h %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Сбросить"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Сохранить"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr "Сохранение данных конфигурации..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Размер"
@@ -242,11 +249,11 @@ msgstr "Размер (.ipk)"
msgid "Software"
msgstr "Программное обеспечение"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr "Команда <em>opkg %h</em> завершилась с кодом ошибки <code>%d</code>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
@@ -254,12 +261,12 @@ msgstr ""
"Установленная версия пакета <em>%h</em> не совместима. Требуется установка "
"%s для установки %s"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
"Пакет <em>%h</em> не доступен ни в одном из сконфигурированных репозиториев."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -279,39 +286,39 @@ msgstr "Обновить списки..."
msgid "Updates"
msgstr "Обновления"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr "Обновление..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Версия"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr "Версия несовместима"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Ожидание завершения выполнения команды <em>opkg %h</em>..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "неизвестный"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr "~%.1024mБ сжато"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr "~%.1024mБ установлено"
diff --git a/applications/luci-app-opkg/po/sk/opkg.po b/applications/luci-app-opkg/po/sk/opkg.po
index 424315bcb2..f39e7c54da 100644
--- a/applications/luci-app-opkg/po/sk/opkg.po
+++ b/applications/luci-app-opkg/po/sk/opkg.po
@@ -13,7 +13,7 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
msgid "Available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -29,10 +29,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr ""
@@ -44,25 +44,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -70,11 +70,11 @@ msgstr ""
msgid "Download and install package"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -86,40 +86,40 @@ msgstr ""
msgid "Free space"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -127,23 +127,23 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr ""
@@ -151,12 +151,16 @@ msgstr ""
msgid "OK"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr ""
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr ""
@@ -169,51 +173,54 @@ msgstr ""
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr ""
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr ""
@@ -226,21 +233,21 @@ msgstr ""
msgid "Software"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -258,38 +265,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/sv/opkg.po b/applications/luci-app-opkg/po/sv/opkg.po
index c230067ce5..488b164f71 100644
--- a/applications/luci-app-opkg/po/sv/opkg.po
+++ b/applications/luci-app-opkg/po/sv/opkg.po
@@ -15,7 +15,7 @@ msgstr ""
msgid "Actions"
msgstr "Åtgärder"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
msgid "Available"
msgstr "Tillgänglig"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,10 +31,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Avbryt"
@@ -47,25 +47,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Konfiguration"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Beskrivning"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -73,12 +73,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Ladda ner och installera paket"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Fel"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -90,44 +90,44 @@ msgstr "Filtrera"
msgid "Free space"
msgstr "Fritt utrymme"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Installera"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Installera"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Installera"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Gå till relevant konfigurationssida"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Ladda ner och installera paket"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -135,25 +135,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Ingen information tillgänglig"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Hitta paket"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Totalt tillgängligt"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Inte ansluten"
@@ -162,13 +162,17 @@ msgstr "Inte ansluten"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Konfiguration"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Paketnamn"
@@ -182,52 +186,55 @@ msgstr "Paketnamn"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Ta bort"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Ta bort…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Ta bort"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Återställ"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Spara"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Enhetskonfiguration"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Storlek"
@@ -240,21 +247,21 @@ msgstr "Storlek (.ipk)"
msgid "Software"
msgstr "Mjukvara"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -274,39 +281,39 @@ msgstr "Uppdatera listor"
msgid "Updates"
msgstr "Uppdatera listor"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Version"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Väntar på att kommandot ska avsluta..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "okänd"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/templates/opkg.pot b/applications/luci-app-opkg/po/templates/opkg.pot
index 7af6c2c504..2631ec0201 100644
--- a/applications/luci-app-opkg/po/templates/opkg.pot
+++ b/applications/luci-app-opkg/po/templates/opkg.pot
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Actions"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
msgid "Available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -21,10 +21,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr ""
@@ -36,25 +36,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -62,11 +62,11 @@ msgstr ""
msgid "Download and install package"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -78,40 +78,40 @@ msgstr ""
msgid "Free space"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -119,23 +119,23 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr ""
@@ -143,12 +143,16 @@ msgstr ""
msgid "OK"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr ""
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr ""
@@ -161,51 +165,54 @@ msgstr ""
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr ""
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr ""
@@ -218,21 +225,21 @@ msgstr ""
msgid "Software"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -250,38 +257,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/tr/opkg.po b/applications/luci-app-opkg/po/tr/opkg.po
index 7a8414d4b8..9b6e8dabbb 100644
--- a/applications/luci-app-opkg/po/tr/opkg.po
+++ b/applications/luci-app-opkg/po/tr/opkg.po
@@ -16,7 +16,7 @@ msgstr ""
msgid "Actions"
msgstr "Eylemler"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
msgid "Available"
msgstr "Kullanılabilir"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -32,10 +32,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Vazgeç"
@@ -47,25 +47,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Açıklama"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "Reddet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -73,11 +73,11 @@ msgstr ""
msgid "Download and install package"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -89,41 +89,41 @@ msgstr ""
msgid "Free space"
msgstr "Boş alan"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Yapılandırmaya dön"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -131,25 +131,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Kullanılabilir Paketler"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "Toplam Mevcut"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr ""
@@ -157,13 +157,17 @@ msgstr ""
msgid "OK"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Cihaz Yapılandırması"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr ""
@@ -176,52 +180,55 @@ msgstr ""
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr ""
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Sıfırla"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Kaydet"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "Cihaz Yapılandırması"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Boyut"
@@ -234,21 +241,21 @@ msgstr "Boyut (.ipk)"
msgid "Software"
msgstr "Yazılım"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -266,38 +273,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Versiyon"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "bilinmeyen"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/uk/opkg.po b/applications/luci-app-opkg/po/uk/opkg.po
index 29956326f2..554ed583a7 100644
--- a/applications/luci-app-opkg/po/uk/opkg.po
+++ b/applications/luci-app-opkg/po/uk/opkg.po
@@ -13,7 +13,7 @@ msgstr ""
msgid "Actions"
msgstr "Дії"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr "Автоматичне видалення невикористовуваних залежностей"
@@ -21,7 +21,7 @@ msgstr "Автоматичне видалення невикористовува
msgid "Available"
msgstr "Доступно"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -34,10 +34,10 @@ msgstr ""
"інших файлах може бути змінено, але вона зазвичай не зберігається при "
"<em>оновленні системи</em>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Скасувати"
@@ -49,25 +49,25 @@ msgstr "Очистити"
msgid "Configure opkg…"
msgstr "Налаштування opkg…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr "Залежності"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Опис"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr "Подробиці про пакет <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "Відхилити"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr "Відображається %d-%d із %d"
@@ -75,11 +75,11 @@ msgstr "Відображається %d-%d із %d"
msgid "Download and install package"
msgstr "Завантажити та інсталювати пакети"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr "Помилки"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr "Виконання менеджера пакетів"
@@ -91,18 +91,18 @@ msgstr "Фільтр"
msgid "Free space"
msgstr "Вільне місце"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Інсталювати"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr "Інстальовано"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
@@ -110,23 +110,23 @@ msgstr ""
"Інсталяція пакетів з ненадійних джерел є потенційною загрозою безпеці! "
"Дійсно спробувати інсталювати <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr "Інсталювати…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr "Завантаження даних конфігурації…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr "Завантаження інформації про пакети…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr "Інсталяція пакета вручну"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr "Потребує оновлення"
@@ -134,23 +134,23 @@ msgstr "Потребує оновлення"
msgid "Next page"
msgstr "Наступна сторінка"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "Інформація відсутня"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr "Немає пакетів"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr "Немає пакетів, що відповідають \"<strong>%h</strong>\"."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr "Недоступно"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr "Не інстальовано"
@@ -158,12 +158,16 @@ msgstr "Не інстальовано"
msgid "OK"
msgstr "OK"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr "Конфігурація OPKG"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Назва пакета"
@@ -176,53 +180,56 @@ msgstr "Назва пакета чи URL-адреса…"
msgid "Previous page"
msgstr "Попередня сторінка"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr "Дійсно спробувати інсталювати <em>%h</em>?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Видалити"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Видалити…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr "Видалити пакет <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Видалити"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr "Потрібно приблизно %.1024mB для інсталяції %d пакетів."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
"Необхідний за залежністю пакет <em>%h</em> не доступний ні в одному "
"репозиторії."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr "Потрібно оновити до %h %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Скинути"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Зберегти"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr "Збереження даних конфігурації…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Розмір"
@@ -235,11 +242,11 @@ msgstr "Розмір (.ipk)"
msgid "Software"
msgstr "Програмне забезпечення"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr "Помилка виконання команди <em>opkg %h</em> з кодом <code>%d</code>."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
@@ -247,12 +254,12 @@ msgstr ""
"Інстальована версія пакета <em>%h</em> несумісна, потрібно %s, а "
"інстальовано %s."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
"Пакет <em>%h</em> не доступний ні в одному сконфігурованому репозиторії."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -272,39 +279,39 @@ msgstr "Оновити списки…"
msgid "Updates"
msgstr "Оновлення"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr "Оновлення…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Версія"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr "Несумісна версія"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "Очікуємо завершення виконання команди <em>opkg %h</em> …"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "невідомий"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr "~%.1024mB стиснуто"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr "~%.1024mB інстальовано"
diff --git a/applications/luci-app-opkg/po/vi/opkg.po b/applications/luci-app-opkg/po/vi/opkg.po
index 59e5b60363..8a8ba0b59e 100644
--- a/applications/luci-app-opkg/po/vi/opkg.po
+++ b/applications/luci-app-opkg/po/vi/opkg.po
@@ -16,7 +16,7 @@ msgstr ""
msgid "Actions"
msgstr "Hành động"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
msgid "Available"
msgstr "Sẵn có"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -32,10 +32,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "Bỏ qua"
@@ -48,25 +48,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "Cấu hình"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "Mô tả"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -74,12 +74,12 @@ msgstr ""
msgid "Download and install package"
msgstr "Tải và cài đặt gói"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "Lỗi"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -91,44 +91,44 @@ msgstr "Lọc"
msgid "Free space"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "Cài đặt "
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "Cài đặt "
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "Cài đặt "
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "Đi tới trang cấu hình thích hợp"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "Tải và cài đặt gói"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -136,25 +136,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "Tìm gói"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "(%s available)"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "Cài đặt "
@@ -163,13 +163,17 @@ msgstr "Cài đặt "
msgid "OK"
msgstr "OK "
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "Cấu hình OPKG-"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "Tên gói"
@@ -183,51 +187,54 @@ msgstr "Tên gói"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "Loại bỏ"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "Loại bỏ…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "Loại bỏ"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "Reset"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "Lưu"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "Dung lượng "
@@ -240,21 +247,21 @@ msgstr ""
msgid "Software"
msgstr "Phần mềm"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -272,38 +279,38 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "Phiên bản"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-opkg/po/zh-cn/opkg.po b/applications/luci-app-opkg/po/zh-cn/opkg.po
index c8925d45dd..e027dc7938 100644
--- a/applications/luci-app-opkg/po/zh-cn/opkg.po
+++ b/applications/luci-app-opkg/po/zh-cn/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Actions"
msgstr "动作"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr "自动移除未使用的依赖"
@@ -25,7 +25,7 @@ msgstr "自动移除未使用的依赖"
msgid "Available"
msgstr "可用"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -36,10 +36,10 @@ msgstr ""
"置,<em>customfeeds.conf</em> 用于描述自定义仓库。其他配置文件的变更在系统升"
"级时默认不被保留。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "取消"
@@ -51,25 +51,25 @@ msgstr "清除"
msgid "Configure opkg…"
msgstr "配置 opkg…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr "依赖"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "描述"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr "软件包 <em>%h</em> 详情"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr "解除"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr "正在显示 %d-%d,共 %d"
@@ -77,11 +77,11 @@ msgstr "正在显示 %d-%d,共 %d"
msgid "Download and install package"
msgstr "下载并安装软件包"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
msgid "Errors"
msgstr "错误"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr "正在执行软件包管理器"
@@ -93,40 +93,40 @@ msgstr "过滤器"
msgid "Free space"
msgstr "空闲空间"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "安装"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
msgid "Installed"
msgstr "已安装"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr "从未信任的源安装软件包有潜在的安全隐患!您确定要安装 <em>%h</em> 吗?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
msgid "Install…"
msgstr "安装…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
msgid "Loading configuration data…"
msgstr "载入配置数据…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr "载入软件包信息…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
msgid "Manually install package"
msgstr "手动安装软件包"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr "需要升级"
@@ -134,23 +134,23 @@ msgstr "需要升级"
msgid "Next page"
msgstr "下一页"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "无可用信息"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
msgid "No packages"
msgstr "没有软件包"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr "没有匹配“<strong>%h</strong>”的软件包。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
msgid "Not available"
msgstr "不可用"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid "Not installed"
msgstr "未安装"
@@ -158,12 +158,16 @@ msgstr "未安装"
msgid "OK"
msgstr "确认"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
msgid "OPKG Configuration"
msgstr "OPKG 配置"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "软件包名称"
@@ -176,51 +180,54 @@ msgstr "软件包名称或 URL…"
msgid "Previous page"
msgstr "上一页"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr "真的要安装 <em>%h</em> 吗?"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "移除"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "移除…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr "移除软件包 <em>%h</em>"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "移除"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr "需要大约 %.1024mB 空间来安装 %d 个软件包。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr "依赖的软件包 <em>%h</em> 在所有仓库都未提供。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr "需要更新到 %h %h"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "复位"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "保存"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
msgid "Saving configuration data…"
msgstr "正在保存配置数据…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "大小"
@@ -233,21 +240,21 @@ msgstr "大小(.ipk)"
msgid "Software"
msgstr "软件包"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr "<em>opkg %h</em> 命令失败,代码 <code>%d</code>。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr "已安装的软件包 <em>%h</em> 版本不兼容,要求 %s 而 %s 已安装。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr "软件包 <em>%h</em> 在所有已配置的仓库中都不存在。"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -265,39 +272,39 @@ msgstr "更新列表…"
msgid "Updates"
msgstr "更新"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr "升级…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "版本"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr "版本不兼容"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "等待命令 <em>opkg %h</em> 执行完成…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "未知"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr "~%.1024mB 已压缩"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr "~%.1024mB 已安装"
diff --git a/applications/luci-app-opkg/po/zh-tw/opkg.po b/applications/luci-app-opkg/po/zh-tw/opkg.po
index 566edb6104..7fd5d77aa1 100644
--- a/applications/luci-app-opkg/po/zh-tw/opkg.po
+++ b/applications/luci-app-opkg/po/zh-tw/opkg.po
@@ -15,7 +15,7 @@ msgstr ""
msgid "Actions"
msgstr "動作"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
msgid "Automatically remove unused dependencies"
msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
msgid "Available"
msgstr "可用"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
msgid ""
"Below is a listing of the various configuration files used by <em>opkg</em>. "
"Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,10 +31,10 @@ msgid ""
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
msgid "Cancel"
msgstr "取消"
@@ -47,25 +47,25 @@ msgstr ""
msgid "Configure opkg…"
msgstr "設定"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
msgid "Dependencies"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
msgid "Description"
msgstr "描述"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
msgid "Details for package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
msgid "Dismiss"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
msgid "Displaying %d-%d of %d"
msgstr ""
@@ -73,12 +73,12 @@ msgstr ""
msgid "Download and install package"
msgstr "下載並安裝軟體包"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
#, fuzzy
msgid "Errors"
msgstr "錯誤"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
msgid "Executing package manager"
msgstr ""
@@ -90,44 +90,44 @@ msgstr "過濾器"
msgid "Free space"
msgstr "剩餘空間"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
msgid "Install"
msgstr "安裝"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
msgstr "安裝"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
#, fuzzy
msgid "Install…"
msgstr "安裝"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
#, fuzzy
msgid "Loading configuration data…"
msgstr "到相應設定頁"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
msgid "Loading package information…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
#, fuzzy
msgid "Manually install package"
msgstr "下載並安裝軟體包"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
msgid "Needs upgrade"
msgstr ""
@@ -135,25 +135,25 @@ msgstr ""
msgid "Next page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
msgid "No information available"
msgstr "尚無可運用資訊"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
#, fuzzy
msgid "No packages"
msgstr "搜尋軟體包"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
msgid "No packages matching \"<strong>%h</strong>\"."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
#, fuzzy
msgid "Not available"
msgstr "全部可用"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
#, fuzzy
msgid "Not installed"
msgstr "尚未連線"
@@ -162,13 +162,17 @@ msgstr "尚未連線"
msgid "OK"
msgstr "行"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
#, fuzzy
msgid "OPKG Configuration"
msgstr "OPKG-設定值"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
msgid "Package name"
msgstr "軟體包名稱"
@@ -182,52 +186,55 @@ msgstr "軟體包名稱"
msgid "Previous page"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
msgid "Really attempt to install <em>%h</em>?"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
-msgid "Remove"
-msgstr "移除"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
+msgid "Remove…"
+msgstr "移除…"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
msgid "Remove package <em>%h</em>"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove"
+msgstr "移除"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
msgid "Require approx. %.1024mB size for %d package(s) to install."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
msgid "Require version %h %h, installed %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
msgid "Requires update to %h %h"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
msgid "Reset"
msgstr "重置"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "Save"
msgstr "保存"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
#, fuzzy
msgid "Saving configuration data…"
msgstr "設定設備"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
msgid "Size"
msgstr "大小"
@@ -240,21 +247,21 @@ msgstr ""
msgid "Software"
msgstr "軟體"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
msgid "The package <em>%h</em> is not available in any configured repository."
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
@@ -274,39 +281,39 @@ msgstr "上傳清單"
msgid "Updates"
msgstr "上傳清單"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
msgid "Upgrade…"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
msgid "Version"
msgstr "版本"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
msgid "Version incompatible"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
msgstr "等待完整性指令..."
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
msgid "unknown"
msgstr "未知"
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
msgid "~%.1024mB compressed"
msgstr ""
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
msgid "~%.1024mB installed"
msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua b/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
index e967ce6283..b86b06cf1a 100644
--- a/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
+++ b/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
@@ -27,7 +27,7 @@ o.optional = true
o.datatype = "uinteger"
o = s:option(Value, "localip", translate("IP of listening side"))
-o.datetype = "ipaddr"
+o.datatype = "ipaddr"
o = s:option(Value, "firstremoteip", translate("First remote IP"))
o.datatype = "ipaddr"
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
index 3179da63b5..bcee6efe08 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua
@@ -20,6 +20,14 @@ hosts = s:option( Value, "Hosts", translate("Monitor hosts"), translate ("Add mu
hosts.default = "127.0.0.1"
hosts:depends( "enable", 1 )
+-- collectd_ping.adressfamily (AddressFamily)
+addressfamily = s:option( ListValue, "AddressFamily", translate("Address family") )
+addressfamily.default = "any"
+addressfamily:value( "any" )
+addressfamily:value( "ipv4" )
+addressfamily:value( "ipv6" )
+addressfamily:depends( "enable", 1 )
+
-- collectd_ping.ttl (TTL)
ttl = s:option( Value, "TTL", translate("TTL for ping packets") )
ttl.isinteger = true
diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
index 55cc6979e5..cb091ae672 100755
--- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
@@ -411,7 +411,7 @@ plugins = {
},
ping = {
- { "TTL", "Interval" },
+ { "TTL", "Interval", "AddressFamily" },
{ },
{ "Hosts" }
},
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 2b6369d268..ff174872a5 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -3,14 +3,14 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:41+0200\n"
-"PO-Revision-Date: 2019-05-16 20:13-0300\n"
+"PO-Revision-Date: 2019-06-22 17:38-0300\n"
"Last-Translator: José Vicente <josevteg@gmail.com>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
"Language-Team: \n"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
@@ -671,11 +671,11 @@ msgstr ""
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
#: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
msgid "Associated Stations"
-msgstr "Clientes conectados"
+msgstr "Dispositivos conectados"
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:161
msgid "Associations"
-msgstr "Clientes"
+msgstr "Dispositivos"
#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
@@ -949,7 +949,7 @@ msgstr "Cambios aplicados."
#: modules/luci-base/luasrc/view/cbi/apply_widget.htm:156
msgid "Changes have been reverted."
-msgstr "Se eliminaron los cambios."
+msgstr "Se revirtieron los cambios."
#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
msgid "Changes the administrator password for accessing the device"
@@ -1030,7 +1030,7 @@ msgid ""
"Click \"Generate archive\" to download a tar archive of the current "
"configuration files."
msgstr ""
-"Pulse \"generar archivo\" para descargar un archivo .tar con los archivos de "
+"Pulse \"Generar archivo\" para descargar un archivo .tar con los archivos de "
"configuración actuales."
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:65
@@ -1375,7 +1375,7 @@ msgstr "Puerta de enlace predeterminada"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
msgid "Default is stateless + stateful"
-msgstr "El valor predeterminado es Din estado + Con estado"
+msgstr "El valor predeterminado es Sin estado + Con estado"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:40
msgid "Default state"
@@ -1451,7 +1451,7 @@ msgstr "Dispositivo inalcanzable!"
#: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:49
msgid "Device unreachable! Still waiting for device..."
-msgstr "Dispositivo inalcanzable! Todavía esperando el dispositivo..."
+msgstr "Dispositivo inalcanzable! Todavía esperando al dispositivo..."
#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
@@ -1569,7 +1569,7 @@ msgstr "No reenviar búsquedas inversas para redes locales"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
msgid "Do you really want to delete the following SSH key?"
-msgstr "¿Realmente quieres eliminar la siguiente clave SSH?"
+msgstr "¿Realmente quiere eliminar la siguiente clave SSH?"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:25
msgid "Domain required"
@@ -1851,7 +1851,7 @@ msgstr "Excluir interfaces"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:108
msgid "Expand hosts"
-msgstr "Expandir nombre del host"
+msgstr "Expandir hosts"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:278
msgid "Expecting %s"
@@ -1865,7 +1865,7 @@ msgstr "Expira"
msgid ""
"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
msgstr ""
-"Tiempo de expiración de direcciones dadas, con mínimo de dos minutos "
+"Tiempo de expiración de direcciones dadas, con un mínimo de dos minutos "
"(<code>2m</code>)."
#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
@@ -1911,7 +1911,8 @@ msgstr "Protocolo FT"
#: modules/luci-base/luasrc/view/cbi/apply_widget.htm:38
msgid "Failed to confirm apply within %ds, waiting for rollback…"
msgstr ""
-"Error al confirmar aplicar dentro de %ds, a la espera de la reversión..."
+"Error al confirmar aplicar dentro de %ds. Esperando a que se reviertan los "
+"cambios..."
#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
msgid "File"
@@ -2211,8 +2212,8 @@ msgid ""
"Here you can configure the basic aspects of your device like its hostname or "
"the timezone."
msgstr ""
-"Aquí puede configurar los aspectos básicos de su dispositivo, como su nombre "
-"de host o la zona horaria."
+"Aquí puede configurar los aspectos básicos de su dispositivo, como el nombre "
+"del host o la zona horaria."
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
@@ -2256,7 +2257,7 @@ msgstr "Nombre del host"
#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
msgid "Hostname to send when requesting DHCP"
-msgstr "Nombre del host a enviar cuando se solicite DHCP"
+msgstr "Nombre del host a enviar cuando se solicite una IP"
#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua:8
@@ -2616,7 +2617,7 @@ msgstr "Instale \"iputils-traceroute6\" para Traceroute IPv6"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
msgid "Install package %q"
-msgstr "Instalar el paquete %q"
+msgstr "Instalar paquete %q"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
msgid "Install protocol extensions..."
@@ -2806,7 +2807,7 @@ msgstr "Hoja"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:309
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
msgid "Lease time"
-msgstr "Tiempo de finalización"
+msgstr "Tiempo de expiración"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:41
msgid "Leasefile"
@@ -2836,7 +2837,7 @@ msgstr "Registro de cambios:"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
msgid "Limit"
-msgstr "IP máxima"
+msgstr "Límite de IPs"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:247
msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
@@ -3050,7 +3051,7 @@ msgstr "Pérdida de segundos de señal (LOSS)"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
msgid "Lowest leased address as offset from the network address."
-msgstr "Dirección dada más baja como diferencia de la dirección de red."
+msgstr "Dirección inicial más baja como diferencia de la dirección de red."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
@@ -3561,7 +3562,7 @@ msgid ""
"<samp>eth0.1</samp>)."
msgstr ""
"Configure las interfaces de red. Puede hacer puentes con diferentes "
-"interfaces, marcando el campo \"puentear interfaces\" e introduciendo el "
+"interfaces, marcando el campo \"Puentear interfaces\" e introduciendo el "
"nombre de las mismas separadas por espacios. También puede usar la notación "
"<abbr title=\"Virtual Local Area Network\">VLAN</abbr>, <samp>INTERFACE."
"VLANNR</samp> (<abbr title=\"por ejemplo\">Ej.</abbr>: <samp>eth0.1</samp>)."
@@ -4037,7 +4038,7 @@ msgstr "Evita escuchar en estas interfaces."
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
msgid "Prevents client-to-client communication"
-msgstr "Impide la comunicación entre clientes"
+msgstr "Impide la comunicación entre los clientes"
#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
msgid "Private Key"
@@ -4074,7 +4075,7 @@ msgstr "Protocolo de la nueva interfaz"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
msgid "Protocol support is not installed"
-msgstr "No está instalado el paquete necesario del protocolo"
+msgstr "No está instalado el paquete necesario para utilizar el protocolo"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:257
msgid "Provide NTP server"
@@ -4157,7 +4158,7 @@ msgstr "RX"
#: modules/luci-base/luasrc/view/wifi_assoclist.htm:112
msgid "RX Rate"
-msgstr "Ratio RX"
+msgstr "Tasa RX"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
msgid "Radius-Accounting-Port"
@@ -4202,9 +4203,9 @@ msgid ""
"Really delete this interface? The deletion cannot be undone! You might lose "
"access to this device if you are connected via this interface"
msgstr ""
-"¿Realmente eliminar esta interfaz? La eliminación no se puede deshacer! Es "
-"posible que pierda el acceso a este dispositivo si está conectado a través "
-"de esta interfaz"
+"¿Realmente quiere eliminar esta interfaz? La eliminación no se puede "
+"deshacer! Es posible que pierda el acceso a este dispositivo si está "
+"conectado a través de esta interfaz"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
msgid ""
@@ -4823,7 +4824,7 @@ msgstr ""
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
msgid "Specify the secret encryption key here."
-msgstr "Especifica la clave secreta de encriptado."
+msgstr "Especifique la clave de encriptación."
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:61
@@ -4874,7 +4875,7 @@ msgid ""
msgstr ""
"Las direcciones estáticas se usan para asignar direcciones IP fijas y "
"nombres identificativos de dispositivos a clientes DHCP. También son "
-"necesarias para configuraciones de interfaz no dinámica en las que a cada "
+"necesarias para configuraciones de interfaces no dinámicas en las que a cada "
"dispositivo siempre se le quiere dar la misma dirección IP."
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
@@ -5015,7 +5016,7 @@ msgstr "TX"
#: modules/luci-base/luasrc/view/wifi_assoclist.htm:112
msgid "TX Rate"
-msgstr "Ratio TX"
+msgstr "Tasa TX"
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:8
#: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:77
@@ -5112,13 +5113,13 @@ msgid ""
"warning and edit changes before attempting to apply again, or revert all "
"pending changes to keep the currently working configuration state."
msgstr ""
-"No se pudo alcanzar el dispositivo en %d segundos después de aplicar los "
-"cambios pendientes, lo que provocó que la configuración se revirtiera por "
-"razones de seguridad. Si cree que los cambios de configuración son "
-"correctos, proceda de todos modos. Alternativamente, puede descartar esta "
-"advertencia y editar los cambios antes de intentar aplicar nuevamente, o "
-"revertir todos los cambios pendientes para mantener el estado de "
-"configuración actualmente en funcionamiento."
+"No se pudo conectar al dispositivo dentro de los %d segundos después de "
+"aplicar los cambios pendientes, lo que provocó que la configuración se "
+"revirtiera por razones de seguridad. Si cree que los cambios de "
+"configuración son correctos, proceda de todos modos. Alternativamente, puede "
+"descartar esta advertencia y editar los cambios antes de intentar aplicar "
+"nuevamente, o revertir todos los cambios pendientes para mantener el estado "
+"de configuración actualmente en funcionamiento."
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:87
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:41
@@ -5579,7 +5580,7 @@ msgstr "Clave sin nombre"
#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:141
#: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:189
msgid "Unsaved Changes"
-msgstr "Cambios no guardados"
+msgstr "Cambios sin aplicar"
#: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
msgid "Unsupported MAP type"
@@ -5743,7 +5744,7 @@ msgid ""
msgstr ""
"Pulse el botón <em>Añadir</em> para insertar una nueva dirección. "
"<em>Dirección MAC</em> identificará el dispositivo, <em>Dirección IPv4</em> "
-"especificará la dirección fija a usar y <em>Nombre de host</em> se asignará "
+"especificará la dirección fija a usar y <em>Nombre del host</em> se asignará "
"como nombre identificativo."
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:111
@@ -5856,7 +5857,7 @@ msgstr "Contraseña WEP"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
msgid "WMM Mode"
-msgstr "Modo WMM"
+msgstr "Habilitar WMM"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
msgid "WPA passphrase"
@@ -6185,7 +6186,7 @@ msgstr "clave entre 8 y 63 caracteres"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:471
msgid "key with either 5 or 13 characters"
-msgstr "clave con 5 o 13 caracteres"
+msgstr "clave de 5 o 13 caracteres"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:50
msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
@@ -6236,7 +6237,7 @@ msgstr "Encendido"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:525
msgid "one of: - %s"
-msgstr ""
+msgstr "uno de: -%s"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
msgid "open"
@@ -6391,7 +6392,7 @@ msgstr "Valor de prefijo IPv6 válido (0-128)"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:404
msgid "valid MAC address"
-msgstr "Dirección MAC válida"
+msgstr "dirección MAC válida"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:475
msgid "valid UCI identifier"
@@ -6399,7 +6400,7 @@ msgstr "Identificador UCI válido"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:426
msgid "valid UCI identifier, hostname or IP address"
-msgstr "Identificador UCI válido, nombre de host o dirección IP"
+msgstr "Identificador UCI válido, nombre del host o dirección IP"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:447
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:450
@@ -6434,7 +6435,7 @@ msgstr "Nombre de host válido"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:409
msgid "valid hostname or IP address"
-msgstr "Nombre de host válido o dirección IP"
+msgstr "Nombrel de host válido o dirección IP"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:293
msgid "valid integer value"
diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
index f463ef5cb2..2a7fe854d0 100644
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -219,7 +219,7 @@
</div>
</header>
<div class="main">
- <div style="" class="loading"><span><div class="loading-img"></div>Loading...</span></div>
+ <div style="" class="loading"><span><div class="loading-img"></div><%:Loading...%></span></div>
<div class="main-left">
<% render_topmenu() %>
</div>