luci-app-opkg: make overwriting package files optional master
authorJo-Philipp Wich <jo@mein.io>
Wed, 19 Jun 2019 11:29:19 +0000 (13:29 +0200)
committerJo-Philipp Wich <jo@mein.io>
Wed, 19 Jun 2019 11:33:46 +0000 (13:33 +0200)
Ref: #2775
Signed-off-by: Dirk Brenken <dev@brenken.org>
[split into multiple commits, sync translations]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
29 files changed:
applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
applications/luci-app-opkg/luasrc/controller/opkg.lua
applications/luci-app-opkg/po/ca/opkg.po
applications/luci-app-opkg/po/cs/opkg.po
applications/luci-app-opkg/po/de/opkg.po
applications/luci-app-opkg/po/el/opkg.po
applications/luci-app-opkg/po/en/opkg.po
applications/luci-app-opkg/po/es/opkg.po
applications/luci-app-opkg/po/fr/opkg.po
applications/luci-app-opkg/po/he/opkg.po
applications/luci-app-opkg/po/hu/opkg.po
applications/luci-app-opkg/po/it/opkg.po
applications/luci-app-opkg/po/ja/opkg.po
applications/luci-app-opkg/po/ko/opkg.po
applications/luci-app-opkg/po/ms/opkg.po
applications/luci-app-opkg/po/no/opkg.po
applications/luci-app-opkg/po/pl/opkg.po
applications/luci-app-opkg/po/pt-br/opkg.po
applications/luci-app-opkg/po/pt/opkg.po
applications/luci-app-opkg/po/ro/opkg.po
applications/luci-app-opkg/po/ru/opkg.po
applications/luci-app-opkg/po/sk/opkg.po
applications/luci-app-opkg/po/sv/opkg.po
applications/luci-app-opkg/po/templates/opkg.pot
applications/luci-app-opkg/po/tr/opkg.po
applications/luci-app-opkg/po/uk/opkg.po
applications/luci-app-opkg/po/vi/opkg.po
applications/luci-app-opkg/po/zh-cn/opkg.po
applications/luci-app-opkg/po/zh-tw/opkg.po

index 4d67a03..2c0c460 100644 (file)
@@ -589,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
@@ -744,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'), [
@@ -751,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)
index 74aa166..39c5d1f 100644 (file)
@@ -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
index a5f0e4b..8e0a701 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Accions"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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ó"
@@ -63,7 +63,7 @@ msgstr "Descripció"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Filtre"
 msgid "Free space"
 msgstr "Espai lliure"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -104,7 +104,7 @@ msgstr "Instal·la"
 msgid "Installed"
 msgstr "Instal·la"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Instal·la"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Descarrega i instal·la el paquet"
@@ -164,13 +164,17 @@ msgstr "No connectat"
 msgid "OK"
 msgstr "D'acord"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +188,7 @@ msgstr "Nom del paquet"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -192,11 +196,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Treu"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Treu…"
 
@@ -222,17 +226,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Restableix"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Mida"
 
@@ -245,7 +249,7 @@ msgstr "Mida (.ipk)"
 msgid "Software"
 msgstr "Programari"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -255,7 +259,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -285,7 +289,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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ó"
@@ -295,23 +299,23 @@ msgstr "Versió"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 5bbdced..524b9b6 100644 (file)
@@ -16,7 +16,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Akce"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
 msgid "Automatically remove unused dependencies"
 msgstr "Automatické odstranění nepoužívaných závislostí"
 
@@ -24,7 +24,7 @@ msgstr "Automatické odstranění nepoužívaných závislostí"
 msgid "Available"
 msgstr "Dostupné"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:654
+#: 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> 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -56,7 +56,7 @@ msgid "Dependencies"
 msgstr "Závislosti"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -65,7 +65,7 @@ msgstr "Popis"
 msgid "Details for package <em>%h</em>"
 msgstr "Podrobnosti o balíčku <em>%h</em>"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Propustit"
 
@@ -77,11 +77,11 @@ msgstr "Zobrazuji %d-%d z %d"
 msgid "Download and install package"
 msgstr "Stáhnout a nainstalovat balíček"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
 msgid "Errors"
 msgstr "Chyby"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "Spuštění správce balíčků"
 
@@ -93,8 +93,8 @@ msgstr "Filtr"
 msgid "Free space"
 msgstr "Volné místo"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -104,7 +104,7 @@ msgstr "Instalovat"
 msgid "Installed"
 msgstr "Instalací"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,15 +116,15 @@ msgstr ""
 msgid "Install…"
 msgstr "Instalovat…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
 msgid "Loading configuration data…"
 msgstr "Načítání konfiguračních dat…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:782
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
 msgid "Loading package information…"
 msgstr "Načítání informací o balíčku…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "Ručně nainstalujte balíček"
 
