From: Hannu Nyman Date: Sun, 10 Sep 2017 15:54:53 +0000 (+0300) Subject: Merge pull request #1359 from dibdot/adblock X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=b86ed10f849c442cc57e531dd75e87e4499a1118;hp=f46f3e512436dd3a7ddd694dc7eca8b844b5e696 Merge pull request #1359 from dibdot/adblock luci-app-adblock: sync with adblock 3.0.0 --- diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index 586c31801..7d43b9b94 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -8,7 +8,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.11\n" -"Last-Translator: Luiz Angelo Daros de Luca \n" +"Last-Translator: Luís Gabriel Lima Silva \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Language: pt_BR\n" @@ -16,31 +16,33 @@ msgid "Adblock" msgstr "Adblock" msgid "Adblock Logfile" -msgstr "" +msgstr "Arquivo de log do Adblock" msgid "Adblock version" -msgstr "" +msgstr "Versão do Adblock" msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "" +"Atraso de gatilho adicional em segundos antes do processamento do adblock " +"começar." msgid "Advanced" -msgstr "" +msgstr "Avançado" msgid "Available blocklist sources." -msgstr "" +msgstr "Fontes de listas de bloqueio disponíveis." msgid "Backup directory" msgstr "Diretório da cópia de segurança" msgid "Blocked domains (overall)" -msgstr "" +msgstr "Domínios bloqueados (total)" msgid "Blocklist sources" msgstr "Fontes de listas de bloqueio" msgid "Collecting data..." -msgstr "" +msgstr "Coletando dados..." msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." @@ -52,9 +54,11 @@ msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in manual mode." msgstr "" +"Crie backups comprimidos das listas de bloqueio, eles serão usados em caso " +"de erro dedownload ou durante o início em modo manual." msgid "DNS backend" -msgstr "" +msgstr "Porta dos fundos de DNS" msgid "Description" msgstr "Descrição" @@ -63,18 +67,20 @@ msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." msgstr "" +"Não atualize as listas de bloqueio automaticamente durante o início, use o " +"backup das listas como alternativa." msgid "Download Utility (SSL Library)" -msgstr "" +msgstr "Utilitário de Download (Biblioteca SSL)" msgid "Edit Blacklist" -msgstr "" +msgstr "Editar Lista de Bloqueio" msgid "Edit Configuration" -msgstr "" +msgstr "Editar Configuração" msgid "Edit Whitelist" -msgstr "" +msgstr "Editar Lista Permitida" msgid "Enable adblock" msgstr "Habilitar adblock" @@ -86,6 +92,8 @@ msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB RAM)" msgstr "" +"Ativar tipo geral intenso de memória / duplicar remoção em dispositivos com " +"pouca memória (< 64 MB RAM)" msgid "Enable verbose debug logging" msgstr "Habilite registros detalhados para depuração" @@ -100,40 +108,46 @@ msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." msgstr "" +"Para uma lista de bloqueio protegida por SSL você precisa de uma biblioteca " +"SSL adequada, e.x. 'libustream-ssl' ou o wget 'built-in'." msgid "" "For further information see online " "documentation" msgstr "" +"Para outras informações veja a documentação " +"online" msgid "Force Overall Sort" -msgstr "" +msgstr "Force Tipo Geral" msgid "Force local DNS" -msgstr "" +msgstr "Force o DNS local" msgid "Input file not found, please check your configuration." -msgstr "" +msgstr "Arquivo de entrada não encontrado, por favor cheque sua configuração." msgid "Invalid domain specified!" -msgstr "" +msgstr "Domínio especificado inválido!" msgid "Last rundate" -msgstr "" +msgstr "Última data de execução" msgid "Loading" -msgstr "" +msgstr "Carregando" msgid "Manual / Backup mode" -msgstr "" +msgstr "Manual / Modo backup" msgid "No" -msgstr "" +msgstr "Não" msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." msgstr "" +"Observe que as URLs da lista e as seleções da categoria Shallalist são " +"configuráveis na secção 'Avançada'." msgid "" "Options for further tweaking in case the defaults are not suitable for you." @@ -142,7 +156,7 @@ msgstr "" "suficientes para você." msgid "Overview" -msgstr "" +msgstr "Visão geral" msgid "" "Please add only one domain per line. Comments introduced with '#' are " @@ -150,31 +164,31 @@ msgid "" msgstr "" msgid "Please edit this file directly in a terminal session." -msgstr "" +msgstr "Por favor edite esse arquivo direto em uma sessão de terminal." msgid "Query" -msgstr "" +msgstr "Consulta" msgid "Query domains" -msgstr "" +msgstr "Consulta de domínios" msgid "Redirect all DNS queries to the local resolver." -msgstr "" +msgstr "Redirecione todas as consultas de DNS para o resolvedor local." msgid "Restrict interface trigger to certain interface(s)" -msgstr "" +msgstr "Restingir o gatilho de interface para certas interface(s)" msgid "Resume adblock" -msgstr "" +msgstr "Resumir adblock" msgid "Runtime information" -msgstr "" +msgstr "Informação de execução" msgid "SSL req." -msgstr "" +msgstr "req. de SSL" msgid "Save" -msgstr "" +msgstr "Salvar" msgid "" "Space separated list of interfaces that trigger adblock processing. To " @@ -182,65 +196,76 @@ msgid "" msgstr "" msgid "Status" -msgstr "" +msgstr "Estado" msgid "Suspend / Resume adblock" -msgstr "" +msgstr "Suspender / Resumir adblock" msgid "Suspend adblock" msgstr "" msgid "The file size is too large for online editing in LuCI (> 512 KB)." msgstr "" +"O tamanho do arquivo é muito grande para edição online no LuCI (> 512 KB)." msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "
" msgstr "" +"Esse formulário permite que você modifique o conteúdo das listas de bloqueio " +"do adblock (%s).
" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." "
" msgstr "" +"Esse formulário permite que você modifique o conteúdo das listas de " +"permissão do adblock (%s).
" msgid "" "This form allows you to modify the content of the main adblock configuration " "file (/etc/config/adblock)." msgstr "" +"Esse formulário permite que você modifique o conteúdo das do arquivo de " +"configuração principal (/etc/config/adblock)." msgid "" "This form allows you to query active block lists for certain domains, e.g. " "for whitelisting." msgstr "" +"Esse formulário permite que você consulte listas de blocos ativos para " +"certos domínios, e.x. para listas de permissão." msgid "" "This form shows the syslog output, pre-filtered for adblock related messages " "only." msgstr "" +"Esse formulário mostra a saída do syslog, pré-filtrado para mensagens do " +"adblock apenas." msgid "Trigger delay" -msgstr "" +msgstr "Atraso no gatilho" msgid "View Logfile" -msgstr "" +msgstr "Ver arquivo de log" msgid "Waiting for command to complete..." -msgstr "" +msgstr "Aguardando por comando para completar..." msgid "Yes" -msgstr "" +msgstr "Sim" msgid "active" -msgstr "" +msgstr "ativo" msgid "n/a" -msgstr "" +msgstr "n/d" msgid "no domains blocked" -msgstr "" +msgstr "nenhum domínio bloqueado" msgid "suspended" -msgstr "" +msgstr "suspenso" #~ msgid "Backup options" #~ msgstr "Opções da cópia de segurança" diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index a70a1a1d6..81ac8b52e 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -52,6 +52,8 @@ msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." msgstr "" +"Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd säkerhetskopierade blockeringslistor " +"istället." msgid "Download Utility (SSL Library)" msgstr "Nerladdningsprogram (SSL-bibliotek)" @@ -77,7 +79,7 @@ msgid "" msgstr "" msgid "Enable verbose debug logging" -msgstr "" +msgstr "Aktivera utförlig loggning för avlusning" msgid "Enabled" msgstr "Aktiverad" @@ -94,6 +96,8 @@ msgid "" "For further information see online " "documentation" msgstr "" +"För mer information se dokumentationen " +"på internet" msgid "Force Overall Sort" msgstr "" @@ -102,20 +106,19 @@ msgid "Force local DNS" msgstr "Tvinga lokal DNS" msgid "Input file not found, please check your configuration." -msgstr "" -"Inmatningsfilen hittades inte, var vänlig och kontrollera din konfiguration." +msgstr "Inmatningsfilen kunde inte hittas, var vänlig kontrollera din konfiguration." msgid "Invalid domain specified!" msgstr "Ogiltig domän angiven!" msgid "Last rundate" -msgstr "" +msgstr "Senaste kördatum" msgid "Loading" msgstr "Laddar" msgid "Manual / Backup mode" -msgstr "" +msgstr "Manuell / Säkerhetskopieringsläge" msgid "No" msgstr "Nej" @@ -138,16 +141,16 @@ msgid "" msgstr "" msgid "Please edit this file directly in a terminal session." -msgstr "" +msgstr "Vänligen redigera den här filen direkt i en terminal-session." msgid "Query" -msgstr "" +msgstr "Fråga" msgid "Query domains" -msgstr "" +msgstr "Fråga efter domäner" msgid "Redirect all DNS queries to the local resolver." -msgstr "" +msgstr "Dirigera om alla DNS-förfrågningar till den lokala " msgid "Restrict interface trigger to certain interface(s)" msgstr "" @@ -156,13 +159,13 @@ msgid "Resume adblock" msgstr "Återuppta adblock" msgid "Runtime information" -msgstr "Information om kör-tid" +msgstr "Information om körtid" msgid "SSL req." -msgstr "" +msgstr "SSL-rek." msgid "Save" -msgstr "" +msgstr "Spara" msgid "" "Space separated list of interfaces that trigger adblock processing. To " @@ -179,22 +182,28 @@ msgid "Suspend adblock" msgstr "Upphäv adblock" msgid "The file size is too large for online editing in LuCI (> 512 KB)." -msgstr "" +msgstr "Filstorleken är för stor för online-redigering i LuCi (> 512 KB)." msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "
" msgstr "" +"Det här formuläret tillåter dig att förändra innehållet i adblock's svartlista (%s)." +"
" msgid "" "This form allows you to modify the content of the adblock whitelist (%s)." "
" msgstr "" +"Det här formuläret tillåter dig att förändra innehållet i adblock's vitlista (%s)." +"
" msgid "" "This form allows you to modify the content of the main adblock configuration " "file (/etc/config/adblock)." msgstr "" +"Det här formuläret tillåter dig att förändra innehållet i adblock's huvudsakliga konfigurations " +"fil (/etc/config/adblock)." msgid "" "This form allows you to query active block lists for certain domains, e.g. " diff --git a/applications/luci-app-advanced-reboot/po/sv/luci-app-advanced-reboot.po b/applications/luci-app-advanced-reboot/po/sv/luci-app-advanced-reboot.po new file mode 100644 index 000000000..cac09d76a --- /dev/null +++ b/applications/luci-app-advanced-reboot/po/sv/luci-app-advanced-reboot.po @@ -0,0 +1,108 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "Action" +msgstr "Åtgärd" + +msgid "Advanced Reboot" +msgstr "Avancerad omstart" + +msgid "Alternative" +msgstr "Alternativ" + +msgid "Cancel" +msgstr "Avbryt" + +msgid "Confirm" +msgstr "Bekräfta" + +msgid "Current" +msgstr "Nuvarande" + +msgid "Firmware/OS (Kernel)" +msgstr "Inre mjukvara/OS (Kärna)" + +msgid "Partition" +msgstr "Partition" + +msgid "Partitions" +msgstr "Partitioner" + +msgid "Perform power off..." +msgstr "Utför avstängning..." + +msgid "Power Off Device" +msgstr "Stäng av enhet" + +msgid "Proceed" +msgstr "Fortsätt" + +msgid "Reboot Device to an Alternative Partition" +msgstr "Starta om enheten till en alternativ partition" + +msgid "Reboot to alternative partition..." +msgstr "Starta om till alternativ partition..." + +msgid "Reboot to current partition" +msgstr "Starta om till nuvarande partition" + +msgid "Rebooting..." +msgstr "Startar om..." + +msgid "Shutting down..." +msgstr "Stänger av..." + +msgid "Status" +msgstr "Status" + +msgid "" +"The system is rebooting now.
DO NOT POWER OFF THE DEVICE!
Wait a " +"few minutes before you try to reconnect. It might be necessary to renew the " +"address of your computer to reach the device again, depending on your " +"settings." +msgstr "" + +msgid "" +"The system is rebooting to an alternative partition now.
DO NOT POWER " +"OFF THE DEVICE!
Wait a few minutes before you try to reconnect. It " +"might be necessary to renew the address of your computer to reach the device " +"again, depending on your settings." +msgstr "" + +msgid "" +"The system is shutting down now.
DO NOT POWER OFF THE DEVICE!
It " +"might be necessary to renew the address of your computer to reach the device " +"again, depending on your settings." +msgstr "" +"Systemet stänger ner nu.
STÄNG INTE AV ENHETEN!
Beroende +"på dina inställningar så kan det vara nödvändigt att förnya din dators adress " +"för att nå enheten igen." + +msgid "" +"WARNING: An alternative partition might have its own settings and completely " +"different firmware.

