October 2019 - tor-commits - lists.torproject.org

[tor/master] Bump to 0.4.2.3-alpha
by nickm＠torproject.org 24 Oct '19

24 Oct '19

commit 76939cf2932d557754ca5cfced6ac5736adf38ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 23 20:25:34 2019 -0400 Bump to 0.4.2.3-alpha --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index b8b745e98..f660041b3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.2.2-alpha-dev]) +AC_INIT([tor],[0.4.2.3-alpha]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-10-07"], # for 0.4.2.2-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-10-24"], # for 0.4.2.3-alpha [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index a0867d10a..0ec8e1f6e 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.2.2-alpha-dev" +!define VERSION "0.4.2.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ddcca8ebb..19cf0437b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.2.2-alpha-dev" +#define VERSION "0.4.2.3-alpha"

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 24 Oct '19

24 Oct '19

commit a03c0394a3f6885cd10f1c1d7e93834b39ab8fde Merge: 20606b8a1 76939cf29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 23 20:26:15 2019 -0400 Merge branch 'maint-0.4.2' "ours" to avoid version bump.

1 0

[tor/release-0.4.2] Bump to 0.4.2.3-alpha
by nickm＠torproject.org 24 Oct '19

24 Oct '19

commit 76939cf2932d557754ca5cfced6ac5736adf38ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 23 20:25:34 2019 -0400 Bump to 0.4.2.3-alpha --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index b8b745e98..f660041b3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.2.2-alpha-dev]) +AC_INIT([tor],[0.4.2.3-alpha]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-10-07"], # for 0.4.2.2-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-10-24"], # for 0.4.2.3-alpha [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index a0867d10a..0ec8e1f6e 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.2.2-alpha-dev" +!define VERSION "0.4.2.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ddcca8ebb..19cf0437b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.2.2-alpha-dev" +#define VERSION "0.4.2.3-alpha"

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 24 Oct '19

24 Oct '19

commit bb54bca8759d2c5f6b3f22ba57b7ef22f189e1e4 Merge: a1b8ff682 76939cf29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 23 20:26:32 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.2] fold two more changelog entries into 0423-alpha cl
by nickm＠torproject.org 24 Oct '19

24 Oct '19

commit a1b8ff682178cd98dfdb902db5d5fa8c21e7d224 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 23 20:24:03 2019 -0400 fold two more changelog entries into 0423-alpha cl --- ChangeLog | 13 +++++++++++++ changes/bug32106 | 5 ----- changes/bug32108 | 8 -------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50931816b..d9f611b0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,15 @@ Changes in version 0.4.2.3-alpha - 2019-10-?? This release fixes several bugs from the previous alpha release, and from earlier versions of Tor. + o Major bugfixes (relay): + - Relays now respect their AccountingMax bandwidth again. When + relays entered "soft" hibernation (which typically starts when + we've hit 90% of our AccountingMax), we had stopped checking + whether we should enter hard hibernation. Soft hibernation refuses + new connections and new circuits, but the existing circuits can + continue, meaning that relays could have exceeded their configured + AccountingMax. Fixes bug 32108; bugfix on 0.4.0.1-alpha. + o Major bugfixes (v3 onion services): - Onion services now always use the exact number of intro points configured with the HiddenServiceNumIntroductionPoints option (or @@ -93,6 +102,10 @@ Changes in version 0.4.2.3-alpha - 2019-10-?? o Documentation: - Correct the description of "GuardLifetime". Fixes bug 31189; bugfix on 0.3.0.1-alpha. + - Make clear in the man page, in both the bandwidth section and the + accountingmax section, that Tor counts in powers of two, not + powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion + bytes. Resolves ticket 32106. Changes in version 0.4.2.2-alpha - 2019-10-07 diff --git a/changes/bug32106 b/changes/bug32106 deleted file mode 100644 index c6e8e9586..000000000 --- a/changes/bug32106 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (documentation): - - Make clear in the man page, in both the bandwidth section and the - accountingmax section, that Tor counts in powers of two, not - powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion - bytes. Resolves ticket 32106. diff --git a/changes/bug32108 b/changes/bug32108 deleted file mode 100644 index 2806fa3e5..000000000 --- a/changes/bug32108 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (relay): - - Relays now respect their AccountingMax bandwidth again. When relays - entered "soft" hibernation (which typically starts when we've hit - 90% of our AccountingMax), we had stopped checking whether we should - enter hard hibernation. Soft hibernation refuses new connections and - new circuits, but the existing circuits can continue, meaning that - relays could have exceeded their configured AccountingMax. Fixes - bug 32108; bugfix on 0.4.0.1-alpha.