@@ -160,12 +160,16 @@ msgstr "Není instalován"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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 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"
@@ -178,7 +182,7 @@ msgstr "Název balíčku nebo adresa URLL…"
 msgid "Previous page"
 msgstr "Předchozí stránka"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "Opravdu se pokusíte nainstalovat <em>%h</em>?"
 
@@ -186,11 +190,11 @@ msgstr "Opravdu se pokusíte nainstalovat <em>%h</em>?"
 msgid "Remove"
 msgstr "Odstranit"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
 msgid "Remove package <em>%h</em>"
 msgstr "Odstraňte balíček <em>%h</em>"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Odstranit…"
 
@@ -217,16 +221,16 @@ msgstr "Vyžaduje aktualizaci na %h %h"
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
 msgid "Saving configuration data…"
 msgstr "Ukládání konfiguračních dat…"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Velikost"
 
@@ -239,7 +243,7 @@ msgstr "Velikost (.ipk)"
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 "Příkaz <em>opkg %h</em> byl označen kódem <code>%d</code>."
 
@@ -251,7 +255,7 @@ 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:627
+#: 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 "Balík <em>%h</em> není k dispozici v žádném nakonfigurovaném úložišti."
 
@@ -281,7 +285,7 @@ msgid "Upgrade…"
 msgstr "Upgrade…"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -291,22 +295,22 @@ msgstr "Verze"
 msgid "Version incompatible"
 msgstr "Verze nekompatibilní"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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 <em>opkg %h</em> …"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
 msgid "~%.1024mB compressed"
 msgstr "~%.1024mB komprimován"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~%.1024mB nainstalován"
index 804d2f9..eb79718 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Aktionen"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -59,7 +59,7 @@ msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -68,7 +68,7 @@ msgstr "Beschreibung"
 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:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Schließen"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "Paketmanager ausführen"
 
@@ -96,8 +96,8 @@ msgstr "Filter"
 msgid "Free space"
 msgstr "Freier Platz"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -107,7 +107,7 @@ msgstr "Installieren"
 msgid "Installed"
 msgstr "Installiert"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -120,15 +120,15 @@ msgstr ""
 msgid "Install…"
 msgstr "Installieren…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "Paket manuell installieren"
 
@@ -164,12 +164,16 @@ msgstr "Nicht installiert"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +186,7 @@ msgstr "Paketname oder URL…"
 msgid "Previous page"
 msgstr "Vorige Seite"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: 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?"
 
@@ -190,11 +194,11 @@ msgstr "Soll wirklich versucht werden, <em>%h</em> zu installieren?"
 msgid "Remove"
 msgstr "Entfernen"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Entfernen…"
 
@@ -222,16 +226,16 @@ msgstr "Benötigt Update auf Version %h %h"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Größe"
 
@@ -244,7 +248,7 @@ msgstr "Größe (.ipk)"
 msgid "Software"
 msgstr "Paketverwaltung"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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."
@@ -257,7 +261,7 @@ 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:627
+#: 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."
@@ -288,7 +292,7 @@ msgid "Upgrade…"
 msgstr "Aktualisieren…"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -298,23 +302,23 @@ msgstr "Version"
 msgid "Version incompatible"
 msgstr "Version inkompatibel"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "ca. %.1024mB installiert"
 
index 979f315..3fa5a2a 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 "Ακύρωση"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Περιγραφή"
@@ -63,7 +63,7 @@ msgstr "Περιγραφή"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr ""
 
@@ -75,12 +75,12 @@ msgstr ""
 msgid "Download and install package"
 msgstr "Κατέβασμα και εγκατάσταση πακέτου"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Φίλτρο"
 msgid "Free space"
 msgstr "Ελεύθερος χώρος"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "Εγκατάσταση"
 
@@ -104,7 +104,7 @@ msgstr "Εγκατάσταση"
 msgid "Installed"
 msgstr "Εγκατάσταση"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Εγκατάσταση"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Κατέβασμα και εγκατάσταση πακέτου"
@@ -164,13 +164,17 @@ msgstr "Εγκατάσταση"
 msgid "OK"
 msgstr "Εντάξει"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +188,7 @@ msgstr "Όνομα πακέτου"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -192,11 +196,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Αφαίρεση…"
 
@@ -222,17 +226,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Αρχικοποίηση"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -245,7 +249,7 @@ msgstr ""
 msgid "Software"
 msgstr "Λογισμικό"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -255,7 +259,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -283,7 +287,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Έκδοση"
