[tor-commits] [torspec/master] bandwidth-file: Fix a typo, the file is not a fallback file

2019-02-25 Thread nickm 
commit f572865b37a6f11a220ff789b8a126c781c10a28
Author: teor 
Date:   Mon Feb 25 20:15:59 2019 +1000

bandwidth-file: Fix a typo, the file is not a fallback file

Fixes bug 29578.
---
 bandwidth-file-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index adb6b49..a241108 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -44,7 +44,7 @@
 
 1.4. Format Versions
 
-  1.0.0 - The legacy fallback Bandwidth List format
+  1.0.0 - The legacy Bandwidth List format
 
   1.1.0 - Add a header containing information about the bandwidth
   file. Document the sbws and Torflow relay line keys.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/58'

2019-02-25 Thread nickm 
commit 0878375fc3d9df7845138f4e7744e3855cf17cc5
Merge: 8e71376 f572865
Author: Nick Mathewson 
Date:   Mon Feb 25 14:34:50 2019 -0500

Merge remote-tracking branch 'tor-github/pr/58'

 bandwidth-file-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/25'

2019-02-25 Thread nickm 
commit 8e7137616194770eb99534b3426692f24f8c973c
Merge: 8bc330e d05176b
Author: Nick Mathewson 
Date:   Mon Feb 25 13:35:41 2019 -0500

Merge remote-tracking branch 'tor-github/pr/25'

 proposals/196-transport-control-ports.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Fix port in USERADDR example

2019-02-25 Thread nickm 
commit d05176bb4a6489747e0e63471a21e17a58c7470b
Author: sergeyfrolov 
Date:   Fri Jul 13 17:56:03 2018 -0400

Fix port in USERADDR example
---
 proposals/196-transport-control-ports.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proposals/196-transport-control-ports.txt 
b/proposals/196-transport-control-ports.txt
index 4ef7840..afe6f11 100644
--- a/proposals/196-transport-control-ports.txt
+++ b/proposals/196-transport-control-ports.txt
@@ -100,7 +100,7 @@ Implemented-In: 0.2.5.2-alpha
   pluggable transport proxy. A Tor bridge SHOULD use that address to
   collect statistics about its clients.  Recognized formats are:
 1.2.3.4:5678
-[1:2::3:4]::5678
+[1:2::3:4]:5678
 
   (Current Tor versions may accept other formats, but this is a bug:
   transports MUST NOT send them.)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/50'

2019-02-25 Thread nickm 
commit 8bc330e355a494521d22a36e1aa06bf9c53e3c9c
Merge: 32002ec 4af0ad4
Author: Nick Mathewson 
Date:   Mon Feb 25 13:34:44 2019 -0500

Merge remote-tracking branch 'tor-github/pr/50'

 control-spec.txt | 119 ++-
 1 file changed, 108 insertions(+), 11 deletions(-)

diff --cc control-spec.txt
index 87d4414,faaf160..78a842f
--- a/control-spec.txt
+++ b/control-spec.txt
@@@ -3651,10 -3682,18 +3738,18 @@@
tag=ap_handshake summary="Finishing handshake with a relay to build 
circuits"
   [New in 0.4.0.x]
  
+   This is similar to handshake, except for making connections to
+   additional relays or bridges that Tor needs to use to build
+   application circuits.
+ 
Phase 90:
 -  tag=ap_handshake_done summary="Handshake fininshed with a relay to build 
circuits"
 +  tag=ap_handshake_done summary="Handshake finished with a relay to build 
circuits"
   [New in 0.4.0.x]
  
+   This is similar to handshake_done, except for making connections to
+   additional relays or bridges that Tor needs to use to build
+   application circuits.
+ 
Phase 95:
tag=circuit_create summary="Establishing a[n internal] Tor circuit"
   [prior to 0.4.0.x, this was numbered 90]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Details for new 0.4.0.x bootstrap phases

2019-02-25 Thread nickm 
commit 4af0ad43a6d309847374802162d29e84caef85cb
Author: Taylor Yu 
Date:   Thu Jan 10 17:00:39 2019 -0600

Details for new 0.4.0.x bootstrap phases

Also add an overview of bootstrap reporting, and divide phases into
three stages.

Part of ticket 28928.
---
 control-spec.txt | 119 ++-
 1 file changed, 108 insertions(+), 11 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index 6b63679..faaf160 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -3453,8 +3453,43 @@
   exist in all future versions.
 
   Current Tor versions enter these phases in order, monotonically.
-  Future Tors MAY revisit earlier stages.
- [: do we revisit earlier stages if the network fails?]
+  Future Tors MAY revisit earlier phases, for example, if the network
+  fails.
+
+5.5.1. Overview of Bootstrap reporting.
+
+  Bootstrap phases can be viewed as belonging to one of three stages:
+
+  1. Initial connection to a Tor relay or bridge
+  2. Obtaining directory information
+  3. Building an application circuit
+
+  Tor doesn't specifically enter Stage 1; that is a side effect of
+  other actions that Tor is taking. Tor could be making a connection
+  to a fallback directory server, or it could be making a connection
+  to a guard candidate. Either one counts as Stage 1 for the purposes
+  of bootstrap reporting.
+
+  Stage 2 might involve Tor contacting directory servers, or it might
+  involve reading cached directory information from a previous
+  session. Large parts of Stage 2 might be skipped if there is already
+  enough cached directory information to build circuits. Tor will
+  defer reporting progress in Stage 2 until Stage 1 is complete.
+
+  Tor defers this reporting because Tor can already have enough
+  directory information to build circuits, yet not be able to connect
+  to a relay. Without that deferral, a user might misleadingly see Tor
+  stuck at a large amount of progress when something as fundamental as
+  making a TCP connection to any relay is failing.
+
+  Tor also doesn't specifically enter Stage 3; that is a side effect
+  of Tor building circuits for some purpose or other. In a typical
+  client, Tor builds predicted circuits to provide lower latency for
+  application connection requests. In Stage 3, Tor might make new
+  connections to relays or bridges that it did not connect to in Stage
+  1.
+
+5.5.2. Phases in Bootstrap Stage 1.
 
   Phase 0:
   tag=starting summary="Starting"