1 0

[translation/tails-greeter-2_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2_completed
by translation＠torproject.org 24 Oct '19

24 Oct '19

commit 0e31f8def24ea957b132204473d5ba4416471e3e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 24 00:19:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2_com… --- ca/ca.po | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) diff --git a/ca/ca.po b/ca/ca.po new file mode 100644 index 000000000..baea8c288 --- /dev/null +++ b/ca/ca.po @@ -0,0 +1,356 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# laia_, 2016 +# icc <mail(a)koopic.net>, 2016 +# Jaume Zaragoza <jaumet(a)posteo.net>, 2017 +# Ari Romero <ariadnaaa55555(a)gmail.com>, 2017 +# Vte A.F <viarfer3(a)inf.upv.es>, 2017 +# Benny Beat <bennybeat(a)gmail.com>, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-05-11 00:25+0200\n" +"PO-Revision-Date: 2016-11-18 21:29+0000\n" +"Last-Translator: Benny Beat <bennybeat(a)gmail.com>, 2019\n" +"Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/greeter.ui.h:1 +msgid "Administration Password" +msgstr "Contrasenya d'administador" + +#: ../data/greeter.ui.h:2 +msgid "" +"Set up an administration password if you need to perform administrative " +"tasks. Otherwise, the administration password is disabled for better " +"security." +msgstr "" +"Configureu una contrasenya d'administrador si heu de dur a terme tasques " +"d'administració. D'altra banda, la contrasenya d'administrador romandrà " +"deshabilitada per a més seguretat." + +#: ../data/greeter.ui.h:3 +msgid "Enter an administration password" +msgstr "Inseriu la contrasenya d'administrador" + +#: ../data/greeter.ui.h:4 +msgid "Confirm" +msgstr "Confirma" + +#: ../data/greeter.ui.h:5 +msgid "Confirm your administration password" +msgstr "Confirmeu la contrasenya d'administrador " + +#: ../data/greeter.ui.h:6 +msgid "Disable" +msgstr "Inhabilita" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:8 +msgid "Windows Camouflage" +msgstr "Camuflatge del Windows" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:10 +msgid "" +"This option makes Tails look like Microsoft Windows 10. This can be useful " +"to avoid attracting suspicion in public places." +msgstr "" +"Aquesta opció permet al Tails visualitzar-se com Microsoft Windows 10. " +"Permet no aixecar sospites en llocs públics." + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:12 +msgid "Microsoft Windows 10 camouflage" +msgstr "Camuflatge de Microsoft Windows 10" + +#: ../data/greeter.ui.h:13 +msgid "MAC Address Spoofing" +msgstr "Falsejament d'adreça MAC" + +#: ../data/greeter.ui.h:14 +msgid "" +"MAC address spoofing hides the serial number of your network interface (Wi-" +"Fi or wired) to the local network. Spoofing MAC addresses is generally safer" +" as it helps you hide your geographical location. But it might also create " +"connectivity problems or look suspicious." +msgstr "" +"El falsejament de l'adreça MAC amaga el número de sèrie de xarxa " +"(d'interfícies amb o sense fils) a la xarxa local. El falsejament de " +"direccions MAC en general és segur en amagar la localització geogràfica. " +"Però també crea problemes de connectivitat i sembla sospitós. " + +#: ../data/greeter.ui.h:15 +msgid "Spoof all MAC addresses (default)" +msgstr "Falsejament de totes les direccions MAC (per defecte)" + +#: ../data/greeter.ui.h:16 +msgid "Don't spoof MAC addresses" +msgstr "No falsejar les direccions MAC" + +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "No es pot desblocar la memòria xifrada amb la contrasenya." + +#: ../data/greeter.ui.h:18 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "" +"Configurareu més tard el pont i el servidor intermediari del Tor en " +"connectar a la xarxa." + +#: ../data/greeter.ui.h:19 +msgid "Welcome to Tails!" +msgstr "Us donem la benvinguda al Tails!" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:21 +msgctxt "" +msgid "" +"To get guided through Tails' settings, click on Take a Tour above" +msgstr "" +"Per fer la visita guiada dels paràmetres del Tails, feu clic a Visita " +"guiada a dalt." + +#: ../data/greeter.ui.h:22 +msgid "Language & Region" +msgstr "Llengua i regió" + +#: ../data/greeter.ui.h:23 +msgid "Default Settings" +msgstr "Paràmetres per defecte" + +#: ../data/greeter.ui.h:24 +msgid "Save Language & Region Settings" +msgstr "Desa els paràmetres de llengua i regió" + +#: ../data/greeter.ui.h:25 +msgid "_Language" +msgstr "_Llengua" + +#: ../data/greeter.ui.h:26 +msgid "_Keyboard Layout" +msgstr "_Disposició del teclat" + +#: ../data/greeter.ui.h:27 +msgid "_Formats" +msgstr "_Formats" + +#: ../data/greeter.ui.h:28 +msgid "_Time Zone" +msgstr "_Zona horària" + +#: ../data/greeter.ui.h:29 +msgid "Encrypted _Persistent Storage" +msgstr "_Emmagatzematge persistent xifrat" + +#: ../data/greeter.ui.h:30 +msgid "Show Passphrase" +msgstr "Mostra la contrasenya" + +#: ../data/greeter.ui.h:31 +msgid "Configure Persistent Storage" +msgstr "Paràmetres d'emmagatzematge persistent" + +#. The label for this placeholder text is not very big, so keep this string +#. short. +#: ../data/greeter.ui.h:33 +msgid "Enter your passphrase to unlock the persistent storage" +msgstr "Inseriu la contrasenya de desbloqueig de l'emmagatzematge persistent" + +#: ../data/greeter.ui.h:34 ../tailsgreeter/gui.py:478 +#: ../tailsgreeter/gui.py:528 +msgid "Unlock" +msgstr "Desbloca" + +#: ../data/greeter.ui.h:35 +msgid "Relock Persistent Storage" +msgstr "Torna a blocar l'emmagatzemament persistent" + +#: ../data/greeter.ui.h:36 +msgid "Your persistent storage is unlocked. Restart Tails to lock it again." +msgstr "" +"S'ha desblocat el vostre emmagatzematge. Reinicieu el Tails per blocar-lo " +"novament." + +#: ../data/greeter.ui.h:37 +msgid "_Additional Settings" +msgstr "_Paràmetres addicionals" + +#: ../data/greeter.ui.h:38 +msgid "Save Additional Settings" +msgstr "Desa els paràmetres addicionals" + +#: ../data/greeter.ui.h:39 +msgid "Add an additional setting" +msgstr "Afegeix paràmetres addicionals" + +#: ../data/greeter.ui.h:40 +msgid "Network Configuration" +msgstr "Configuració de la xarxa" + +#: ../data/greeter.ui.h:41 +msgid "" +"If your Internet connection is censored, filtered, or proxied you can " +"configure a Tor bridge or a local proxy. To work completely offline, you can" +" disable all networking." +msgstr "" +"Si la connexió a Internet és censurada, filtrada o amb encaminada a un " +"servidor intermediari, podeu configurar un pont o servidor local del Tor. " +"Per treballar fora de línia, inhabiliteu totes les xarxes." + +#: ../data/greeter.ui.h:42 +msgid "Connect directly to the Tor network (default)" +msgstr "Connectat directament a la xarxa Tor (per defecte)" + +#: ../data/greeter.ui.h:43 +msgid "Configure a Tor bridge or local proxy" +msgstr "Configureu un pont Tor o un servidor intermediari local" + +#: ../data/greeter.ui.h:44 +msgid "Disable all networking" +msgstr "Inhabilita totes les xarxes" + +#: ../data/greeter.ui.h:45 +msgid "" +"The default settings are safe in most situations. To add a custom setting, " +"press the \"+\" button below." +msgstr "" +"Els valors per defecte són segurs en la majoria de situacions. Per afegir " +"una configuració personalitzada, pressionar el botó \"+\"." + +#: ../data/greeter.ui.h:46 +msgid "_Administration Password" +msgstr "_Contrasenya d'administrador" + +#: ../data/greeter.ui.h:47 ../tailsgreeter/utils.py:45 +msgid "Off (default)" +msgstr "Inhabilitat (per defecte)" + +#: ../data/greeter.ui.h:48 +msgid "_MAC Address Spoofing" +msgstr "_Adreça MAC simulada" + +#: ../data/greeter.ui.h:49 ../tailsgreeter/utils.py:43 +msgid "On (default)" +msgstr "Habilitat (per defecte)" + +#: ../data/greeter.ui.h:50 +msgid "_Network Connection" +msgstr "_Connexió de la xarxa" + +#: ../data/greeter.ui.h:51 ../tailsgreeter/gui.py:385 +msgid "Direct (default)" +msgstr "Directe (per defecte)" + +#: ../data/greeter.ui.h:52 +msgid "_Windows Camouflage" +msgstr "_Camuflatge com a Windows" + +#: ../tailsgreeter/gui.py:391 +msgid "Bridge & Proxy" +msgstr "Pont i servidor intermediari" + +#: ../tailsgreeter/gui.py:397 +msgid "Offline" +msgstr "Fora de línia" + +#: ../tailsgreeter/gui.py:481 +msgid "Failed to relock persistent storage." +msgstr "Error en blocar l'emmagatzemament persistent." + +#: ../tailsgreeter/gui.py:499 +msgid "Unlocking…" +msgstr "Desbloca" + +#: ../tailsgreeter/gui.py:594 +msgid "Additional Settings" +msgstr "Paràmetres adicionals" + +#: ../tailsgreeter/gui.py:602 +msgid "Cancel" +msgstr "Cancel·la" + +#: ../tailsgreeter/gui.py:608 +msgid "Add" +msgstr "Afegeix" + +#: ../tailsgreeter/gui.py:616 +msgid "Back" +msgstr "Enrere" + +#: ../tailsgreeter/gui.py:730 +msgid "Shutdown" +msgstr "Tanca" + +#: ../tailsgreeter/gui.py:735 +msgid "_Start Tails" +msgstr "_Inicia el Tails" + +#. Translators: please do not translate this string (it is read from +#. Gtk translation) +#: ../tailsgreeter/language.py:137 +msgid "default:LTR" +msgstr "per defecte:LTR" + +#: ../tailsgreeter/persistence.py:91 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stderr}" +msgstr "" +"Ha fallat el live-persist amb el codi {returncode}:\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141 +#, python-brace-format +msgid "" +"cryptsetup failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"Ha fallat el cryptsetup amb el següent codi {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:158 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"Ha fallat el live-persist amb el següent codi {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:172 +#, python-brace-format +msgid "" +"umount failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"Ha fallat en desmuntar amb el següent codi {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/utils.py:48 +msgid "On" +msgstr "Habilitat" + +#: ../tailsgreeter/utils.py:50 +msgid "Off" +msgstr "Inhabilitat"