@@ -293,22 +297,22 @@ msgstr "Έκδοση"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 77e82e0..44d9d87 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 ""
 
@@ -53,7 +53,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr ""
 
@@ -74,11 +74,11 @@ msgstr ""
 msgid "Download and install package"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr ""
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -111,15 +111,15 @@ msgstr ""
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr ""
 
@@ -155,12 +155,16 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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 ""
@@ -173,7 +177,7 @@ msgstr ""
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -181,11 +185,11 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr ""
 
@@ -211,16 +215,16 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr ""
 
@@ -233,7 +237,7 @@ msgstr ""
 msgid "Software"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -243,7 +247,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -271,7 +275,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr ""
@@ -281,22 +285,22 @@ msgstr ""
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 00d79ec..5dc936a 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Acciones"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -58,7 +58,7 @@ msgid "Dependencies"
 msgstr "Dependencias"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -67,7 +67,7 @@ msgstr "Descripción"
 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:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Descartar"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "Ejecutando el gestor de paquetes"
 
@@ -95,8 +95,8 @@ msgstr "Filtro"
 msgid "Free space"
 msgstr "Espacio libre"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -106,7 +106,7 @@ msgstr "Instalar"
 msgid "Installed"
 msgstr "Instalado"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,15 +118,15 @@ msgstr ""
 msgid "Install…"
 msgstr "Instalar..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "Instalar manualmente el paquete"
 
@@ -162,12 +162,16 @@ msgstr "No instalado"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +184,7 @@ msgstr "Nombre del paquete o URL..."
 msgid "Previous page"
 msgstr "Pagina anterior"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: 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>?"
 
@@ -188,11 +192,11 @@ msgstr "¿Realmente intentas instalar <em>%h</em>?"
 msgid "Remove"
 msgstr "Desinstalar"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr ""
 
@@ -221,16 +225,16 @@ msgstr "Requiere actualización a %h %h"
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Tamaño"
 
@@ -243,7 +247,7 @@ msgstr "Tamaño (.ipk)"
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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>."
 
@@ -255,7 +259,7 @@ 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:627
+#: 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."
@@ -286,7 +290,7 @@ msgid "Upgrade…"
 msgstr "Actualizar..."
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -296,23 +300,23 @@ msgstr "Versión"
 msgid "Version incompatible"
 msgstr "Versión incompatible"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~%.1024mB instalado"
 
index 228825d..4c44679 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Actions"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -63,7 +63,7 @@ msgstr "Description"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Filtrer"
 msgid "Free space"
 msgstr "Espace libre"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -104,7 +104,7 @@ msgstr "Installer"
 msgid "Installed"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: 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"
@@ -164,13 +164,17 @@ msgstr "Non connecté"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +188,7 @@ msgstr "Nom du paquet"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -192,11 +196,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Désinstaller"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Désinstaller…"
 
@@ -222,17 +226,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Taille"
 
@@ -245,7 +249,7 @@ msgstr ""
 msgid "Software"
 msgstr "Logiciels"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -255,7 +259,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -285,7 +289,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -295,23 +299,23 @@ msgstr "Version"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 223904d..cad9928 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 msgid "Actions"
 msgstr "פעולות"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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,7 +52,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "תיאור"
@@ -61,7 +61,7 @@ msgstr "תיאור"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr ""
 
@@ -73,12 +73,12 @@ msgstr ""
 msgid "Download and install package"
 msgstr "הורד והתקן חבילות"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr ""
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -111,16 +111,16 @@ msgstr ""
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "הורד והתקן חבילות"
@@ -160,13 +160,17 @@ msgstr "לא מחובר"
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +184,7 @@ msgstr "שם החבילה"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -188,11 +192,11 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr ""
 
@@ -218,17 +222,17 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr ""
 
@@ -241,7 +245,7 @@ msgstr ""
 msgid "Software"
 msgstr "תוכנה"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -251,7 +255,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -279,7 +283,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "גרסה"
@@ -289,22 +293,22 @@ msgstr "גרסה"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 1c824a2..8c8575b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Műveletek"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -52,7 +52,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -61,7 +61,7 @@ msgstr "Leírás"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr "Szűrő"
 msgid "Free space"
 msgstr "Szabad hely"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -102,7 +102,7 @@ msgstr "Telepítés"
 msgid "Installed"
 msgstr "Telepítés"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +113,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Telepítés"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: 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"
@@ -162,13 +162,17 @@ msgstr "Nincs kapcsolódva"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +186,7 @@ msgstr "Csomagnév"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -190,11 +194,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Eltávolítás…"
 
@@ -220,17 +224,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Visszaállítás"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Méret"
 
