X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=applications%2Fluci-app-opkg%2Fpo%2Fru%2Fopkg.po;h=6d9ad1a912924da2a8c6e2fa9219216a78d2d0c8;hb=1154c4198a763aabd7c2fbe0f5419af7c2d04681;hp=b8ba3d6914ca42109e78ce8c7322126539613b0b;hpb=7efaac523c69da75d9c9678d8310c94dcc7d70cb;p=oweals%2Fluci.git

diff --git a/applications/luci-app-opkg/po/ru/opkg.po b/applications/luci-app-opkg/po/ru/opkg.po
index b8ba3d691..6d9ad1a91 100644
--- a/applications/luci-app-opkg/po/ru/opkg.po
+++ b/applications/luci-app-opkg/po/ru/opkg.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Actions"
 msgstr "Действия"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:727
 msgid "Automatically remove unused dependencies"
 msgstr "Автоматически удалять неиспользуемые зависимости"
 
@@ -27,7 +27,7 @@ msgstr "Автоматически удалять неиспользуемые 
 msgid "Available"
 msgstr "Доступно"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:658
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -40,10 +40,10 @@ msgstr ""
 "Конфигурация в других файлах может производтся, но такие настройки могут не "
 "сохраняться утилитой <em>sysupgrade</em>."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:630
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:659
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:719
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:733
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -55,25 +55,25 @@ msgstr "Очистить"
 msgid "Configure opkg…"
 msgstr "Настройки менеджера пакетов..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:562
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:699
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:578
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Описание"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
 msgid "Details for package <em>%h</em>"
 msgstr "Подробная информация о пакете <em>%h</em>"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:765
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:780
 msgid "Dismiss"
 msgstr "Отклонить"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
 msgid "Displaying %d-%d of %d"
 msgstr "Показано %d-%d из %d"
 
@@ -81,11 +81,11 @@ msgstr "Показано %d-%d из %d"
 msgid "Download and install package"
 msgstr "Загрузить и установить пакет"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:751
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:766
 msgid "Errors"
 msgstr "Ошибки"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:739
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:754
 msgid "Executing package manager"
 msgstr "Запуск менеджера пакетов"
 
@@ -97,18 +97,18 @@ msgstr "Фильтр"
 msgid "Free space"
 msgstr "Свободное место"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:592
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:608
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:606
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:622
 msgid "Install"
 msgstr "Установить"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:389
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:188
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr "Установлено"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:628
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
@@ -116,23 +116,23 @@ msgstr ""
 "Установка пакетов из недоверенных источников может привести к угрозе "
 "безопасности! Вы действительно хотите установить <em>%h</em>?"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:177
 msgid "Install…"
 msgstr "Установить..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:653
 msgid "Loading configuration data…"
 msgstr "Загрузка данных конфигурации..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:772
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:787
 msgid "Loading package information…"
 msgstr "Загрузка информации о пакете..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:624
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 msgid "Manually install package"
 msgstr "Ручная установка пакета"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:387
 msgid "Needs upgrade"
 msgstr "Требуется обновление"
 
@@ -140,23 +140,23 @@ msgstr "Требуется обновление"
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:250
 msgid "No information available"
 msgstr "Нет доступной информации"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:238
 msgid "No packages"
 msgstr "Нет пакетов"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:254
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr "Нет пакетов соответствующих запросу «<strong>%h</strong>»."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:409
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:419
 msgid "Not available"
 msgstr "Не доступно"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid "Not installed"
 msgstr "Не установлено"
 
@@ -164,12 +164,16 @@ msgstr "Не установлено"
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:670
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:679
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:652
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:684
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
 msgid "OPKG Configuration"
 msgstr "Настройка OPKG"
 
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:594
+msgid "Overwrite files from other package(s)"
+msgstr ""
+
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Имя пакета"
@@ -182,58 +186,57 @@ msgstr "Имя пакета или URL..."
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "Вы действительно хотите установить <em>%h</em>?"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:726
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165
 msgid "Remove"
 msgstr "Удалить"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718
 msgid "Remove package <em>%h</em>"
 msgstr "Удалить пакет <em>%h</em>"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:558
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740
+msgid "Remove…"
+msgstr "Удалить…"
+
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 "Требуется примерно %.1024mБ свободного пространства для установки %d пакетов"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:384
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:402
-msgid ""
-"Require version %h %h,\n"
-"installed %h"
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:412
+msgid "Require version %h %h, installed %h"
 msgstr ""
-"Требуется версия %h %h,\n"
-"установлен %h"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:417
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 "Требуемый в качестве зависимости пакет <em>%h</em> не доступен ни в одном из "
 "сконфигурированных репозиториев."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:375
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:385
 msgid "Requires update to %h %h"
 msgstr "Требуется обновить до %h %h"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:255
 msgid "Reset"
 msgstr "Сбросить"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "Save"
 msgstr "Сохранить"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:671
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:685
 msgid "Saving configuration data…"
 msgstr "Сохранение данных конфигурации..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:576
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:586
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:721
 msgid "Size"
 msgstr "Размер"
 
@@ -246,11 +249,11 @@ msgstr "Размер (.ipk)"
 msgid "Software"
 msgstr "Программное обеспечение"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:771
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr "Команда <em>opkg %h</em> завершилась с кодом ошибки <code>%d</code>."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:380
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:390
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
@@ -258,12 +261,12 @@ msgstr ""
 "Установленная версия пакета <em>%h</em> не совместима. Требуется установка "
 "%s для установки %s"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:617
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:631
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 "Пакет <em>%h</em> не доступен ни в одном из сконфигурированных репозиториев."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:397
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:407
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
@@ -283,38 +286,45 @@ msgstr "Обновить списки..."
 msgid "Updates"
 msgstr "Обновления"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:154
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:183
 msgid "Upgrade…"
 msgstr "Обновление..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:575
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:706
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:585
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:720
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Версия"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:396
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:414
 msgid "Version incompatible"
 msgstr "Версия несовместима"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:741
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:756
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Ожидание завершения выполнения команды <em>opkg %h</em>..."
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:536
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:546
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:709
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "неизвестный"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:534
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:693
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:544
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:707
 msgid "~%.1024mB compressed"
 msgstr "~%.1024mБ сжато"
 
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:532
-#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:691
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:542
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:705
 msgid "~%.1024mB installed"
 msgstr "~%.1024mБ установлено"
+
+#~ msgid ""
+#~ "Require version %h %h,\n"
+#~ "installed %h"
+#~ msgstr ""
+#~ "Требуется версия %h %h,\n"
+#~ "установлен %h"