- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'weasel/bug18458'
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit c9899ee64008b63cb9867115ac684590dd50f902 Merge: 4b02af4 d8626d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 09:18:24 2016 -0400 Merge remote-tracking branch 'weasel/bug18458' changes/bug18458 | 9 +++++++++ doc/tor.1.txt | 3 +++ src/common/util.c | 8 ++++++-- src/common/util.h | 13 +++++++------ src/or/config.c | 16 ++++++++++++---- src/or/connection.c | 4 ++++ src/or/or.h | 1 + src/test/test_config.c | 7 +++++++ 8 files changed, 49 insertions(+), 12 deletions(-)

1 0

[tor/master] Fix log message: say RelaxDirModeCheck instead of StrictDirModes
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit d8626d34e59ceb1a71b23646b9c1c1f4fec88638 Author: Peter Palfrader <peter(a)palfrader.org> Date: Mon Mar 14 20:27:53 2016 +0100 Fix log message: say RelaxDirModeCheck instead of StrictDirModes --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 556d285..ea41ca8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6577,7 +6577,7 @@ parse_port_config(smartlist_t *out, if ( has_used_unix_socket_only_option && ! unix_socket_path) { log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " - "WorldWritable, or StrictDirModes, but it is not a unix socket.", portname); + "WorldWritable, or RelaxDirModeCheck, but it is not a unix socket.", portname); goto err; }

1 0

[tor/master] Add a changes file for #18458
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit 35644433511d210845ae9e101034059bbf839167 Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Mar 1 18:48:57 2016 +0100 Add a changes file for #18458 --- changes/bug18458 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changes/bug18458 b/changes/bug18458 new file mode 100644 index 0000000..59646ef --- /dev/null +++ b/changes/bug18458 @@ -0,0 +1,9 @@ + o Minor features: + - Since some operating systems do not consider the actual modes on a + UNIX domain socket itself, tor does not allow creating such a + socket in a directory that is group or world accessible if it is + supposed to be private. Likewise, it will not allow only group + accessible sockets in a world accessible directory. + However, on some operating systems this is unnecessary, so + add a per-socket option called RelaxDirModeCheck. + Fixes bug 18458. Patch by weasel.

1 0

[tor/master] First RelaxDirModeCheck implementation
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit 1ef7df551d8efc0a74536006c17bdaa3cbb0931d Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Mar 1 17:08:14 2016 +0100 First RelaxDirModeCheck implementation --- doc/tor.1.txt | 3 +++ src/common/util.c | 8 ++++++-- src/common/util.h | 13 +++++++------ src/or/config.c | 16 ++++++++++++---- src/or/connection.c | 4 ++++ src/or/or.h | 1 + src/test/test_config.c | 7 +++++++ 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d6a6852..a71b04f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -321,6 +321,9 @@ GENERAL OPTIONS **WorldWritable**;; Unix domain sockets only: makes the socket get created as world-writable. + **RelaxDirModeCheck**;; + Unix domain sockets only: Do not insist that the directory + that holds the socket be read-restricted. [[ControlListenAddress]] **ControlListenAddress** __IP__[:__PORT__]:: Bind the controller listener to this address. If you specify a port, bind diff --git a/src/common/util.c b/src/common/util.c index b435511..ce15d52 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2063,7 +2063,6 @@ check_private_dir(const char *dirname, cpd_check_t check, #ifndef _WIN32 int fd; - unsigned unwanted_bits = 0; const struct passwd *pw = NULL; uid_t running_uid; gid_t running_gid; @@ -2197,12 +2196,17 @@ check_private_dir(const char *dirname, cpd_check_t check, close(fd); return -1; } + unsigned unwanted_bits = 0; if (check & (CPD_GROUP_OK|CPD_GROUP_READ)) { unwanted_bits = 0027; } else { unwanted_bits = 0077; } - if ((st.st_mode & unwanted_bits) != 0) { + unsigned check_bits_filter = ~0; + if (check & CPD_RELAX_DIRMODE_CHECK) { + check_bits_filter = 0022; + } + if ((st.st_mode & unwanted_bits & check_bits_filter) != 0) { unsigned new_mode; if (check & CPD_CHECK_MODE_ONLY) { log_warn(LD_FS, "Permissions on directory %s are too permissive.", diff --git a/src/common/util.h b/src/common/util.h index 9657003..ebcf88b 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -357,12 +357,13 @@ file_status_t file_status(const char *filename); /** Possible behaviors for check_private_dir() on encountering a nonexistent * directory; see that function's documentation for details. */ typedef unsigned int cpd_check_t; -#define CPD_NONE 0 -#define CPD_CREATE 1 -#define CPD_CHECK 2 -#define CPD_GROUP_OK 4 -#define CPD_GROUP_READ 8 -#define CPD_CHECK_MODE_ONLY 16 +#define CPD_NONE 0 +#define CPD_CREATE (1u << 0) +#define CPD_CHECK (1u << 1) +#define CPD_GROUP_OK (1u << 2) +#define CPD_GROUP_READ (1u << 3) +#define CPD_CHECK_MODE_ONLY (1u << 4) +#define CPD_RELAX_DIRMODE_CHECK (1u << 5) int check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user); diff --git a/src/or/config.c b/src/or/config.c index 544b032..556d285 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6325,7 +6325,8 @@ parse_port_config(smartlist_t *out, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, cache_ipv4 = 1, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, - prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0; + prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0, + has_used_unix_socket_only_option = 0; smartlist_split_string(elts, ports->value, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); @@ -6478,9 +6479,15 @@ parse_port_config(smartlist_t *out, if (!strcasecmp(elt, "GroupWritable")) { group_writable = !no; + has_used_unix_socket_only_option = 1; continue; } else if (!strcasecmp(elt, "WorldWritable")) { world_writable = !no; + has_used_unix_socket_only_option = 1; + continue; + } else if (!strcasecmp(elt, "RelaxDirModeCheck")) { + relax_dirmode_check = !no; + has_used_unix_socket_only_option = 1; continue; } @@ -6568,9 +6575,9 @@ parse_port_config(smartlist_t *out, goto err; } - if ( (world_writable || group_writable) && ! unix_socket_path) { - log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable " - "or WorldWritable set, but it is not a unix socket.", portname); + if ( has_used_unix_socket_only_option && ! unix_socket_path) { + log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " + "WorldWritable, or StrictDirModes, but it is not a unix socket.", portname); goto err; } @@ -6596,6 +6603,7 @@ parse_port_config(smartlist_t *out, cfg->type = listener_type; cfg->is_world_writable = world_writable; cfg->is_group_writable = group_writable; + cfg->relax_dirmode_check = relax_dirmode_check; cfg->entry_cfg.isolation_flags = isolation; cfg->entry_cfg.session_group = sessiongroup; cfg->server_cfg.no_advertise = no_advertise; diff --git a/src/or/connection.c b/src/or/connection.c index 2e1c508..4e915f1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1014,6 +1014,10 @@ check_location_for_unix_socket(const or_options_t *options, const char *path, flags |= CPD_GROUP_OK; } + if (port->relax_dirmode_check) { + flags |= CPD_RELAX_DIRMODE_CHECK; + } + if (check_private_dir(p, flags, options->User) < 0) { char *escpath, *escdir; escpath = esc_for_log(path); diff --git a/src/or/or.h b/src/or/or.h index 4d145e4..4c295ab 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3456,6 +3456,7 @@ typedef struct port_cfg_t { unsigned is_group_writable : 1; unsigned is_world_writable : 1; + unsigned relax_dirmode_check : 1; entry_port_cfg_t entry_cfg; diff --git a/src/test/test_config.c b/src/test/test_config.c index b118481..6d9b491 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4038,6 +4038,13 @@ test_config_parse_port_config__ports__ports_given(void *data) "127.0.0.3", 0, 0); tt_int_op(ret, OP_EQ, -1); + // Test failure if we specify group writable for an IP Port + config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_port_invalid = mock_config_line("DNSPort", "42 RelaxDirModeCheck"); + ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", 0, + "127.0.0.3", 0, 0); + tt_int_op(ret, OP_EQ, -1); + // Test success with only a port (this will fail without a default address) config_free_lines(config_port_valid); config_port_valid = NULL; config_port_valid = mock_config_line("DNSPort", "42");

1 0

[tor-browser-spec/master] Bug 16444: Update audit process for Firefox ESR
by gk＠torproject.org 15 Mar '16

15 Mar '16

commit 5a5cf283b3a0da1ed547597b7dd768e7ad2d767c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 15 13:17:02 2016 +0000 Bug 16444: Update audit process for Firefox ESR The GENERAL document contains notes about a new procedure for reviewing new features in Firefox releases for the next ESR Tor Browser will be based on. The document is named GENERAL as we might want to describe other parts of the audit process at some point, too, making this a proper documentation of the audit process itself. --- audits/GENERAL | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/audits/GENERAL b/audits/GENERAL new file mode 100644 index 0000000..f72fd38 --- /dev/null +++ b/audits/GENERAL @@ -0,0 +1,34 @@ +Motivation +---------- + +Preparing the switch to a new Firefox ESR begins usually as soon as it lands on +Mozilla's beta or release channel. This means for us we have 12 to 18 weeks to +prepare a Tor Browser release based on it. This includes adapting our Gitian +setup, rebasing and testing our old patches, auditing the network code, +reviewing new features and modifying them to fit our needs, testing them in at +least one alpha release etc. + +While there are things that are tricky to do without additional overhead before +a new ESR got out, reviewing new features, prioritizing them and filing tickets +is not necessarily one of those. + +Feature review process +---------------------- + +To illustrate the workflow of the feature review process let's assume we just +got Tor Browser based on Firefox ESR 38 out of the door. Mozilla released +Firefox 40 meanwhile. One of the Tor Browser team members is catching up on the +Firefox for developers documentation for version 39 and 40 and is filing bugs +with the "ff45-esr" tag. Reviewing the developer documentation and filing +respective bugs is happening successively after Firefox 41-44 get out as well. +This procedure is covering the most important and most difficult to patch things +and should therefore be enough for the first pass. As a bonus point we might +even get hints about possible problems with code already in the ESR 38 series +this way which would allow us acting quicker in fixing those issues in our +stable series. + +When we finally start preparations for the switch to ESR 45 we basically have +all the ff45-esr tickets filed, and ideally prioritized, which are resulting +out of Firefox 39-44 reviews. The only remaining tasks for the feature review +are: taking care of ESR 45 and double-checking the undocumented bugs and the +ones with milestone Firefox39-45.

1 0

[translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 0769a6be3a13506d93e508a056f939fb603c41b5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:47:07 2016 +0000 Update translations for tor-messenger-privdtd_completed --- ca/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ca/priv.dtd b/ca/priv.dtd new file mode 100644 index 0000000..c91036b --- /dev/null +++ b/ca/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generant la clau privada"> +<!ENTITY privDialog.done "Fet"> \ No newline at end of file

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 6e719f2dbddc3107ac2403bfc43bd92119e18a6f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:47:03 2016 +0000 Update translations for tor-messenger-privdtd --- ca/priv.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/priv.dtd b/ca/priv.dtd index 0f9eb5e..c91036b 100644 --- a/ca/priv.dtd +++ b/ca/priv.dtd @@ -1,2 +1,2 @@ -<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.title "Generant la clau privada"> <!ENTITY privDialog.done "Fet"> \ No newline at end of file

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 9a025a869e4b89291a692209bf323b6b29345992 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:46:18 2016 +0000 Update translations for tails-perl5lib --- ca.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ca.po b/ca.po index 0465d92..0327e01 100644 --- a/ca.po +++ b/ca.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Carlos Marin <carlosmarinfernandez(a)gmail.com>, 2016 # laia_, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-25 16:59+0100\n" +"PO-Revision-Date: 2016-03-15 09:38+0000\n" +"Last-Translator: Carlos Marin <carlosmarinfernandez(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Error" #: ../lib/Tails/RunningSystem.pm:161 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 4858aad8261b4a7a4d0438afc95a49c770700f1e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:46:00 2016 +0000 Update translations for tails-misc --- ca.po | 82 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/ca.po b/ca.po index 1bd5edd..8159051 100644 --- a/ca.po +++ b/ca.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-25 17:49+0100\n" -"PO-Revision-Date: 2016-01-27 19:57+0000\n" +"POT-Creation-Date: 2016-03-07 18:07+0100\n" +"PO-Revision-Date: 2016-03-15 09:38+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" @@ -47,30 +47,30 @@ msgid "" "</p>\n" msgstr "<h1>Ajudeu-nos a arreglar aquest error!</h1>\n<p>Llegeix <a href=\"%s\">les nostres instruccions de comunicació d'errors</a>.</p>\n<p><strong>No incloeu més informació personal \nque la necessària!</strong></p>\n<h2>Sobre el fet de donar-nos una adreça de correu</h2>\n<p>\nDonar-nos una adreça de correu ens permet contactar amb vosaltres per aclarir el\nproblema. Això és necessari per la majoria d'informes que rebem, ja que la major part\nd'informes sense informació de contacte són inútils. D'altra banda, aquest fet també dóna\nuna oportunitat als espies o al vostre proveïdor d'internet per confirmar que esteu usant el Tails.\n</p> \n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "La Persistència ha estat deshabilitada per l'Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "Quan reinicieu el Tails, totes les dades de l'Electrum es perdran, inclòs el moneder de Bitcoins. És molt recomanable que només useu l'Electrum quan la seva propietat de persistència estigui activada. " -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "Voleu iniciar l'Electrum igualment?" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/bin/icedove:22 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Executa" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/bin/icedove:23 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Surt" @@ -231,11 +231,11 @@ msgstr "Sortida del GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Altres missatges entregats per GnuPG:" -#: config/chroot_local-includes/usr/local/bin/icedove:18 +#: config/chroot_local-includes/usr/local/bin/icedove:19 msgid "The <b>Claws Mail</b> persistence feature is activated." msgstr "" -#: config/chroot_local-includes/usr/local/bin/icedove:20 +#: config/chroot_local-includes/usr/local/bin/icedove:21 msgid "" "If you have emails saved in <b>Claws Mail</b>, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" @@ -316,40 +316,40 @@ msgstr "Aquesta versió de Tails té problemes de seguretat coneguts:" msgid "Known security issues" msgstr "Problemes de seguretat coneguts" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "La targeta de xarxa ${nic} està deshabilitada" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "El falsejament de la identitat de l'adreça MAC ha fallat per la targeta de xarxa ${nic_name} (${nic}) i està temporalment desactivada. \nPotser preferireu reiniciar el Tails i desactivar el falsejament de l'adreça MAC " -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "Totes les xarxes estan deshabilitades" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "El falsejament de la identitat de l'adreça MAC ha fallat per la targeta de xarxa ${nic_name} (${nic}). També ha fallat la recuperació d'errors i tot el treball en xarxa està desactivat.\nPotser preferireu reiniciar el Tails i desactivar el falsejament de l'adreça MAC " -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "Hi ha hagut un error:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "Error" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "<b>Not enough memory available to check for upgrades.</b>\n" "\n" @@ -388,52 +388,52 @@ msgstr "Tant el sistema operatiu instal·lat com el programari de virtualitzaci msgid "Learn more" msgstr "Apreneu-ne més" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "El Tor no està preparat" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "El Tor no està preparat. Voleu iniciar el navegador Tor igualment?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "Inicia el navegador Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "Cancel·la" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Segur que voleu executar el navegador insegur?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." msgstr "L'activitat de la xarxa amb el navegador insegur <b>no és anònima</b>. \\nUtilitzeu només el navegador insegur si és necessari, per exemple\\nsi heu d'iniciar sessió o registrar-vos per activar la connexió a internet. " -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "Iniciant el Navegador Insegur..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "Això pot trigar una estona, espereu." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "Apagant el Navegador Insegur" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Això pot tardar una estona, no reinicieu el navegador insegur fins que no s'hagi apagat correctament." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "Error al reiniciar Tor." @@ -472,40 +472,40 @@ msgstr "Error en configurar el navegador." msgid "Failed to run browser." msgstr "Error en executar el navegador." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "Error per iniciar I2P." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Hi ha hagut un error quan s'iniciava l' I2P. Reviseu els registres a /var/log/i2p per a més informació." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "La consola I2P està preparada" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "Ara podeu accedir a la consola I2P al navegador I2P" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "L'I2P no està preparada" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "El túnel Eepsite no s'ha construit en sis minuts. Reviseu la consola al navegador I2P o bé als registres a /var/log/i2p per a més informació. Torneu a connectar-vos a la xarxa per tornar-ho a provar. " -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "L'I2P està preparada" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "Podeu acedir a serveis a l'I2P."

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit ef257f07cc7600a3784ed699947a9f4f1a700ef0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:45:55 2016 +0000 Update translations for tor-launcher-network-settings --- ca/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd index e344598..d160434 100644 --- a/ca/network-settings.dtd +++ b/ca/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada o configurada amb un proxy. "> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "M'agradaria fer una connexió directa a la red Tor."> <!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> <!ENTITY torSettings.connect "Conectar">

1 0