@@ -243,7 +247,7 @@ msgstr ""
 msgid "Software"
 msgstr "Szoftver"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -253,7 +257,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -283,7 +287,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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ó"
@@ -293,23 +297,23 @@ msgstr "Verzió"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index eaaa2a7..e35d09e 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Azioni"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -63,7 +63,7 @@ msgstr "Descrizione"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Filtro"
 msgid "Free space"
 msgstr "Spazio libero"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -104,7 +104,7 @@ msgstr "Installa"
 msgid "Installed"
 msgstr "Installa"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Installa"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Scarica e installa pacchetto"
@@ -164,13 +164,17 @@ msgstr "Non connesso"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +188,7 @@ msgstr "Nome pacchetto"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -192,11 +196,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Rimuovi…"
 
@@ -222,17 +226,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Dimensione"
 
@@ -245,7 +249,7 @@ msgstr ""
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -255,7 +259,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -285,7 +289,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -295,23 +299,23 @@ msgstr "Versione"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 75effb8..c757928 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "操作"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 "キャンセル"
 
@@ -57,7 +57,7 @@ msgid "Dependencies"
 msgstr "依存関係"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "詳細"
@@ -66,7 +66,7 @@ msgstr "詳細"
 msgid "Details for package <em>%h</em>"
 msgstr "<em>%h</em> パッケージの詳細"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "閉じる"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "パッケージ マネージャーを実行中"
 
@@ -94,8 +94,8 @@ msgstr "フィルタ"
 msgid "Free space"
 msgstr "ディスクの空き容量"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "インストール"
 
@@ -105,7 +105,7 @@ msgstr "インストール"
 msgid "Installed"
 msgstr "インストール済"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -117,15 +117,15 @@ msgstr ""
 msgid "Install…"
 msgstr "インストール…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "パッケージの手動インストール"
 
@@ -161,12 +161,16 @@ msgstr "未インストール"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +183,7 @@ msgstr "パッケージ名または URL…"
 msgid "Previous page"
 msgstr "前のページ"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "<em>%h</em> のインストールを試行してもよろしいですか?"
 
@@ -187,11 +191,11 @@ msgstr "<em>%h</em> のインストールを試行してもよろしいですか
 msgid "Remove"
 msgstr "削除"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "削除…"
 
@@ -218,16 +222,16 @@ msgstr "%h %h への更新が必要です"
 msgid "Reset"
 msgstr "リセット"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "サイズ"
 
@@ -240,7 +244,7 @@ msgstr "サイズ (.ipk)"
 msgid "Software"
 msgstr "ソフトウェア"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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>)"
 
@@ -252,7 +256,7 @@ msgstr ""
 "<em>%h</em> のインストール済みバージョンは互換性がありません。 %s が、インス"
 "トールされている %s には必要です。"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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> パッケージは、設定済みのリポジトリでは利用できません。"
 
@@ -282,7 +286,7 @@ msgid "Upgrade…"
 msgstr "アップグレード…"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "バージョン"
@@ -292,23 +296,23 @@ msgstr "バージョン"
 msgid "Version incompatible"
 msgstr "互換性の無いバージョン"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~ %.1024mB(インストール後)"
 
index 3b16867..37c30fa 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "관리 도구"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 ""
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "설명"
@@ -63,7 +63,7 @@ msgstr "설명"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr ""
 
@@ -75,11 +75,11 @@ msgstr ""
 msgid "Download and install package"
 msgstr "패키지 다운로드 후 설치"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -91,8 +91,8 @@ msgstr "필터"
 msgid "Free space"
 msgstr "여유 공간"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "설치"
 
@@ -103,7 +103,7 @@ msgstr "설치"
 msgid "Installed"
 msgstr "설치"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +114,16 @@ msgstr ""
 msgid "Install…"
 msgstr "설치"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "패키지 다운로드 후 설치"
@@ -163,13 +163,17 @@ msgstr "연결되지 않음"
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +187,7 @@ msgstr "패키지 이름"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -191,11 +195,11 @@ msgstr ""
 msgid "Remove"
 msgstr "제거"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "제거…"
 
@@ -221,17 +225,17 @@ msgstr ""
 msgid "Reset"
 msgstr "초기화"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Size"
 
@@ -244,7 +248,7 @@ msgstr "크기 (.ipk)"
 msgid "Software"
 msgstr "소프트웨어"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -254,7 +258,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -282,7 +286,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "버전"
@@ -292,23 +296,23 @@ msgstr "버전"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index ac13a42..a4b0534 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Aksi"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -63,7 +63,7 @@ msgstr "Keterangan"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Penapis"
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -104,7 +104,7 @@ msgstr "Memasang"
 msgid "Installed"
 msgstr "Memasang"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Memasang"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Turun dan memasang pakej"
