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/ru/opkg.po b/applications/luci-app-opkg/po/ru/opkg.po
index 714b1577b7..6d9ad1a912 100644
--- a/applications/luci-app-opkg/po/ru/opkg.po
+++ b/applications/luci-app-opkg/po/ru/opkg.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Действия"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js: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Б установлено"