@@ -3465,35 +3500,60 @@
   tag=conn_pt summary="Connecting to pluggable transport"
  [This phase is new in 0.4.0.x]
 
+  Tor is making a TCP connection to the transport plugin for a
+  pluggable transport. Tor will use this pluggable transport to make
+  its first connection to a bridge.
+
   Phase 2:
   tag=conn_done_pt summary="Connected to pluggable transport"
  [New in 0.4.0.x]
 
+  Tor has completed its TCP connection to the transport plugin for the
+  pluggable transport.
+
   Phase 3:
   tag=conn_proxy summary="Connecting to proxy"
  [New in 0.4.0.x]
 
+  Tor is making a TCP connection to a proxy to make its first
+  connection to a relay or bridge.
+
   Phase 4:
   tag=conn_done_proxy summary="Connected to proxy"
  [New in 0.4.0.x]
 
+  Tor has completed its TCP connection to a proxy to make its first
+  connection to a relay or bridge.
+
   Phase 5:
   tag=conn summary="Connecting to a relay"
  [New in 0.4.0.x; prior versions of Tor had a "conn_dir" phase that
   sometimes but not always corresponded to connecting to a directory server]
 
+  Tor is making its first connection to a relay. This might be through
+  a pluggable transport or proxy connection that Tor has already
+  established.
+
   Phase 10:
   tag=conn_done summary="Connected to a relay"
  [New in 0.4.0.x]
 
+  Tor has completed its first connection to a relay.
+
   Phase 14:
   tag=handshake summary="Handshaking with a relay"
  [New in 0.4.0.x; prior versions of Tor had a "handshake_dir" phase]
 
+  Tor is in the process of doing a TLS handshake with a relay.
+
   Phase 15:
   tag=handshake_done summary="Handshake with a relay done"
  [New in 0.4.0.x]
 
+  Tor has completed its TLS handshake with a relay.
+
+5.5.3. Phases in Bootstrap Stage 2.
+
   Phase 20:
   tag=onehop_create summary="Establishing an encrypted directory connection"
  [prior to 0.4.0.x, this was numbered 15]
@@ -3541,8 +3601,9 @@
   phase until we have received a 'connected' relay cell in response to
   a request for descriptors.
 
- [Some versions of Tor (between 0.2.6.2-alpha and 0.4.0.x):
-  Tor could report having internal paths only; see Section 5.6]
+ [Some versions of Tor (starting with 0.2.6.2-alpha but before
+  0.4.0.x): Tor could report having internal paths only; see Section
+  5.6]
 
   Phase 50:
   tag=loading_descriptors summary="Loading relay descriptors"
@@ -3556,8 +3617,9 @@
   This phase is also a good opportunity to use the "progress" keyword to
   indicate partial

[tor-commits] [tor/master] Fix shellcheck warning in fuzz_static_testcases.sh

2019-02-25 Thread nickm 
commit daff9e1ba11bdf1d6fe55eeeda45dd4bb2918874
Author: rl1987 
Date:   Sat Feb 2 17:14:49 2019 +0200

Fix shellcheck warning in fuzz_static_testcases.sh
---
 changes/ticket29059   | 3 +++
 src/test/fuzz_static_testcases.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/ticket29059 b/changes/ticket29059
new file mode 100644
index 0..d47d0e2a3
--- /dev/null
+++ b/changes/ticket29059
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring (shell scripts):
+- Fix shellcheck warnings in fuzz_static_testcases.sh. Resolves ticket
+  29059.
diff --git a/src/test/fuzz_static_testcases.sh 
b/src/test/fuzz_static_testcases.sh
index f7b3adffb..b88335240 100755
--- a/src/test/fuzz_static_testcases.sh
+++ b/src/test/fuzz_static_testcases.sh
@@ -14,7 +14,7 @@ fi
 
 
 for fuzzer in "${builddir:-.}"/src/test/fuzz/fuzz-* ; do
-f=`basename $fuzzer`
+f=$(basename "$fuzzer")
 case="${f#fuzz-}"
 if [ -d "${TOR_FUZZ_CORPORA}/${case}" ]; then
 echo "Running tests for ${case}"



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/684'

2019-02-25 Thread nickm 
commit 626e6d2c394673ca46a44616a76b33699d0cf763
Merge: 69238ca2d daff9e1ba
Author: Nick Mathewson 
Date:   Mon Feb 25 13:33:39 2019 -0500

Merge remote-tracking branch 'tor-github/pr/684'

 changes/ticket29059   | 3 +++
 src/test/fuzz_static_testcases.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Zoom in Isa's photo

2019-02-25 Thread atagar 
commit 6aa1be93ed625b4640d2eea85e11347e0bbfe626
Author: Damian Johnson 
Date:   Mon Feb 25 09:49:25 2019 -0800

Zoom in Isa's photo

Rescaled image per Isa's request.
---
 images/people/isabela.png | Bin 46938 -> 42779 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/people/isabela.png b/images/people/isabela.png
index 924f6b41..dff43ffc 100644
Binary files a/images/people/isabela.png and b/images/people/isabela.png differ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Correct Gunner's description

2019-02-25 Thread atagar 
commit 5f69d8e9a9e682519f2674ebce3c64e22b215001
Author: Damian Johnson 
Date:   Mon Feb 25 09:41:00 2019 -0800