@@ -164,13 +164,17 @@ msgstr "Memasang"
 msgid "OK"
 msgstr "Baik"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +188,7 @@ msgstr "Nama pakej"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -192,11 +196,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Menghapuskan"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Menghapuskan…"
 
@@ -222,16 +226,16 @@ msgstr ""
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Saiz"
 
@@ -244,7 +248,7 @@ msgstr ""
 msgid "Software"
 msgstr "Perisian"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -254,7 +258,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -282,7 +286,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -292,22 +296,22 @@ msgstr "Versi"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index bab19a9..d941e2a 100644 (file)
@@ -12,7 +12,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Handlinger"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -49,7 +49,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -58,7 +58,7 @@ msgstr "Beskrivelse"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -87,8 +87,8 @@ msgstr "Filter"
 msgid "Free space"
 msgstr "Ledig plass"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -99,7 +99,7 @@ msgstr "Installer"
 msgid "Installed"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +110,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Last ned og installer pakken"
@@ -159,13 +159,17 @@ msgstr "Ikke tilkoblet"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +183,7 @@ msgstr "Pakkenavn"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -187,11 +191,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Avinstaller"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Avinstaller…"
 
@@ -217,17 +221,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Nullstill"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Størrelse"
 
@@ -240,7 +244,7 @@ msgstr ""
 msgid "Software"
 msgstr "Programvare"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -250,7 +254,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -280,7 +284,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -290,23 +294,23 @@ msgstr "Versjon"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 7da2a67..7472c88 100644 (file)
@@ -18,7 +18,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Akcje"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -60,7 +60,7 @@ msgid "Dependencies"
 msgstr "Zależności"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -69,7 +69,7 @@ msgstr "Opis"
 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:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Odrzuć"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "Wykonywanie menedżera pakietów"
 
@@ -98,8 +98,8 @@ msgstr "Filtr"
 msgid "Free space"
 msgstr "Wolna przestrzeń"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -110,7 +110,7 @@ msgstr "Instaluj"
 msgid "Installed"
 msgstr "Zainstalowane"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -123,16 +123,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Instaluj…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Zainstaluj ręcznie pakiet"
@@ -173,13 +173,17 @@ msgstr "Nie zainstalowany"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +197,7 @@ msgstr "Nazwa pakietu lub URL…"
 msgid "Previous page"
 msgstr "Poprzednia strona"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: 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>?"
 
@@ -201,11 +205,11 @@ msgstr "Czy na pewno chcesz zainstalować pakiet <em>%h</em>?"
 msgid "Remove"
 msgstr "Usuń"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Usuń…"
 
@@ -232,17 +236,17 @@ msgstr "Wymaga aktualizacji do %h %h"
 msgid "Reset"
 msgstr "Resetuj"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -255,7 +259,7 @@ msgstr "Rozmiar (.ipk)"
 msgid "Software"
 msgstr "Oprogramowanie"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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</"
@@ -269,7 +273,7 @@ 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:627
+#: 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."
@@ -302,7 +306,7 @@ msgid "Upgrade…"
 msgstr "Zaktualizuj…"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -312,24 +316,24 @@ msgstr "Wersja"
 msgid "Version incompatible"
 msgstr "Wersja niekompatybilna"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~%.1024mB zainstalowany"
 
index 27662e5..98cbf5c 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Ações"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -63,7 +63,7 @@ msgstr "Descrição"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Dispensar"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Filtro"
 msgid "Free space"
 msgstr "Espaço livre"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -104,7 +104,7 @@ msgstr "Instalar"
 msgid "Installed"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Baixe e instale o pacote"
@@ -165,13 +165,17 @@ msgstr "Não conectado"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +189,7 @@ msgstr "Nome do Pacote"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -193,11 +197,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Remover"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Remover…"
 
@@ -223,17 +227,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Limpar"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Tamanho"
 
@@ -246,7 +250,7 @@ msgstr "Tamanho (.ipk)"
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -256,7 +260,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -286,7 +290,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -296,23 +300,23 @@ msgstr "Versão"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 84a49a3..3805fbe 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Acções"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -63,7 +63,7 @@ msgstr "Descrição"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Filtro"
 msgid "Free space"
 msgstr "Espaço livre"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -104,7 +104,7 @@ msgstr "Instalar"
 msgid "Installed"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -115,16 +115,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Descarregar e instalar pacote"
@@ -164,13 +164,17 @@ msgstr "Não ligado"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +188,7 @@ msgstr "Nome do pacote"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -192,11 +196,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Remover"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Remover…"
 
@@ -222,17 +226,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Tamanho"
 