As your network configuration and WiFi SSID/" +"password on alternative partition might be different, you might have to " +"adjust your computer settings to be able to access your device once it " +"reboots.

Please also be aware that alternative partition " +"firmware might not provide an easy way to switch active partition and boot " +"back to the currently active partition.

Click \"Proceed\" below " +"to reboot device to an alternative partition." +msgstr "" + +msgid "" +"WARNING: Power off might result in a reboot on a device which doesn't " +"support power off.

Click \"Proceed\" below to power off your " +"device." +msgstr "" +"VARNING: Att stänga av kan resultera i en omstart i en enhet som inte " +"har stöd för avstängning.

Klicka på \"Fortsätt\" nedanför för att stänga av din " +"enhet." + +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "Varning: Det finns osparade ändringar som kommer att förloras vid omstart!" + +msgid "Warning: This system does not have two partitions!" +msgstr "Varning: Det här systemet har inte två partitioner!" + +msgid "Warning: This system does not support powering off!" +msgstr "Varning: Det här systemet har inte stöd för avstängning!" diff --git a/applications/luci-app-ahcp/po/sv/ahcp.po b/applications/luci-app-ahcp/po/sv/ahcp.po index a7c7a38f7..db1cc35ec 100644 --- a/applications/luci-app-ahcp/po/sv/ahcp.po +++ b/applications/luci-app-ahcp/po/sv/ahcp.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "PO-Revision-Date: 2014-04-27 22:52+0200\n" -"Last-Translator: Umeaboy \n" +"Last-Translator: Umeaboy \n" "Language-Team: none\n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -20,6 +20,10 @@ msgid "" "networks where it is difficult or impossible to configure a server within " "every link-layer broadcast domain, for example mobile ad-hoc networks." msgstr "" +"AHCP är ett autokonfigurationsprotokoll för IPv6 och dual-stack IPv6/IPv4- " +"nätverk designade för att användas vid upptäckt av router eller DHCP på " +"nätverk där det är svårt eller omöjligt att ställa in en server inom " +"varje sändningslänkslags-domän, till exempel mobila ad-hocnätverk." msgid "Active AHCP Leases" msgstr "Aktiva AHCP-hyror" diff --git a/applications/luci-app-aria2/po/sv/aria2.po b/applications/luci-app-aria2/po/sv/aria2.po index 3a129364c..33613faca 100644 --- a/applications/luci-app-aria2/po/sv/aria2.po +++ b/applications/luci-app-aria2/po/sv/aria2.po @@ -25,10 +25,10 @@ msgstr "Status för Aria2" msgid "" "Aria2 is a multi-protocol & multi-source download utility, here you can " "configure the settings." -msgstr "Aria2 är ett verktyg för multiprotokoll & multi-käll" +msgstr "" msgid "Autosave session interval" -msgstr "" +msgstr "Autospara sessionintervall" msgid "BitTorrent Settings" msgstr "Inställningar för BitTorrent" @@ -82,16 +82,16 @@ msgid "Info" msgstr "Info" msgid "List of additional Bt tracker" -msgstr "" +msgstr "Lista över extra Bt-tracker" msgid "List of extra settings" -msgstr "" +msgstr "Lista över extra inställningar" msgid "Log file is in the config file dir." msgstr "Logg-filen är i konfigurationsfilens mapp." msgid "Log level" -msgstr "Loggningsnivå" +msgstr "Loggnivå" msgid "Max concurrent downloads" msgstr "Maximalt sammanhängande nerladdningar" @@ -103,10 +103,10 @@ msgid "Max number of peers per torrent" msgstr "Maximalt antalet jämlikar per torrent" msgid "Max number of split" -msgstr "" +msgstr "Högst antal split" msgid "Min split size" -msgstr "" +msgstr "Minsta split-storlek" msgid "No Authentication" msgstr "Ingen autentisering" @@ -118,7 +118,7 @@ msgid "Off" msgstr "Av" msgid "Open WebUI-Aria2" -msgstr "" +msgstr "Öppna WebUI-Aria2" msgid "Open YAAW" msgstr "Öppna YAAW" @@ -145,10 +145,10 @@ msgid "Prealloc" msgstr "Prealloc" msgid "Preallocation" -msgstr "" +msgstr "Förallokering" msgid "Prefix of peer ID" -msgstr "" +msgstr "Peer-ID prefix" msgid "RPC Token" msgstr "" @@ -172,7 +172,7 @@ msgid "Sec" msgstr "Sek" msgid "Task Settings" -msgstr "" +msgstr "Inställningar för uppgifter" msgid "The Aria2 service is not running." msgstr "Aria2-tjänsten körs inte." @@ -181,7 +181,7 @@ msgid "The Aria2 service is running." msgstr "Aria2-tjänsten körs." msgid "Token" -msgstr "" +msgstr "Tecken" msgid "Trunc" msgstr "" @@ -196,13 +196,13 @@ msgid "Username & Password" msgstr "Användarnamn & Lösenord" msgid "View Json-RPC URL" -msgstr "" +msgstr "Visa Json-RPC URL" msgid "Warn" msgstr "Varna" msgid "in bytes, You can append K or M." -msgstr "" +msgstr "i bytes, Du kan bifoga K eller M." msgid "in bytes/sec, You can append K or M." -msgstr "" +msgstr "i bytes/sek, Du kan bifoga K eller M." diff --git a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm index 1edafa7c7..1e423b49f 100644 --- a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm +++ b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm @@ -1,3 +1,78 @@ +<% +-- all lua code provided by https://github.com/jow-/ +-- thank you very much! + + function apply_acls(filename, session) + local json = require "luci.jsonc" + local util = require "luci.util" + local fs = require "nixio.fs" + + local grants = { } + + local acl = json.parse(fs.readfile(filename)) + if type(acl) ~= "table" then + return + end + + local group, perms + for group, perms in pairs(acl) do + local perm, scopes + for perm, scopes in pairs(perms) do + if type(scopes) == "table" then + local scope, objects + for scope, objects in pairs(scopes) do + if type(objects) == "table" then + if not grants[scope] then + grants[scope] = { } + end + + if next(objects) == 1 then + local _, object + for _, object in ipairs(objects) do + if not grants[scope][object] then + grants[scope][object] = { } + end + table.insert(grants[scope][object], perm) + end + else + local object, funcs + for object, funcs in pairs(objects) do + if type(funcs) == "table" then + local _, func + for _, func in ipairs(funcs) do + if not grants[scope][object] then + grants[scope][object] = { } + end + table.insert(grants[scope][object], func) + end + end + end + end + end + end + end + end + end + + local _, scope, object, func + for scope, _ in pairs(grants) do + local objects = { } + for object, _ in pairs(_) do + for _, func in ipairs(_) do + table.insert(objects, { object, func }) + end + end + + util.ubus("session", "grant", { + ubus_rpc_session = session, + scope = scope, objects = objects + }) + end + end + + apply_acls("/usr/share/rpcd/acl.d/attendedsysupgrade.json", luci.dispatcher.context.authsession) + apply_acls("/usr/share/rpcd/acl.d/packagelist.json", luci.dispatcher.context.authsession) +%> <%+header%>

<%:Attended Sysupgrade%>

@@ -6,6 +81,12 @@
+
+ +
+ +
+