Correct Gunner's description

Part of the description is no longer up to date.
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 43388fa4..5f8634e1 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -67,7 +67,7 @@
   
   Allen Gunn
   IRC: gunner
-  https://aspirationtech.org/about/people/gunner;>Executive Director of 
Aspiration, where he works with NGOs, activists, and human rights groups. 
Meeting facilitator and member of Tor's Community Council.
+  https://aspirationtech.org/about/people/gunner;>Executive Director of 
Aspiration, where he works with NGOs, activists, and human rights 
groups.
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2019-02-25 Thread translation 
commit e452b4b7da31758f60597a6cd680ed4f73e8fb8d
Author: Translation commit bot 
Date:   Mon Feb 25 17:16:04 2019 +

Update translations for liveusb-creator_completed
---
 es_AR/es_AR.po | 109 -
 1 file changed, 61 insertions(+), 48 deletions(-)

diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index a53ebc12c..83c464933 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -13,14 +13,14 @@
 # Pablo Di Noto , 2016
 # psss , 2016
 # sbosio , 2014
-# Zuhualime Akoochimoya, 2018
+# Zuhualime Akoochimoya, 2018-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-20 12:34+0200\n"
-"PO-Revision-Date: 2018-10-24 17:12+\n"
-"Last-Translator: Joaquín Serna\n"
+"POT-Creation-Date: 2019-02-24 07:24+0100\n"
+"PO-Revision-Date: 2019-02-25 17:13+\n"
+"Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -305,73 +305,86 @@ msgstr "¡Instalación completa! (%s)"
 msgid "Tails installation failed!"
 msgstr "¡Falló la instalación de Tails!"
 
-#: ../tails_installer/gui.py:361
+#: ../tails_installer/gui.py:369
 msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the \"Run this program as an administrator\" box."
 msgstr "Advertencia: Esta herramienta necesita ser ejecutada como 
Administrador. Para hacer esto, haga clic derecho sobre el icono, y abra las 
Propiedades. En la pestaña Compatibilidad, marque el recuadro \"Ejecutar este 
programa como un administrador\"."
 
-#: ../tails_installer/gui.py:373
+#: ../tails_installer/gui.py:381
 msgid "Tails Installer"
 msgstr "Instalador de Tails"
 
-#: ../tails_installer/gui.py:423 ../data/tails-installer.ui.h:2
+#: ../tails_installer/gui.py:441
+msgid "Tails Installer is deprecated in Debian"
+msgstr "El Instalador Tails está fuera de uso en Debian"
+
+#: ../tails_installer/gui.py:443
+msgid ""
+"To install Tails from scratch, use GNOME Disks instead.\n"
+"See the 
installation instructions\n"
+"\n"
+"To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from 
Debian using a second USB stick.\n"
+"See the manual 
upgrade instructions"
+msgstr "Para instalar Tails desde cero, usar en vez los discos de GNOME.\nMirá las 
instrucciones de instalación\n\nPara actualizar Tails, hacé una 
actualización automática desde Tails o una manual desde Debian usando otro 
pendrive.\nMirá las 
instrucciones de instalación manual"
+
+#: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"
 msgstr "Clonar el Tails actual"
 
-#: ../tails_installer/gui.py:430 ../data/tails-installer.ui.h:3
+#: ../tails_installer/gui.py:457 ../data/tails-installer.ui.h:3
 msgid "Use a downloaded Tails ISO image"
 msgstr "Usar una imagen ISO de Tails ya descargada"
 
-#: ../tails_installer/gui.py:467 ../tails_installer/gui.py:788
+#: ../tails_installer/gui.py:494 ../tails_installer/gui.py:815
 msgid "Upgrade"
 msgstr "Actualizar"
 
-#: ../tails_installer/gui.py:469
+#: ../tails_installer/gui.py:496
 msgid "Manual Upgrade Instructions"
 msgstr "Instrucciones para actualización manual"
 
-#: ../tails_installer/gui.py:471
+#: ../tails_installer/gui.py:498
 msgid "https://tails.boum.org/upgrade/;
 msgstr "https://tails.boum.org/upgrade/;
 
-#: ../tails_installer/gui.py:479 ../tails_installer/gui.py:700
-#: ../tails_installer/gui.py:765 ../data/tails-installer.ui.h:7
+#: ../tails_installer/gui.py:506 ../tails_installer/gui.py:727
+#: ../tails_installer/gui.py:792 ../data/tails-installer.ui.h:7
 msgid "Install"
 msgstr "Instalar"
 
-#: ../tails_installer/gui.py:482 ../data/tails-installer.ui.h:1
+#: ../tails_installer/gui.py:509 ../data/tails-installer.ui.h:1
 msgid "Installation Instructions"
 msgstr "Instrucciones de instalación"
 
-#: ../tails_installer/gui.py:484
+#: ../tails_installer/gui.py:511
 msgid "https://tails.boum.org/install/;
 msgstr "https://tails.boum.org/install/;
 
-#: ../tails_installer/gui.py:490
+#: ../tails_installer/gui.py:517
 #, python-format
 msgid "%(size)s %(vendor)s %(model)s device (%(device)s)"
 msgstr "%(size)s%(vendor)s%(model)sdispositivo(%(device)s)"
 
-#: ../tails_installer/gui.py:502
+#: ../tails_installer/gui.py:529
 msgid "No ISO image selected"
 msgstr "No se seleccionó imagen ISO"
 
-#: ../tails_installer/gui.py:503
+#: ../tails_installer/gui.py:530
 msgid "Please select a Tails ISO image."
 msgstr "Por favor seleccione una imagen ISO de Tails"
 