@@ -245,7 +249,7 @@ msgstr ""
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -255,7 +259,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -285,7 +289,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -295,23 +299,23 @@ msgstr "Versão"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index d6beaed..d81f922 100644 (file)
@@ -16,7 +16,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Actiune"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -53,7 +53,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -62,7 +62,7 @@ msgstr "Descriere"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -91,8 +91,8 @@ msgstr "Filtreaza"
 msgid "Free space"
 msgstr "Spatiu liber"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -103,7 +103,7 @@ msgstr "Instalati"
 msgid "Installed"
 msgstr "Instalati"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +114,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Instalati"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Descarca si instaleaza pachetul"
@@ -163,13 +163,17 @@ msgstr "Nu este conectat"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +187,7 @@ msgstr "Numele pachetului"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -191,11 +195,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Elimina"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Elimina…"
 
@@ -221,17 +225,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Marime"
 
@@ -244,7 +248,7 @@ msgstr ""
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -254,7 +258,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -282,7 +286,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -292,22 +296,22 @@ msgstr "Versiune"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 714b157..6d9ad1a 100644 (file)
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Действия"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 "Отменить"
 
@@ -60,7 +60,7 @@ msgid "Dependencies"
 msgstr "Зависимости"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Описание"
@@ -69,7 +69,7 @@ msgstr "Описание"
 msgid "Details for package <em>%h</em>"
 msgstr "Подробная информация о пакете <em>%h</em>"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Отклонить"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "Запуск менеджера пакетов"
 
@@ -97,8 +97,8 @@ msgstr "Фильтр"
 msgid "Free space"
 msgstr "Свободное место"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "Установить"
 
@@ -108,7 +108,7 @@ msgstr "Установить"
 msgid "Installed"
 msgstr "Установлено"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -120,15 +120,15 @@ msgstr ""
 msgid "Install…"
 msgstr "Установить..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "Ручная установка пакета"
 
@@ -164,12 +164,16 @@ msgstr "Не установлено"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +186,7 @@ msgstr "Имя пакета или URL..."
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "Вы действительно хотите установить <em>%h</em>?"
 
@@ -190,11 +194,11 @@ msgstr "Вы действительно хотите установить <em>%h
 msgid "Remove"
 msgstr "Удалить"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Удалить…"
 
@@ -223,16 +227,16 @@ msgstr "Требуется обновить до %h %h"
 msgid "Reset"
 msgstr "Сбросить"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Размер"
 
@@ -245,7 +249,7 @@ msgstr "Размер (.ipk)"
 msgid "Software"
 msgstr "Программное обеспечение"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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>."
 
@@ -257,7 +261,7 @@ msgstr ""
 "Установленная версия пакета <em>%h</em> не совместима. Требуется установка "
 "%s для установки %s"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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> не доступен ни в одном из сконфигурированных репозиториев."
@@ -288,7 +292,7 @@ msgid "Upgrade…"
 msgstr "Обновление..."
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Версия"
@@ -298,23 +302,23 @@ msgstr "Версия"
 msgid "Version incompatible"
 msgstr "Версия несовместима"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~%.1024mБ установлено"
 
index d73ff16..7f20b00 100644 (file)
@@ -13,7 +13,7 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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,7 +49,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr ""
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid "Download and install package"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -86,8 +86,8 @@ msgstr ""
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 ""
 
@@ -97,7 +97,7 @@ msgstr ""
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -107,15 +107,15 @@ msgstr ""
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr ""
 
@@ -151,12 +151,16 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +173,7 @@ msgstr ""
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -177,11 +181,11 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr ""
 
@@ -207,16 +211,16 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr ""
 
@@ -229,7 +233,7 @@ msgstr ""
 msgid "Software"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -239,7 +243,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -267,7 +271,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr ""
@@ -277,22 +281,22 @@ msgstr ""
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 0d4b68f..1ca223f 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -52,7 +52,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -61,7 +61,7 @@ msgstr "Beskrivning"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr "Filtrera"
 msgid "Free space"
 msgstr "Fritt utrymme"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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"
 
@@ -102,7 +102,7 @@ msgstr "Installera"
 msgid "Installed"
 msgstr "Installera"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +113,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Installera"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "Ladda ner och installera paket"
@@ -162,13 +162,17 @@ msgstr "Inte ansluten"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +186,7 @@ msgstr "Paketnamn"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -190,11 +194,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Ta bort"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Ta bort…"
 
@@ -220,17 +224,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Återställ"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Storlek"
 
@@ -243,7 +247,7 @@ msgstr "Storlek (.ipk)"
 msgid "Software"
 msgstr "Mjukvara"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -253,7 +257,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -283,7 +287,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -293,23 +297,23 @@ msgstr "Version"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index ac3c746..ccd349e 100644 (file)