1 0

[translation/tails-greeter-2] https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2
by translation＠torproject.org 24 Oct '19

24 Oct '19

commit f0aab553569d12a17cf3056ce919492f93848b9c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 24 00:19:04 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2 --- ca/ca.po | 97 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 46 insertions(+), 51 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 29f18225d..baea8c288 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -4,16 +4,11 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Norike Abe <norikeave(a)hotmail.com>, 2016 -# Gerard Farràs Ballabriga <>, 2016 -# Ian Martorell <ianmartorell(a)gmail.com>, 2016 # laia_, 2016 # icc <mail(a)koopic.net>, 2016 # Jaume Zaragoza <jaumet(a)posteo.net>, 2017 # Ari Romero <ariadnaaa55555(a)gmail.com>, 2017 # Vte A.F <viarfer3(a)inf.upv.es>, 2017 -# Miquel Bosch, 2018 -# erinm, 2019 # Benny Beat <bennybeat(a)gmail.com>, 2019 # #, fuzzy @@ -59,12 +54,12 @@ msgstr "Confirmeu la contrasenya d'administrador " #: ../data/greeter.ui.h:6 msgid "Disable" -msgstr "Deshabilitar " +msgstr "Inhabilita" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:8 msgid "Windows Camouflage" -msgstr "Camuflatge de Windows" +msgstr "Camuflatge del Windows" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:10 @@ -72,8 +67,8 @@ msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " "to avoid attracting suspicion in public places." msgstr "" -"Aquesta opció permet a Tails visualitzar-se com Microsoft Windows 10. " -"Permeten no aixecar sospites en llocs públics." +"Aquesta opció permet al Tails visualitzar-se com Microsoft Windows 10. " +"Permet no aixecar sospites en llocs públics." #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 @@ -82,7 +77,7 @@ msgstr "Camuflatge de Microsoft Windows 10" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" -msgstr "Falsejament de direcció MAC" +msgstr "Falsejament d'adreça MAC" #: ../data/greeter.ui.h:14 msgid "" @@ -91,9 +86,9 @@ msgid "" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." msgstr "" -"El falsejament de la direcció MAC amaga el número de serie de xarxa " -"(d'interfícies sense fils o amb fil) a la xarxa local. El falsejament de " -"direccions MAC en general és segur al amagar la localització geogràfica. " +"El falsejament de l'adreça MAC amaga el número de sèrie de xarxa " +"(d'interfícies amb o sense fils) a la xarxa local. El falsejament de " +"direccions MAC en general és segur en amagar la localització geogràfica. " "Però també crea problemes de connectivitat i sembla sospitós. " #: ../data/greeter.ui.h:15 @@ -106,19 +101,19 @@ msgstr "No falsejar les direccions MAC" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "No es pot desbloquejar la memòria encriptada amb la contrasenya." +msgstr "No es pot desblocar la memòria xifrada amb la contrasenya." #: ../data/greeter.ui.h:18 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Configurarà el pont i el servidor intermedi de Tor, posterior a una connexió" -" a la xarxa." +"Configurareu més tard el pont i el servidor intermediari del Tor en " +"connectar a la xarxa." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" -msgstr "Benvingut a Tails!" +msgstr "Us donem la benvinguda al Tails!" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:21 @@ -126,7 +121,7 @@ msgctxt "" msgid "" "To get guided through Tails' settings, click on Take a Tour above" msgstr "" -"Per esser guiat als paràmetres de Tails, faci click a Fer un visita " +"Per fer la visita guiada dels paràmetres del Tails, feu clic a Visita " "guiada a dalt." #: ../data/greeter.ui.h:22 @@ -139,7 +134,7 @@ msgstr "Paràmetres per defecte" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" -msgstr "Desar paràmetres de llengua i regió" +msgstr "Desa els paràmetres de llengua i regió" #: ../data/greeter.ui.h:25 msgid "_Language" @@ -159,11 +154,11 @@ msgstr "_Zona horària" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "_Emmagatzematge persistent encriptat" +msgstr "_Emmagatzematge persistent xifrat" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "Mostra contrasenya" +msgstr "Mostra la contrasenya" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" @@ -173,22 +168,22 @@ msgstr "Paràmetres d'emmagatzematge persistent" #. short. #: ../data/greeter.ui.h:33 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "Entrar contrasenya per desbloquejar l'emmagatzematge persistent" +msgstr "Inseriu la contrasenya de desbloqueig de l'emmagatzematge persistent" #: ../data/greeter.ui.h:34 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "Desbloquejar" +msgstr "Desbloca" #: ../data/greeter.ui.h:35 msgid "Relock Persistent Storage" -msgstr "Re-bloquejar l'emmagatzemament persistent" +msgstr "Torna a blocar l'emmagatzemament persistent" #: ../data/greeter.ui.h:36 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" -"El vostre emmagatzematge persistent està desbloquejat. Reinicieu Tails per a" -" bloquejar-lo de nou." +"S'ha desblocat el vostre emmagatzematge. Reinicieu el Tails per blocar-lo " +"novament." #: ../data/greeter.ui.h:37 msgid "_Additional Settings" @@ -196,15 +191,15 @@ msgstr "_Paràmetres addicionals" #: ../data/greeter.ui.h:38 msgid "Save Additional Settings" -msgstr "Desar paràmetres addicionals" +msgstr "Desa els paràmetres addicionals" #: ../data/greeter.ui.h:39 msgid "Add an additional setting" -msgstr "Afegir paràmetres addicionals" +msgstr "Afegeix paràmetres addicionals" #: ../data/greeter.ui.h:40 msgid "Network Configuration" -msgstr "Configuració de xarxa" +msgstr "Configuració de la xarxa" #: ../data/greeter.ui.h:41 msgid "" @@ -212,9 +207,9 @@ msgid "" "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." msgstr "" -"Si la connexió a Internet és censurada, filtrada o amb servidor intermedi " -"pot configurar un pont o servidor intermedi Tor. Per treballar fora de " -"línia, pot deshabilitar totes les xarxes." +"Si la connexió a Internet és censurada, filtrada o amb encaminada a un " +"servidor intermediari, podeu configurar un pont o servidor local del Tor. " +"Per treballar fora de línia, inhabiliteu totes les xarxes." #: ../data/greeter.ui.h:42 msgid "Connect directly to the Tor network (default)" @@ -222,11 +217,11 @@ msgstr "Connectat directament a la xarxa Tor (per defecte)" #: ../data/greeter.ui.h:43 msgid "Configure a Tor bridge or local proxy" -msgstr "Configureu un pont Tor o un proxy local" +msgstr "Configureu un pont Tor o un servidor intermediari local" #: ../data/greeter.ui.h:44 msgid "Disable all networking" -msgstr "Desactiva tota la xarxa" +msgstr "Inhabilita totes les xarxes" #: ../data/greeter.ui.h:45 msgid "" @@ -242,7 +237,7 @@ msgstr "_Contrasenya d'administrador" #: ../data/greeter.ui.h:47 ../tailsgreeter/utils.py:45 msgid "Off (default)" -msgstr "Desactivació (defecte)" +msgstr "Inhabilitat (per defecte)" #: ../data/greeter.ui.h:48 msgid "_MAC Address Spoofing" @@ -250,23 +245,23 @@ msgstr "_Adreça MAC simulada" #: ../data/greeter.ui.h:49 ../tailsgreeter/utils.py:43 msgid "On (default)" -msgstr "Activació (defecte)" +msgstr "Habilitat (per defecte)" #: ../data/greeter.ui.h:50 msgid "_Network Connection" -msgstr "_Connexió de xarxa" +msgstr "_Connexió de la xarxa" #: ../data/greeter.ui.h:51 ../tailsgreeter/gui.py:385 msgid "Direct (default)" -msgstr "Directe (defecte)" +msgstr "Directe (per defecte)" #: ../data/greeter.ui.h:52 msgid "_Windows Camouflage" -msgstr "_Camuflatge de finestres" +msgstr "_Camuflatge com a Windows" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "Pont i servidor intermedi" +msgstr "Pont i servidor intermediari" #: ../tailsgreeter/gui.py:397 msgid "Offline" @@ -274,11 +269,11 @@ msgstr "Fora de línia" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." -msgstr "Error al blocar l'emmagatzemament persistent." +msgstr "Error en blocar l'emmagatzemament persistent." #: ../tailsgreeter/gui.py:499 msgid "Unlocking…" -msgstr "Desbloquejar" +msgstr "Desbloca" #: ../tailsgreeter/gui.py:594 msgid "Additional Settings" @@ -294,15 +289,15 @@ msgstr "Afegeix" #: ../tailsgreeter/gui.py:616 msgid "Back" -msgstr "Enrera" +msgstr "Enrere" #: ../tailsgreeter/gui.py:730 msgid "Shutdown" -msgstr "Tancar" +msgstr "Tanca" #: ../tailsgreeter/gui.py:735 msgid "_Start Tails" -msgstr "_Iniciar Tails" +msgstr "_Inicia el Tails" #. Translators: please do not translate this string (it is read from #. Gtk translation) @@ -316,7 +311,7 @@ msgid "" "live-persist failed with return code {returncode}:\n" "{stderr}" msgstr "" -"live-persist ha fallat amb el següent codi {returncode}:\n" +"Ha fallat el live-persist amb el codi {returncode}:\n" "{stderr}" #: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141 @@ -326,7 +321,7 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" -"cryptsetup amb el següent codi {returncode}:\n" +"Ha fallat el cryptsetup amb el següent codi {returncode}:\n" "{stdout}\n" "{stderr}" @@ -337,7 +332,7 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" -"ive-persist ha fallat amb el següent codi {returncode}:\n" +"Ha fallat el live-persist amb el següent codi {returncode}:\n" "{stdout}\n" "{stderr}" @@ -348,14 +343,14 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" -"unmount ha fallat amb el següent codi {returncode}:\n" +"Ha fallat en desmuntar amb el següent codi {returncode}:\n" "{stdout}\n" "{stderr}" #: ../tailsgreeter/utils.py:48 msgid "On" -msgstr "Activat" +msgstr "Habilitat" #: ../tailsgreeter/utils.py:50 msgid "Off" -msgstr "Desactivar" +msgstr "Inhabilitat"

