From 1154c4198a763aabd7c2fbe0f5419af7c2d04681 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 19 Jun 2019 13:29:19 +0200 Subject: luci-app-opkg: make overwriting package files optional Ref: #2775 Signed-off-by: Dirk Brenken [split into multiple commits, sync translations] Signed-off-by: Jo-Philipp Wich --- applications/luci-app-opkg/po/templates/opkg.pot | 68 +++++++++++++----------- 1 file changed, 36 insertions(+), 32 deletions(-) (limited to 'applications/luci-app-opkg/po/templates') diff --git a/applications/luci-app-opkg/po/templates/opkg.pot b/applications/luci-app-opkg/po/templates/opkg.pot index ac3c746a75..ccd349e1ca 100644 --- a/applications/luci-app-opkg/po/templates/opkg.pot +++ b/applications/luci-app-opkg/po/templates/opkg.pot @@ -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 opkg. " "Use opkg.conf for global settings and customfeeds.conf for " @@ -21,10 +21,10 @@ msgid "" "changed but is usually not preserved by sysupgrade." 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 %h" 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 %h?" @@ -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 %h?" 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 %h" 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 opkg %h command failed with code %d." 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 %h 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 opkg %h 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 "" -- cgit v1.2.3