-#: ../tails_installer/gui.py:545
+#: ../tails_installer/gui.py:572
 msgid "No device suitable to install Tails could be found"
 msgstr "No pudo ser encontrado ningún dispositivo adecuado para instalar 
Tails"
 
-#: ../tails_installer/gui.py:547
+#:

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2019-02-25 Thread translation 
commit 99fd818f8894d1d4b00819b06c5410377bb79a7e
Author: Translation commit bot 
Date:   Mon Feb 25 17:15:57 2019 +

Update translations for liveusb-creator
---
 es_AR/es_AR.po | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 086074f5d..83c464933 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-23 13:30+0100\n"
-"PO-Revision-Date: 2019-02-23 13:05+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2019-02-24 07:24+0100\n"
+"PO-Revision-Date: 2019-02-25 17:13+\n"
+"Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -318,7 +318,7 @@ msgstr "Instalador de Tails"
 
 #: ../tails_installer/gui.py:441
 msgid "Tails Installer is deprecated in Debian"
-msgstr ""
+msgstr "El Instalador Tails está fuera de uso en Debian"
 
 #: ../tails_installer/gui.py:443
 msgid ""
@@ -327,7 +327,7 @@ msgid ""
 "\n"
 "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from 
Debian using a second USB stick.\n"
 "See the manual 
upgrade instructions"
-msgstr ""
+msgstr "Para instalar Tails desde cero, usar en vez los discos de GNOME.\nMirá las 
instrucciones de instalación\n\nPara actualizar Tails, hacé una 
actualización automática desde Tails o una manual desde Debian usando otro 
pendrive.\nMirá las 
instrucciones de instalación manual"
 
 #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"
@@ -488,16 +488,16 @@ msgstr "Imposible usar el archivo seleccionado. Quizás 
tenga mejor suerte si mu
 msgid "%(filename)s selected"
 msgstr "%(filename)s seleccionado"
 
-#: ../tails_installer/source.py:28
+#: ../tails_installer/source.py:29
 msgid "Unable to find LiveOS on ISO"
 msgstr "Incapaz de encontrar LiveOS en ISO"
 
-#: ../tails_installer/source.py:34
+#: ../tails_installer/source.py:35
 #, python-format
 msgid "Could not guess underlying block device: %s"
 msgstr "No se pudo suponer cual es el dispositivo de bloque subyacente: %s"
 
-#: ../tails_installer/source.py:49
+#: ../tails_installer/source.py:50
 #, python-format
 msgid ""
 "There was a problem executing `%s`.\n"
@@ -505,29 +505,29 @@ msgid ""
 "%s"
 msgstr "Hubo un problema ejecutando `%s`.\n%s\n%s"
 
-#: ../tails_installer/source.py:63
+#: ../tails_installer/source.py:64
 #, python-format
 msgid "'%s' does not exist"
 msgstr "'%s' no existe"
 
-#: ../tails_installer/source.py:65
+#: ../tails_installer/source.py:66
 #, python-format
 msgid "'%s' is not a directory"
 msgstr "'%s' no es una carpeta"
 
-#: ../tails_installer/source.py:75
+#: ../tails_installer/source.py:76
 #, python-format
 msgid "Skipping '%(filename)s'"
 msgstr "Omitiendo '%(filename)s'"
 
-#: ../tails_installer/utils.py:44
+#: ../tails_installer/utils.py:55
 #, python-format
 msgid ""
 "There was a problem executing `%s`.%s\n"
 "%s"
 msgstr "Hubo un problema ejecutando `%s`.%s\n%s"
 
-#: ../tails_installer/utils.py:124
+#: ../tails_installer/utils.py:135
 msgid "Could not open device for writing."
 msgstr "No se pudo abrir el dispositivo para la escritura."
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] globals, stem: explain where torrc options are

2019-02-25 Thread juga 
commit 506a3f12c23655e233f745940d2e7f8fdeb19948
Author: juga0 
Date:   Sat Dec 1 18:45:24 2018 +

globals, stem: explain where torrc options are

Fixes bug #28646. Bugfix v0.4.0
---
 sbws/globals.py   | 2 ++
 sbws/util/stem.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/sbws/globals.py b/sbws/globals.py
index 2acecc7..3406438 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -10,6 +10,8 @@ SPEC_VERSION = '1.2.0'
 
 # This is a dictionary of torrc options we always want to set when launching
 # Tor and that do not depend on any runtime configuration