1 0

[tor/master] Add a script to run spatch with appropriate arguments
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 9a101c2c0f1e4598cd5bd2710e6021052e4ebdfa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 18:43:16 2019 -0400 Add a script to run spatch with appropriate arguments It's a bit tricky to remember the right incantation to get the proper include paths and incantations for coccinelle, but without it, coccinelle is less effective at parsing our C. --- scripts/coccinelle/apply.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/coccinelle/apply.sh b/scripts/coccinelle/apply.sh new file mode 100755 index 000000000..82e773dc3 --- /dev/null +++ b/scripts/coccinelle/apply.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# apply.sh: +# run spatch with appropriate includes and builtins for the Tor source code + +top="$(dirname "$0")/../.." + +spatch -macro_file_builtins "$top"/scripts/coccinelle/tor-coccinelle.h \ + -I "$top" -I "$top"/src -I "$top"/ext "$@"

1 0

[tor/master] Add some more of our trickier macros to tor-coccinelle.h
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 25ed698fb8a4f438c2fc804cdb2b0bf92e641f59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 18:45:52 2019 -0400 Add some more of our trickier macros to tor-coccinelle.h Note that this header file behaves a bit strangely. It is used by coccinelle just for the purpose of knowing how to parse difficult-to-parse stuff. It doesn't need to produce good C -- just grammatical C. --- scripts/coccinelle/tor-coccinelle.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index 8f625dcee..a94c3ef67 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -1,3 +1,21 @@ #define MOCK_IMPL(a, b, c) a b c #define CHECK_PRINTF(a, b) #define STATIC static + +#define STMT_BEGIN do { +#define STMT_END } while (0) + +#define BUG(x) (x) +#define IF_BUG_ONCE(x) if (x) + +#define ATTR_NORETURN +#define ATTR_UNUSED +#define ATTR_CONST +#define ATTR_MALLOC +#define ATTR_WUR + +#define HT_ENTRY(x) void * +#define HT_HEAD(a,b) struct ht_head +#define HT_INITIALIZER { } +#define X509 struct x509_st +#define STACK_OF(x) struct foo_stack_t

1 0

[tor/master] Changes file for coccinelle scripts
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit a2bd93456f2282da0f18824b04db750f9af0826c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 18:50:43 2019 -0400 Changes file for coccinelle scripts --- changes/ticket31705 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changes/ticket31705 b/changes/ticket31705 new file mode 100644 index 000000000..5ac736d4f --- /dev/null +++ b/changes/ticket31705 @@ -0,0 +1,9 @@ + o Minor features (developer tools): + - Add some scripts in "scripts/coccinelle" to invoke the Coccinelle + semantic patching tool with the correct flags. These flags are fairly + easy to forget, and these scripts should help us use Coccinelle more + effectively in the future. Closes ticket 31705. + + o Code simplification and refactoring: + - Fix some parts of our code that were difficult for Coccinelle to parse. + Related to ticket 31705.

1 0