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/es/opkg.po b/applications/luci-app-opkg/po/es/opkg.po
index 00d79ec930..5dc936a14f 100644
--- a/applications/luci-app-opkg/po/es/opkg.po
+++ b/applications/luci-app-opkg/po/es/opkg.po
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Acciones"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js: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"