+# Options that are known at runtime (from configuration file) are added
+# in utils/stem.py launch_tor
 TORRC_STARTING_POINT = {
 # We will find out via the ControlPort and not setting something static
 # means a lower chance of conflict
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 232be2a..09b978d 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -125,6 +125,7 @@ def launch_tor(conf):
 # Bare minimum things, more or less
 torrc = copy.deepcopy(TORRC_STARTING_POINT)
 # Very important and/or common settings that we don't know until runtime
+# The rest of the settings are in globals.py
 torrc.update({
 'DataDirectory': conf.getpath('tor', 'datadir'),
 'PidFile': conf.getpath('tor', 'pid'),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Merge branch 'bug28646'

2019-02-25 Thread juga 
commit cacbea7122cbb5c2bd559659c4017265232fcabd
Merge: 2bcdef1 506a3f1
Author: juga0 
Date:   Mon Feb 25 16:57:55 2019 +

Merge branch 'bug28646'

 sbws/globals.py   | 2 ++
 sbws/util/stem.py | 1 +
 2 files changed, 3 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] stem: log stem's exceptions setting runtime torrc

2019-02-25 Thread juga 
commit 6c8639d2cc0517c82882296b4693fec46f14c402
Author: juga0 
Date:   Fri Dec 7 10:28:03 2018 +

stem: log stem's exceptions setting runtime torrc

The log message might not correspond to the reason.
Only the first one that fails will be logged, but not refactoring
here.
Add an integration test to check a runtime option fails.
---
 sbws/util/stem.py   | 8 
 tests/integration/util/test_stem.py | 8 
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index ead812b..359e020 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -173,10 +173,10 @@ def set_torrc_runtime_options(controller):
 """Set torrc options at runtime."""
 try:
 controller.set_options(TORRC_RUNTIME_OPTIONS)
-except (ControllerError, InvalidArguments, InvalidRequest) as e:
-log.exception("Error trying to launch tor: %s. "
-  "Maybe the tor directory is being used by other "
-  "sbws instance?", e)
+# Only the first option that fails will be logged here.
+# Just log stem's exceptions.
+except (ControllerError, InvalidRequest, InvalidArguments) as e:
+log.exception(e)
 exit(1)
 
 def launch_tor(conf):
diff --git a/tests/integration/util/test_stem.py 
b/tests/integration/util/test_stem.py
index 33fee81..51a425a 100644
--- a/tests/integration/util/test_stem.py
+++ b/tests/integration/util/test_stem.py
@@ -10,3 +10,11 @@ def 
test_set_torrc_runtime_option_succesful(persistent_launch_tor):
 controller = persistent_launch_tor
 runtime_options = controller.get_conf_map(['__LeaveStreamsUnattached'])
 assert runtime_options == {'__LeaveStreamsUnattached': ['1']}
+
+
+def test_set_torrc_runtime_invalidrequest_option_fail(persistent_launch_tor):
+controller = persistent_launch_tor
+try:
+controller.set_conf('ControlSocket', '/tmp/dummy')
+except stem_utils.InvalidRequest as e:
+assert "Unable to set option" in e.message



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] stem: disable pad connections

2019-02-25 Thread juga 
commit 2bcdef17a8629216f43353618837059251b60b8b
Author: juga0 
Date:   Fri Dec 14 22:42:59 2018 +

stem: disable pad connections

and create function to set options that can fail because they are
not supported by some Tor versions at runtime.

Fixes bug 28692. Bugfix v0.4.0
---
 sbws/globals.py | 16 +++-
 sbws/util/stem.py   | 23 +--
 tests/integration/util/test_stem.py |  8 
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/sbws/globals.py b/sbws/globals.py
index c6adc44..8c66b79 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -8,6 +8,9 @@ from stem import __version__ as stem_version
 from sbws import __version__
 
 
+from collections import OrderedDict
+
+
 log = logging.getLogger(__name__)
 
 RESULT_VERSION = 4
@@ -32,11 +35,22 @@ TORRC_STARTING_POINT = {
 'LogTimeGranularity': '1',
 'ProtocolWarnings': '1',
 }
-
+# Options that need to be set at runtime.
 TORRC_RUNTIME_OPTIONS = {
+# The scanner builds the circuits to download the data itself,
+# so do not let Tor to build them.
 '__DisablePredictedCircuits': '1',
+# The scanner attach the streams to the circuit itself,
+# so do not let Tor to attache them.
 '__LeaveStreamsUnattached': '1',
 }
+# Options that can be set at runtime and can fail with some Tor versions
+# The ones that fail will be ignored..
+TORRC_OPTIONS_CAN_FAIL = OrderedDict({
+# Since currently scanner anonymity is not the goal, ConnectionPadding
+# is disable to do not send extra traffic
+'ConnectionPadding': '0'
+})
 
 PKG_DIR = os.path.abspath(os.path.dirname(__file__))
 DEFAULT_CONFIG_PATH = os.path.join(PKG_DIR, 'config.default.ini')
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 359e020..6eb37e2 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -12,7 +12,8 @@ import copy
 import logging
 import os
 from sbws.globals import fail_hard
-from sbws.globals import TORRC_STARTING_POINT, TORRC_RUNTIME_OPTIONS
+from sbws.globals import (TORRC_STARTING_POINT, TORRC_RUNTIME_OPTIONS,
+  TORRC_OPTIONS_CAN_FAIL)
 
 log = logging.getLogger(__name__)
 stream_building_lock = RLock()
@@ -179,6 +180,22 @@ def set_torrc_runtime_options(controller):
 log.exception(e)
 exit(1)
 
+
+def set_torrc_options_can_fail(controller):
+"""Set options that can fail, at runtime.
+
+They can be set at launch, but since the may fail because they are not
+supported in some Tor versions, it's easier to try one by one at runtime
+and ignore the ones that fail.
+"""
+for k, v in TORRC_OPTIONS_CAN_FAIL.items():
+try:
+controller.set_conf(k, v)
+except InvalidArguments as error:
+log.debug('Ignoring option not supported by this Tor version. %s',
+  error)
+
+
 def launch_tor(conf):
 assert isinstance(conf, ConfigParser)
 os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True)
@@ -211,7 +228,9 @@ def launch_tor(conf):
 fail_hard('Error trying to launch tor: %s', e)
 # And return a controller to it
 cont = _init_controller_socket(conf.getpath('tor', 'control_socket'))
-
+# Set options that can fail at runtime
+set_torrc_options_can_fail(cont)
+# Set runtime options
 set_torrc_runtime_options(cont)
 
 log.info('Started and connected to Tor %s via %s', cont.get_version(),
diff --git a/tests/integration/util/test_stem.py 
b/tests/integration/util/test_stem.py
index 51a425a..e5492d6 100644
--- a/tests/integration/util/test_stem.py
+++ b/tests/integration/util/test_stem.py
@@ -18,3 +18,11 @@ def 
test_set_torrc_runtime_invalidrequest_option_fail(persistent_launch_tor):
 controller.set_conf('ControlSocket', '/tmp/dummy')
 except stem_utils.InvalidRequest as e:
 assert "Unable to set option" in e.message
+
+
+def test_set_torrc_options_can_fail_option_fail(persistent_launch_tor):
+controller = persistent_launch_tor
+try:
+controller.set_conf('BadOption', '0')
+except stem_utils.InvalidArguments as e:
+assert "Unknown option" in e.message

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] stem: refactor, move setting runtime torrc options