@@ -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:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 ""
 
@@ -41,7 +41,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr ""
 
@@ -62,11 +62,11 @@ msgstr ""
 msgid "Download and install package"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -78,8 +78,8 @@ msgstr ""
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 ""
 
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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>?"
@@ -99,15 +99,15 @@ msgstr ""
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr ""
 
@@ -143,12 +143,16 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +165,7 @@ msgstr ""
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -169,11 +173,11 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr ""
 
@@ -199,16 +203,16 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr ""
 
@@ -221,7 +225,7 @@ msgstr ""
 msgid "Software"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -231,7 +235,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -259,7 +263,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr ""
@@ -269,22 +273,22 @@ msgstr ""
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 46d3cde..efe286e 100644 (file)
@@ -16,7 +16,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Eylemler"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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ç"
 
@@ -52,7 +52,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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"
@@ -61,7 +61,7 @@ msgstr "Açıklama"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Reddet"
 
@@ -73,11 +73,11 @@ msgstr ""
 msgid "Download and install package"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 msgid "Free space"
 msgstr "Boş alan"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +110,16 @@ msgstr ""
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr ""
 
@@ -157,13 +157,17 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +180,7 @@ msgstr ""
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -184,11 +188,11 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr ""
 
@@ -214,17 +218,17 @@ msgstr ""
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Boyut"
 
@@ -237,7 +241,7 @@ msgstr "Boyut (.ipk)"
 msgid "Software"
 msgstr "Yazılım"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -247,7 +251,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -275,7 +279,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -285,22 +289,22 @@ msgstr "Versiyon"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 0fb25a2..52a209d 100644 (file)
@@ -13,7 +13,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Дії"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 "Скасувати"
 
@@ -54,7 +54,7 @@ msgid "Dependencies"
 msgstr "Залежності"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Опис"
@@ -63,7 +63,7 @@ msgstr "Опис"
 msgid "Details for package <em>%h</em>"
 msgstr "Подробиці про пакет <em>%h</em>"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Відхилити"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "Виконання менеджера пакетів"
 
@@ -91,8 +91,8 @@ msgstr "Фільтр"
 msgid "Free space"
 msgstr "Вільне місце"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "Інсталювати"
 
@@ -102,7 +102,7 @@ msgstr "Інсталювати"
 msgid "Installed"
 msgstr "Інстальовано"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,15 +114,15 @@ msgstr ""
 msgid "Install…"
 msgstr "Інсталювати…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "Інсталяція пакета вручну"
 
@@ -158,12 +158,16 @@ msgstr "Не інстальовано"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +180,7 @@ msgstr "Назва пакета чи URL-адреса…"
 msgid "Previous page"
 msgstr "Попередня сторінка"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "Дійсно спробувати інсталювати <em>%h</em>?"
 
@@ -184,11 +188,11 @@ msgstr "Дійсно спробувати інсталювати <em>%h</em>?"
 msgid "Remove"
 msgstr "Видалити"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Видалити…"
 
@@ -216,16 +220,16 @@ msgstr "Потрібно оновити до %h %h"
 msgid "Reset"
 msgstr "Скинути"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Розмір"
 
@@ -238,7 +242,7 @@ msgstr "Розмір (.ipk)"
 msgid "Software"
 msgstr "Програмне забезпечення"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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>."
 
@@ -250,7 +254,7 @@ msgstr ""
 "Інстальована версія пакета <em>%h</em> несумісна, потрібно %s, а "
 "інстальовано %s."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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> не доступний ні в одному сконфігурованому репозиторії."
@@ -281,7 +285,7 @@ msgid "Upgrade…"
 msgstr "Оновлення…"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Версія"
@@ -291,23 +295,23 @@ msgstr "Версія"
 msgid "Version incompatible"
 msgstr "Несумісна версія"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~%.1024mB інстальовано"
 
index e171720..22afb4e 100644 (file)
@@ -16,7 +16,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Hành động"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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"
 
@@ -53,7 +53,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: 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ả"
@@ -62,7 +62,7 @@ msgstr "Mô tả"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -91,8 +91,8 @@ msgstr "Lọc"
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "
 
@@ -103,7 +103,7 @@ msgstr "Cài đặt "
 msgid "Installed"
 msgstr "Cài đặt "
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +114,16 @@ msgstr ""
 msgid "Install…"
 msgstr "Cài đặt "
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: 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"
@@ -163,13 +163,17 @@ msgstr "Cài đặt "
 msgid "OK"
 msgstr "OK "
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +187,7 @@ msgstr "Tên gói"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -191,11 +195,11 @@ msgstr ""
 msgid "Remove"
 msgstr "Loại bỏ"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "Loại bỏ…"
 
