From 41f59ff3bfdd3944d4c0f6fcc553a8f16c933065 Mon Sep 17 00:00:00 2001 From: ZNC-Jenkins Date: Thu, 10 Oct 2019 00:28:29 +0000 Subject: [PATCH 1/2] Update translations from Crowdin for pt_BR --- modules/po/alias.pt_BR.po | 2 +- modules/po/autoattach.pt_BR.po | 6 +++--- modules/po/autovoice.pt_BR.po | 18 +++++++++--------- src/po/znc.pt_BR.po | 32 ++++++++++++++++---------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/po/alias.pt_BR.po b/modules/po/alias.pt_BR.po index 2c06eeb1..a3d53e71 100644 --- a/modules/po/alias.pt_BR.po +++ b/modules/po/alias.pt_BR.po @@ -14,7 +14,7 @@ msgstr "" #: alias.cpp:141 msgid "missing required parameter: {1}" -msgstr "" +msgstr "parâmetro requirido faltando: {1}" #: alias.cpp:201 msgid "Created alias: {1}" diff --git a/modules/po/autoattach.pt_BR.po b/modules/po/autoattach.pt_BR.po index 4ef206e8..ee3a033d 100644 --- a/modules/po/autoattach.pt_BR.po +++ b/modules/po/autoattach.pt_BR.po @@ -14,7 +14,7 @@ msgstr "" #: autoattach.cpp:94 msgid "Added to list" -msgstr "" +msgstr "Adicionado à lista" #: autoattach.cpp:96 msgid "{1} is already added" @@ -42,11 +42,11 @@ msgstr "" #: autoattach.cpp:122 autoattach.cpp:130 msgid "Chan" -msgstr "" +msgstr "Canal" #: autoattach.cpp:123 autoattach.cpp:131 msgid "Search" -msgstr "" +msgstr "Buscar" #: autoattach.cpp:124 autoattach.cpp:132 msgid "Host" diff --git a/modules/po/autovoice.pt_BR.po b/modules/po/autovoice.pt_BR.po index a2e2c1ad..8cb40e92 100644 --- a/modules/po/autovoice.pt_BR.po +++ b/modules/po/autovoice.pt_BR.po @@ -14,7 +14,7 @@ msgstr "" #: autovoice.cpp:120 msgid "List all users" -msgstr "" +msgstr "Listar todos os usuários" #: autovoice.cpp:122 autovoice.cpp:125 msgid " [channel] ..." @@ -22,11 +22,11 @@ msgstr "" #: autovoice.cpp:123 msgid "Adds channels to a user" -msgstr "" +msgstr "Adiciona canais a um usuário" #: autovoice.cpp:126 msgid "Removes channels from a user" -msgstr "" +msgstr "Remove canais de um usuário" #: autovoice.cpp:128 msgid " [channels]" @@ -34,15 +34,15 @@ msgstr "" #: autovoice.cpp:129 msgid "Adds a user" -msgstr "" +msgstr "Adiciona um usuário" #: autovoice.cpp:131 msgid "" -msgstr "" +msgstr "" #: autovoice.cpp:131 msgid "Removes a user" -msgstr "" +msgstr "Remove um usuário" #: autovoice.cpp:215 msgid "Usage: AddUser [channels]" @@ -50,7 +50,7 @@ msgstr "" #: autovoice.cpp:229 msgid "Usage: DelUser " -msgstr "" +msgstr "Uso: DelUser " #: autovoice.cpp:238 msgid "There are no users defined" @@ -58,7 +58,7 @@ msgstr "" #: autovoice.cpp:244 autovoice.cpp:250 msgid "User" -msgstr "" +msgstr "Usuário" #: autovoice.cpp:245 autovoice.cpp:251 msgid "Hostmask" @@ -66,7 +66,7 @@ msgstr "" #: autovoice.cpp:246 autovoice.cpp:252 msgid "Channels" -msgstr "" +msgstr "Canais" #: autovoice.cpp:263 msgid "Usage: AddChans [channel] ..." diff --git a/src/po/znc.pt_BR.po b/src/po/znc.pt_BR.po index e0e5ca81..babf5e22 100644 --- a/src/po/znc.pt_BR.po +++ b/src/po/znc.pt_BR.po @@ -733,7 +733,7 @@ msgstr "Você não tem servidores adicionados." #: ClientCommand.cpp:787 msgid "Server removed" -msgstr "" +msgstr "Servidor removido" #: ClientCommand.cpp:789 msgid "No such server" @@ -793,17 +793,17 @@ msgstr "" #: ClientCommand.cpp:876 ClientCommand.cpp:882 msgctxt "topicscmd" msgid "Topic" -msgstr "" +msgstr "Tópico" #: ClientCommand.cpp:889 ClientCommand.cpp:893 msgctxt "listmods" msgid "Name" -msgstr "" +msgstr "Nome" #: ClientCommand.cpp:890 ClientCommand.cpp:894 msgctxt "listmods" msgid "Arguments" -msgstr "" +msgstr "Parâmetros" #: ClientCommand.cpp:902 msgid "No global modules loaded." @@ -811,23 +811,23 @@ msgstr "" #: ClientCommand.cpp:904 ClientCommand.cpp:964 msgid "Global modules:" -msgstr "" +msgstr "Módulos globais:" #: ClientCommand.cpp:912 msgid "Your user has no modules loaded." -msgstr "" +msgstr "Seu usuário não possui módulos carregados." #: ClientCommand.cpp:914 ClientCommand.cpp:975 msgid "User modules:" -msgstr "" +msgstr "Módulos de usuário:" #: ClientCommand.cpp:921 msgid "This network has no modules loaded." -msgstr "" +msgstr "Esta rede não possui módulos carregados." #: ClientCommand.cpp:923 ClientCommand.cpp:986 msgid "Network modules:" -msgstr "" +msgstr "Módulos da rede:" #: ClientCommand.cpp:938 ClientCommand.cpp:944 msgctxt "listavailmods" @@ -861,7 +861,7 @@ msgstr "Uso: LoadMod [--type=global|user|network] [parâmetros]" #: ClientCommand.cpp:1025 msgid "Unable to load {1}: {2}" -msgstr "" +msgstr "Não foi possível carregar {1}: {2}" #: ClientCommand.cpp:1035 msgid "Unable to load global module {1}: Access denied." @@ -960,7 +960,7 @@ msgstr "" #: ClientCommand.cpp:1260 msgid "Usage: SetBindHost " -msgstr "" +msgstr "Uso: SetBindHost " #: ClientCommand.cpp:1265 ClientCommand.cpp:1282 msgid "You already have this bind host!" @@ -972,7 +972,7 @@ msgstr "" #: ClientCommand.cpp:1277 msgid "Usage: SetUserBindHost " -msgstr "" +msgstr "Uso: SetUserBindHost " #: ClientCommand.cpp:1287 msgid "Set default bind host to {1}" @@ -1010,7 +1010,7 @@ msgstr "" #: ClientCommand.cpp:1328 msgid "Usage: PlayBuffer <#chan|query>" -msgstr "" +msgstr "Uso: PlayBuffer <#canal|query>" #: ClientCommand.cpp:1336 msgid "You are not on {1}" @@ -1402,7 +1402,7 @@ msgstr "" #: ClientCommand.cpp:1756 msgctxt "helpcmd|Attach|args" msgid "<#chans>" -msgstr "" +msgstr "<#canais>" #: ClientCommand.cpp:1757 msgctxt "helpcmd|Attach|desc" @@ -1412,7 +1412,7 @@ msgstr "" #: ClientCommand.cpp:1758 msgctxt "helpcmd|Detach|args" msgid "<#chans>" -msgstr "" +msgstr "<#canais>" #: ClientCommand.cpp:1759 msgctxt "helpcmd|Detach|desc" @@ -1507,7 +1507,7 @@ msgstr "" #: ClientCommand.cpp:1805 msgctxt "helpcmd|Jump|args" msgid "[server]" -msgstr "" +msgstr "[servidor]" #: ClientCommand.cpp:1806 msgctxt "helpcmd|Jump|desc" From 064d0c928b3a086a4d5c88290ad7ed6f9f309909 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Thu, 17 Oct 2019 22:20:15 +0100 Subject: [PATCH 2/2] Re-enable IPv6 in the bleeding edge docker image Upgrade alpine Ref https://github.com/znc/znc-docker/issues/19 --- Dockerfile | 6 ++---- docker | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0cdcf21e..57902582 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,8 @@ -FROM alpine:3.8 +FROM alpine:3.10 ARG VERSION_EXTRA="" -# musl silently doesn't support AI_ADDRCONFIG yet, and ZNC doesn't support Happy Eyeballs yet. -# Together they cause very slow connection. So for now IPv6 is disabled here. -ARG CMAKEFLAGS="-DVERSION_EXTRA=${VERSION_EXTRA} -DCMAKE_INSTALL_PREFIX=/opt/znc -DWANT_CYRUS=YES -DWANT_PERL=YES -DWANT_PYTHON=YES -DWANT_IPV6=NO" +ARG CMAKEFLAGS="-DVERSION_EXTRA=${VERSION_EXTRA} -DCMAKE_INSTALL_PREFIX=/opt/znc -DWANT_CYRUS=YES -DWANT_PERL=YES -DWANT_PYTHON=YES" ARG MAKEFLAGS="" ARG BUILD_DATE diff --git a/docker b/docker index 4da25330..95e45def 160000 --- a/docker +++ b/docker @@ -1 +1 @@ -Subproject commit 4da25330d7d4415507c5abd24efa74130243a5b3 +Subproject commit 95e45def730df4a04c0d08a97dccb66e5b9766f6