2019-02-25 Thread juga 
commit 1d836ec5b67fdac0f43de383267dc6ac28265cf8
Author: juga0 
Date:   Fri Dec 7 10:18:37 2018 +

stem: refactor, move setting runtime torrc options

to a function.
Replace comment by docstring.
Add an integration test to check the option is set.
---
 sbws/globals.py |  5 +
 sbws/util/stem.py   | 32 
 tests/integration/util/test_stem.py |  6 ++
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/sbws/globals.py b/sbws/globals.py
index 60e56f5..c6adc44 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -33,6 +33,11 @@ TORRC_STARTING_POINT = {
 'ProtocolWarnings': '1',
 }
 
+TORRC_RUNTIME_OPTIONS = {
+'__DisablePredictedCircuits': '1',
+'__LeaveStreamsUnattached': '1',
+}
+
 PKG_DIR = os.path.abspath(os.path.dirname(__file__))
 DEFAULT_CONFIG_PATH = os.path.join(PKG_DIR, 'config.default.ini')
 DEFAULT_LOG_CONFIG_PATH = os.path.join(PKG_DIR, 'config.log.default.ini')
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 9b3dc0d..ead812b 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -12,7 +12,7 @@ import copy
 import logging
 import os
 from sbws.globals import fail_hard
-from sbws.globals import TORRC_STARTING_POINT
+from sbws.globals import TORRC_STARTING_POINT, TORRC_RUNTIME_OPTIONS
 
 log = logging.getLogger(__name__)
 stream_building_lock = RLock()
@@ -74,8 +74,12 @@ def init_controller(port=None, path=None, 
set_custom_stream_settings=True):
 return None, 'Unable to reach tor on control socket'
 assert c is not None
 if set_custom_stream_settings:
-c.set_conf('__DisablePredictedCircuits', '1')
-c.set_conf('__LeaveStreamsUnattached', '1')
+# These options are also set in launch_tor.
+# In a future refactor they could be set in the case they are not
+# already in the running instance. This way the controller_port
+# could also be used.
+set_torrc_options_can_fail(c)
+set_torrc_runtime_options(c)
 return c, ''
 
 
@@ -165,6 +169,16 @@ def parse_user_torrc_config(torrc, torrc_text):
 return torrc_dict
 
 
+def set_torrc_runtime_options(controller):
+"""Set torrc options at runtime."""
+try:
+controller.set_options(TORRC_RUNTIME_OPTIONS)
+except (ControllerError, InvalidArguments, InvalidRequest) as e:
+log.exception("Error trying to launch tor: %s. "
+  "Maybe the tor directory is being used by other "
+  "sbws instance?", e)
+exit(1)
+
 def launch_tor(conf):
 assert isinstance(conf, ConfigParser)
 os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True)
@@ -197,15 +211,9 @@ def launch_tor(conf):
 fail_hard('Error trying to launch tor: %s', e)
 # And return a controller to it
 cont = _init_controller_socket(conf.getpath('tor', 'control_socket'))
-# Because we build things by hand and can't set these before Tor bootstraps
-try:
-cont.set_conf('__DisablePredictedCircuits', '1')
-cont.set_conf('__LeaveStreamsUnattached', '1')
-except (ControllerError, InvalidArguments, InvalidRequest) as e:
-log.exception("Error trying to launch tor: %s. "
-  "Maybe the tor directory is being used by other "
-  "sbws instance?", e)
-exit(1)
+
+set_torrc_runtime_options(cont)
+
 log.info('Started and connected to Tor %s via %s', cont.get_version(),
  conf.getpath('tor', 'control_socket'))
 return cont
diff --git a/tests/integration/util/test_stem.py 
b/tests/integration/util/test_stem.py
index 291f485..33fee81 100644
--- a/tests/integration/util/test_stem.py
+++ b/tests/integration/util/test_stem.py
@@ -4,3 +4,9 @@ import sbws.util.stem as stem_utils
 def test_launch_and_okay(persistent_launch_tor):
 cont = persistent_launch_tor
 assert stem_utils.is_bootstrapped(cont)
+
+
+def test_set_torrc_runtime_option_succesful(persistent_launch_tor):
+controller = persistent_launch_tor
+runtime_options = controller.get_conf_map(['__LeaveStreamsUnattached'])
+assert runtime_options == {'__LeaveStreamsUnattached': ['1']}



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bug 29579: Fix typo in projects/tor/build

2019-02-25 Thread gk 
commit 0403da4390f8891a5a082eb6c761cd8710f913ca
Author: Nicolas Vigier 
Date:   Mon Feb 25 15:45:13 2019 +0100

Bug 29579: Fix typo in projects/tor/build
---
 projects/tor/build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/tor/build b/projects/tor/build
index f063693..d6018d9 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -11,7 +11,7 @@ mkdir -p /var/tmp/build
 [% END %]
 
 [% IF c("var/osx") %]
-  [% IF ("var/nightly") %]
+  [% IF c("var/nightly") %]
 # We are compiling Tor with Rust enabled for nightlies.
 export TOR_RUST_TARGET=x86_64-apple-darwin
   [% END %]
@@ -33,7 +33,7 @@ libeventdir=/var/tmp/dist/libevent
 openssldir=/var/tmp/dist/openssl
 
 [% IF c("var/windows") %]