@@ -221,16 +225,16 @@ msgstr ""
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Dung lượng "
 
@@ -243,7 +247,7 @@ msgstr ""
 msgid "Software"
 msgstr "Phần mềm"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -253,7 +257,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -281,7 +285,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: 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"
@@ -291,22 +295,22 @@ msgstr "Phiên bản"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""
index 9b7336a..b268aa6 100644 (file)
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "动作"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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 "取消"
 
@@ -56,7 +56,7 @@ msgid "Dependencies"
 msgstr "依赖"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "描述"
@@ -65,7 +65,7 @@ msgstr "描述"
 msgid "Details for package <em>%h</em>"
 msgstr "软件包 <em>%h</em> 详情"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "解除"
 
@@ -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:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "正在执行软件包管理器"
 
@@ -93,8 +93,8 @@ msgstr "过滤器"
 msgid "Free space"
 msgstr "空闲空间"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "安装"
 
@@ -104,7 +104,7 @@ msgstr "安装"
 msgid "Installed"
 msgstr "已安装"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,15 +114,15 @@ msgstr "从未信任的源安装软件包有潜在的安全隐患!您确定要
 msgid "Install…"
 msgstr "安装…"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "手动安装软件包"
 
@@ -158,12 +158,16 @@ msgstr "未安装"
 msgid "OK"
 msgstr "确认"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +180,7 @@ msgstr "软件包名称或 URL…"
 msgid "Previous page"
 msgstr "上一页"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "真的要安装 <em>%h</em> 吗?"
 
@@ -184,11 +188,11 @@ msgstr "真的要安装 <em>%h</em> 吗?"
 msgid "Remove"
 msgstr "移除"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "移除…"
 
@@ -214,16 +218,16 @@ msgstr "需要更新到 %h %h"
 msgid "Reset"
 msgstr "复位"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "大小"
 
@@ -236,7 +240,7 @@ msgstr "大小(.ipk)"
 msgid "Software"
 msgstr "软件包"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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>。"
 
@@ -246,7 +250,7 @@ msgid ""
 "while %s is installed."
 msgstr "已安装的软件包 <em>%h</em> 版本不兼容,要求 %s 而 %s 已安装。"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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> 在所有已配置的仓库中都不存在。"
 
@@ -274,7 +278,7 @@ msgid "Upgrade…"
 msgstr "升级…"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "版本"
@@ -284,23 +288,23 @@ msgstr "版本"
 msgid "Version incompatible"
 msgstr "版本不兼容"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~%.1024mB 已安装"
 
index ee1a905..8d432af 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 msgid "Actions"
 msgstr "動作"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
+#: 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:654
+#: 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:595
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:640
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:669
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:729
+#: 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,7 +52,7 @@ msgid "Dependencies"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "描述"
@@ -61,7 +61,7 @@ msgstr "描述"
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr ""
 
@@ -73,12 +73,12 @@ msgstr ""
 msgid "Download and install package"
 msgstr "下載並安裝軟體包"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:761
+#: 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:749
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr "過濾器"
 msgid "Free space"
 msgstr "剩餘空間"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:602
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
+#: 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 "安裝"
 
@@ -102,7 +102,7 @@ msgstr "安裝"
 msgid "Installed"
 msgstr "安裝"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: 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,16 +113,16 @@ msgstr ""
 msgid "Install…"
 msgstr "安裝"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:649
+#: 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:782
+#: 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:634
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #, fuzzy
 msgid "Manually install package"
 msgstr "下載並安裝軟體包"
@@ -162,13 +162,17 @@ msgstr "尚未連線"
 msgid "OK"
 msgstr "行"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:648
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:680
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:689
+#: 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,7 +186,7 @@ msgstr "軟體包名稱"
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
@@ -190,11 +194,11 @@ msgstr ""
 msgid "Remove"
 msgstr "移除"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:714
+#: 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:736
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
 msgid "Remove…"
 msgstr "移除…"
 
@@ -220,17 +224,17 @@ msgstr ""
 msgid "Reset"
 msgstr "重置"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:686
+#: 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:681
+#: 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:586
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:717
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "大小"
 
@@ -243,7 +247,7 @@ msgstr ""
 msgid "Software"
 msgstr "軟體"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
+#: 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 ""
 
@@ -253,7 +257,7 @@ msgid ""
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: 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 ""
 
@@ -283,7 +287,7 @@ msgid "Upgrade…"
 msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "版本"
@@ -293,23 +297,23 @@ msgstr "版本"
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: 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:546
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
+#: 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:544
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: 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:542
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr ""