luci-app-opkg: make overwriting package files optional

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>

1 files changed, 36 insertions, 32 deletions

diff --git a/applications/luci-app-opkg/po/tr/opkg.po b/applications/luci-app-opkg/po/tr/opkg.po
index 46d3cde1e..efe286e30 100644
--- a/applications/luci-app-opkg/po/tr/opkg.po
+++ b/applications/luci-app-opkg/po/tr/opkg.po
@@ -16,7 +16,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Eylemler"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js: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 ""