-  [% IF ("var/nightly") %]
+  [% IF c("var/nightly") %]
 # We are compiling Tor with Rust enabled for nightlies.
 export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu
   [% END %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2019-02-25 Thread translation 
commit dfea6f2a3c1e9744da32a287e3f7fb29c8e4dce9
Author: Translation commit bot 
Date:   Mon Feb 25 14:49:35 2019 +

Update translations for tor-launcher-properties
---
 id/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id/torlauncher.properties b/id/torlauncher.properties
index 287b2a87f..966c54b70 100644
--- a/id/torlauncher.properties
+++ b/id/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited_during_startup=Tor keluar ketika startup. Hal ini 
mungkin karena suatu kesalahan pada berkas torrc anda, bug pada Tor atau 
program lain pada sistem anda, atau kerusakan pada perangkat keras. Hingga anda 
memperbaiki masalah tersebut dan mulai ulang Tor, Tor Browser tidak akan 
dijalankan.
-torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam 
Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai 
anda memuat ulang Tor, Browser Tor tidak dapat mencapai situs web apapun. Jika 
masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada 
tim pendukung.
+torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam 
Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai 
anda memuat ulang Tor, Tor Browser tidak dapat mencapai situs web apapun. Jika 
masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada 
tim pendukung.
 torlauncher.tor_exited2=Memuat ulang Tor tidak akan menutup tab browser Anda.
 torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol 
Tor.
 torlauncher.tor_failed_to_start=Tor gagal untuk memulai.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2019-02-25 Thread translation 
commit 0d70ee9052b068c3797fed0d2d85b1b4f0f292fa
Author: Translation commit bot 
Date:   Mon Feb 25 14:19:22 2019 +

Update translations for torbutton-browseronboardingproperties
---
 id/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties
index 471a73b8a..f7b490870 100644
--- a/id/browserOnboarding.properties
+++ b/id/browserOnboarding.properties
@@ -12,7 +12,7 @@ onboarding.tour-tor-privacy.title=Menolak pelacak dan 
pengintai.
 onboarding.tour-tor-privacy.description=Peramban tor mengisolasi kuki dan 
menghapus riwayat peramban anda setelah ditutup. Modifikasi ini menjamin 
privasi dan keamanan telah terproteksi di dalam peramban. Klik 'Jaringan Tor' 
untuk pempelajari bagaimana kami melindungi anda pada level jaringan.
 onboarding.tour-tor-privacy.button=Go to Tor Network
 
-onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network=Jaringan Tor
 onboarding.tour-tor-network.title=Mengelilingi jaringan yang terdesentralisasi.
 onboarding.tour-tor-network.description=Peramban Tor menghubungkan Anda ke 
jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak 
seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu 
anda percaya untuk menikmati internet secara privat.
 onboarding.tour-tor-network.button=Go to Circuit Display

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

2019-02-25 Thread translation 
commit edc8ffe594b725218dd7b6cbc82d5e4ff840d69d
Author: Translation commit bot 
Date:   Mon Feb 25 14:17:23 2019 +

Update translations for tba-torbrowserstringsdtd
---
 id/android_strings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/id/android_strings.dtd b/id/android_strings.dtd
index 13c944615..c6fb6ba2c 100644
--- a/id/android_strings.dtd
+++ b/id/android_strings.dtd
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
 
@@ -17,9 +17,9 @@
 
 
 
-
+
 
 
-
+
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2019-02-25 Thread translation 
commit e51e384dca545c2bbdf6836bfae0f341e445a114
Author: Translation commit bot 
Date:   Mon Feb 25 13:16:06 2019 +

Update translations for liveusb-creator_completed
---
 fr/fr.po | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/fr/fr.po b/fr/fr.po
index fcc564239..d9025c331 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -30,9 +30,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-23 13:30+0100\n"
-"PO-Revision-Date: 2019-02-24 12:09+\n"
-"Last-Translator: Curtis Baltimore \n"
+"POT-Creation-Date: 2019-02-24 07:24+0100\n"
+"PO-Revision-Date: 2019-02-25 13:09+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -330,7 +330,7 @@ msgstr "Programme d’installation de Tails"
 
 #: ../tails_installer/gui.py:441
 msgid "Tails Installer is deprecated in Debian"
-msgstr "L'installateur Tails est déconseillé dans Debian"
+msgstr "Le programme d'installation de Tails est déconseillé dans Debian"
 
 #: ../tails_installer/gui.py:443
 msgid ""
@@ -339,7 +339,7 @@ msgid ""
 "\n"
 "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from 
Debian using a second USB stick.\n"
 "See the manual 
upgrade instructions"
-msgstr "Pour installer Tails à partir de zéro, utilisez plutôt des disques 
GNOME.\nVoir les 
instructions d'installation\n\nPour faire la mise-à-jour de Tails, faites 
une mise à jour automatique de Tails ou une mise à jour manuelle de Debian en 
utilisant une seconde USB stick.\nVoir les instructions de 
mise-à-jour dans le guide d'utilisation"
+msgstr "Pour installer Tails à partir de zéro, utilisez plutôt Disques de 
GNOME.\nVoir les 
instructions d’installation\n\nPour mettre Tails à niveau, effectuez une 
mise à niveau automatique dans Tails ou une mise à niveau manuelle dans 
Debian en utilisant une seconde clé USB.\nVoir les instructions de 
mise à niveau manuelle"
 
 #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"
@@ -500,16 +500,16 @@ msgstr "Impossible d’utiliser le fichier 
sélectionné.Il est possible que vou
 msgid "%(filename)s selected"
 msgstr "%(filename)s sélectionné"
 
-#: ../tails_installer/source.py:28
+#: ../tails_installer/source.py:29
 msgid "Unable to find LiveOS on ISO"
 msgstr "Impossible de trouver le SE autonome sur l’ISO"
 
-#: ../tails_installer/source.py:34
+#: ../tails_installer/source.py:35
 #, python-format
 msgid "Could not guess underlying block device: %s"
 msgstr "Impossible de deviner le périphérique de blocs sous-jacent : %s"
 
-#: ../tails_installer/source.py:49
+#: ../tails_installer/source.py:50
 #, python-format
 msgid ""
 "There was a problem executing `%s`.\n"
@@ -517,29 +517,29 @@ msgid ""
 "%s"
 msgstr "Un problème est survenu lors de l’exécution de `%s`.\n%s\n%s"
 
-#: ../tails_installer/source.py:63
+#: ../tails_installer/source.py:64
 #, python-format
 msgid "'%s' does not exist"
 msgstr "« %s » n’existe pas"
 
-#: ../tails_installer/source.py:65
+#: ../tails_installer/source.py:66
 #, python-format
 msgid "'%s' is not a directory"
 msgstr "« %s » n’est pas un répertoire"
 
-#: ../tails_installer/source.py:75
+#: ../tails_installer/source.py:76
 #, python-format
 msgid "Skipping '%(filename)s'"
 msgstr "'%(filename)s' est ignoré"
 
-#: ../tails_installer/utils.py:44
+#: ../tails_installer/utils.py:55
 #, python-format
 msgid ""
 "There was a problem executing `%s`.%s\n"
 "%s"
 msgstr "Un problème est survenu lors de l’exécution de `%s`.%s\n%s"
 
-#: ../tails_installer/utils.py:124
+#: ../tails_installer/utils.py:135
 msgid "Could not open device for writing."
 msgstr "Impossible d’ouvrir le périphérique en écriture."
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2019-02-25 Thread translation 
commit 2616829f3c4cab4ada2aeca39652f33f82e7cc7f
Author: Translation commit bot 
Date:   Mon Feb 25 13:15:58 2019 +

Update translations for liveusb-creator
---
 fr/fr.po | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/fr/fr.po b/fr/fr.po
index fcc564239..d9025c331 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -30,9 +30,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-23 13:30+0100\n"
-"PO-Revision-Date: 2019-02-24 12:09+\n"
-"Last-Translator: Curtis Baltimore \n"
+"POT-Creation-Date: 2019-02-24 07:24+0100\n"
+"PO-Revision-Date: 2019-02-25 13:09+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -330,7 +330,7 @@ msgstr "Programme d’installation de Tails"
 
 #: ../tails_installer/gui.py:441
 msgid "Tails Installer is deprecated in Debian"
-msgstr "L'installateur Tails est déconseillé dans Debian"
+msgstr "Le programme d'installation de Tails est déconseillé dans Debian"
 
 #: ../tails_installer/gui.py:443
 msgid ""
@@ -339,7 +339,7 @@ msgid ""
 "\n"
 "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from 
Debian using a second USB stick.\n"
 "See the manual 
upgrade instructions"
-msgstr "Pour installer Tails à partir de zéro, utilisez plutôt des disques 
GNOME.\nVoir les 
instructions d'installation\n\nPour faire la mise-à-jour de Tails, faites 
une mise à jour automatique de Tails ou une mise à jour manuelle de Debian en 
utilisant une seconde USB stick.\nVoir les instructions de 
mise-à-jour dans le guide d'utilisation"
+msgstr "Pour installer Tails à partir de zéro, utilisez plutôt Disques de 
GNOME.\nVoir les 
instructions d’installation\n\nPour mettre Tails à niveau, effectuez une 
mise à niveau automatique dans Tails ou une mise à niveau manuelle dans 
Debian en utilisant une seconde clé USB.\nVoir les instructions de 
mise à niveau manuelle"
 
 #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"
@@ -500,16 +500,16 @@ msgstr "Impossible d’utiliser le fichier 
sélectionné.Il est possible que vou
 msgid "%(filename)s selected"
 msgstr "%(filename)s sélectionné"
 
-#: ../tails_installer/source.py:28
+#: ../tails_installer/source.py:29
 msgid "Unable to find LiveOS on ISO"
 msgstr "Impossible de trouver le SE autonome sur l’ISO"
 
-#: ../tails_installer/source.py:34
+#: ../tails_installer/source.py:35
 #, python-format
 msgid "Could not guess underlying block device: %s"
 msgstr "Impossible de deviner le périphérique de blocs sous-jacent : %s"
 
-#: ../tails_installer/source.py:49
+#: ../tails_installer/source.py:50
 #, python-format
 msgid ""
 "There was a problem executing `%s`.\n"
@@ -517,29 +517,29 @@ msgid ""
 "%s"
 msgstr "Un problème est survenu lors de l’exécution de `%s`.\n%s\n%s"
 
-#: ../tails_installer/source.py:63
+#: ../tails_installer/source.py:64
 #, python-format
 msgid "'%s' does not exist"
 msgstr "« %s » n’existe pas"
 
-#: ../tails_installer/source.py:65
+#: ../tails_installer/source.py:66
 #, python-format
 msgid "'%s' is not a directory"
 msgstr "« %s » n’est pas un répertoire"
 
-#: ../tails_installer/source.py:75
+#: ../tails_installer/source.py:76
 #, python-format
 msgid "Skipping '%(filename)s'"
 msgstr "'%(filename)s' est ignoré"
 
-#: ../tails_installer/utils.py:44
+#: ../tails_installer/utils.py:55
 #, python-format
 msgid ""
 "There was a problem executing `%s`.%s\n"
 "%s"
 msgstr "Un problème est survenu lors de l’exécution de `%s`.%s\n%s"
 
-#: ../tails_installer/utils.py:124
+#: ../tails_installer/utils.py:135
 msgid "Could not open device for writing."
 msgstr "Impossible d’ouvrir le périphérique en écriture."
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits