February 2018 - tor-commits - lists.torproject.org

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit da186462e73a3b1d677d50badf39a259a597eb47 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:19:15 2018 +0000 Update translations for tails-openpgp-applet_completed --- fr/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/openpgp-applet.pot b/fr/openpgp-applet.pot index 9aed758e1..0eb921543 100644 --- a/fr/openpgp-applet.pot +++ b/fr/openpgp-applet.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: -# French language coordinator <french.coordinator(a)rbox.me>, 2017 +# French language coordinator <french.coordinator(a)rbox.me>, 2017-2018 # French language coordinator <french.coordinator(a)rbox.me>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015 # syl_, 2016 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-01-19 19:43+0000\n" +"PO-Revision-Date: 2018-02-20 16:13+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit 9eafe1d471f1782bbf56fd0d5212ad554da1b439 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:19:09 2018 +0000 Update translations for tails-openpgp-applet --- fr/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/openpgp-applet.pot b/fr/openpgp-applet.pot index 9aed758e1..0eb921543 100644 --- a/fr/openpgp-applet.pot +++ b/fr/openpgp-applet.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: -# French language coordinator <french.coordinator(a)rbox.me>, 2017 +# French language coordinator <french.coordinator(a)rbox.me>, 2017-2018 # French language coordinator <french.coordinator(a)rbox.me>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015 # syl_, 2016 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-01-19 19:43+0000\n" +"PO-Revision-Date: 2018-02-20 16:13+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit be9da7392626e494db11b18a763e0ed300a9ab29 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:15:16 2018 +0000 Update translations for bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index b55d32fa8..e227139ab 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -29,7 +29,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-13 19:50+0000\n" +"PO-Revision-Date: 2018-02-20 16:14+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit fa8fb03fc17507043446e0fc461328807c63e3fb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:15:06 2018 +0000 Update translations for bridgedb --- fr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index b55d32fa8..e227139ab 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -29,7 +29,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-13 19:50+0000\n" +"PO-Revision-Date: 2018-02-20 16:14+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit 61acbdb187ad01708b3ce328ed96f0a85cc6d9b6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 15:47:18 2018 +0000 Update translations for tails-misc_completed --- fr.po | 55 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/fr.po b/fr.po index a11950c7c..a705201e3 100644 --- a/fr.po +++ b/fr.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2018-02-16 18:36+0000\n" +"POT-Creation-Date: 2018-02-20 11:29+0100\n" +"PO-Revision-Date: 2018-02-20 15:30+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -117,24 +117,51 @@ msgstr "Informations de version :\n%s" msgid "not available" msgstr "non disponible" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:162 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:166 -msgid "Your additional software" -msgstr "Vos logiciels additionnels" +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +msgid "Your additional software installation failed" +msgstr "L’installation de vos logiciels supplémentaires a échoué" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:167 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 msgid "" -"The upgrade failed. This might be due to a network problem. Please check " -"your network connection, try to restart Tails, or read the system log to " -"understand better the problem." -msgstr "La mise à niveau a échouée. Cela peut être dû à un problème réseau. Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème." +"The installation failed. Please check your additional software " +"configuration, or read the system log to understand better the problem." +msgstr "L’installation a échoué. Veuillez vérifier la configuration de vos logiciels supplémentaires ou lire le journal système pour mieux comprendre le problème." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +msgid "Your additional software are installed" +msgstr "Vos logiciels supplémentaires sont installés" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:127 +msgid "Your additional software are ready to use." +msgstr "Vos logiciels supplémentaires sont prêts à être utilisés" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:138 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 +msgid "Your additional software upgrade failed" +msgstr "La mise à niveau de vos logiciels supplémentaires a échoué" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:139 +msgid "" +"The check for upgrades failed. This might be due to a network problem. " +"Please check your network connection, try to restart Tails, or read the " +"system log to understand better the problem." +msgstr "La vérification des mises à niveau a échoué. Cela peut être dû à un problème réseau. Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +msgid "Your additional software are up to date" +msgstr "Vos logiciels supplémentaires sont à jour" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:163 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154 msgid "The upgrade was successful." msgstr "La mise à niveau a été réalisée avec succès." +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:158 +msgid "" +"The upgrade failed. This might be due to a network problem. Please check " +"your network connection, try to restart Tails, or read the system log to " +"understand better the problem." +msgstr "La mise à niveau a échoué. Cela peut être dû à un problème réseau. Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème." + #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "Synchronisation de l’horloge système"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit e1041329cc49fb2c63d96ace301cf92d5728a3c1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 15:47:12 2018 +0000 Update translations for tails-misc --- fr.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fr.po b/fr.po index f1d9c5427..a705201e3 100644 --- a/fr.po +++ b/fr.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-20 11:29+0100\n" -"PO-Revision-Date: 2018-02-20 14:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-02-20 15:30+0000\n" +"Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\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" @@ -119,37 +119,37 @@ msgstr "non disponible" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 msgid "Your additional software installation failed" -msgstr "" +msgstr "L’installation de vos logiciels supplémentaires a échoué" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 msgid "" "The installation failed. Please check your additional software " "configuration, or read the system log to understand better the problem." -msgstr "" +msgstr "L’installation a échoué. Veuillez vérifier la configuration de vos logiciels supplémentaires ou lire le journal système pour mieux comprendre le problème." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 msgid "Your additional software are installed" -msgstr "" +msgstr "Vos logiciels supplémentaires sont installés" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:127 msgid "Your additional software are ready to use." -msgstr "" +msgstr "Vos logiciels supplémentaires sont prêts à être utilisés" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:138 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 msgid "Your additional software upgrade failed" -msgstr "" +msgstr "La mise à niveau de vos logiciels supplémentaires a échoué" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:139 msgid "" "The check for upgrades failed. This might be due to a network problem. " "Please check your network connection, try to restart Tails, or read the " "system log to understand better the problem." -msgstr "" +msgstr "La vérification des mises à niveau a échoué. Cela peut être dû à un problème réseau. Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 msgid "Your additional software are up to date" -msgstr "" +msgstr "Vos logiciels supplémentaires sont à jour" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154 msgid "The upgrade was successful." @@ -160,7 +160,7 @@ msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." -msgstr "La mise à niveau a échouée. Cela peut être dû à un problème réseau. Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème." +msgstr "La mise à niveau a échoué. Cela peut être dû à un problème réseau. Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock"

1 0

[tor/master] Remove a bunch of other redundant #includes
by nickm＠torproject.org 20 Feb '18

20 Feb '18

commit 4438ef3288256e1f1ba706c157206a2ac190781d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 20 10:14:15 2018 -0500 Remove a bunch of other redundant #includes Folks have found two in the past week or so; we may as well fix the others. Found with: \#!/usr/bin/python3 import re def findMulti(fname): includes = set() with open(fname) as f: for line in f: m = re.match(r'^\s*#\s*include\s+["<](\S+)[>"]', line) if m: inc = m.group(1) if inc in includes: print("{}: {}".format(fname, inc)) includes.add(m.group(1)) import sys for fname in sys.argv[1:]: findMulti(fname) --- src/common/buffers.h | 1 - src/common/compat.c | 1 - src/common/compat_winthreads.c | 1 - src/or/circuituse.c | 1 - src/or/hs_client.c | 2 -- src/or/hs_common.c | 1 - src/or/hs_intropoint.c | 1 - src/or/hs_service.c | 1 - src/or/rephist.c | 1 - src/or/status.c | 1 - src/test/test_address.c | 6 ++++-- src/test/test_config.c | 4 ---- src/test/test_dir_handle_get.c | 1 - src/test/test_helpers.c | 1 - src/test/test_hs_intropoint.c | 1 - src/test/testing_common.c | 2 -- src/tools/tor-gencert.c | 1 - 17 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/common/buffers.h b/src/common/buffers.h index 22a5f7bfa..4275152de 100644 --- a/src/common/buffers.h +++ b/src/common/buffers.h @@ -13,7 +13,6 @@ #define TOR_BUFFERS_H #include "compat.h" -#include "compat.h" #include "torint.h" #include "testsupport.h" diff --git a/src/common/compat.c b/src/common/compat.c index 831813c1c..e8916c8d1 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -100,7 +100,6 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt) /* Only use the linux prctl; the IRIX prctl is totally different */ #include <sys/prctl.h> #elif defined(__APPLE__) -#include <sys/types.h> #include <sys/ptrace.h> #endif /* defined(HAVE_SYS_PRCTL_H) && defined(__linux__) || ... */ diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c index 5f7ec94c2..7021344f6 100644 --- a/src/common/compat_winthreads.c +++ b/src/common/compat_winthreads.c @@ -18,7 +18,6 @@ #include "util.h" #include "container.h" #include "torlog.h" -#include <process.h> /* This value is more or less total cargo-cult */ #define SPIN_COUNT 2000 diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 13bd84e65..8d388cc2c 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -55,7 +55,6 @@ #include "rephist.h" #include "router.h" #include "routerlist.h" -#include "config.h" static void circuit_expire_old_circuits_clientside(void); static void circuit_increment_failure_count(void); diff --git a/src/or/hs_client.c b/src/or/hs_client.c index d3d13723e..20963cd45 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -17,7 +17,6 @@ #include "hs_descriptor.h" #include "hs_cache.h" #include "hs_cell.h" -#include "hs_ident.h" #include "config.h" #include "directory.h" #include "hs_client.h" @@ -29,7 +28,6 @@ #include "connection.h" #include "nodelist.h" #include "circpathbias.h" -#include "connection.h" #include "hs_ntor.h" #include "circuitbuild.h" #include "networkstatus.h" diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 6d97c8775..aa34b0e8f 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -28,7 +28,6 @@ #include "rendservice.h" #include "routerset.h" #include "router.h" -#include "routerset.h" #include "shared_random.h" #include "shared_random_state.h" diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 8c6453e6f..3274e8e9c 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -12,7 +12,6 @@ #include "config.h" #include "circuitlist.h" #include "circuituse.h" -#include "config.h" #include "relay.h" #include "rendmid.h" #include "rephist.h" diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 8ae00df48..220d3f515 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -31,7 +31,6 @@ #include "hs_common.h" #include "hs_config.h" #include "hs_control.h" -#include "hs_circuit.h" #include "hs_descriptor.h" #include "hs_ident.h" #include "hs_intropoint.h" diff --git a/src/or/rephist.c b/src/or/rephist.c index 43494692c..ac3e9f502 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -86,7 +86,6 @@ #include "ht.h" #include "channelpadding.h" -#include "channelpadding.h" #include "connection_or.h" static void bw_arrays_init(void); diff --git a/src/or/status.c b/src/or/status.c index 4f7be164b..4c497739e 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -25,7 +25,6 @@ #include "main.h" #include "rephist.h" #include "hibernate.h" -#include "rephist.h" #include "statefile.h" #include "hs_stats.h" #include "hs_service.h" diff --git a/src/test/test_address.c b/src/test/test_address.c index 9c88d37a4..0dd7b4033 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -11,8 +11,11 @@ #include <iphlpapi.h> #endif -#ifdef HAVE_IFADDRS_TO_SMARTLIST +#ifdef HAVE_NET_IF_H #include <net/if.h> +#endif + +#ifdef HAVE_IFADDRS_TO_SMARTLIST #include <ifaddrs.h> #endif @@ -20,7 +23,6 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#include <net/if.h> #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */ #include "or.h" diff --git a/src/test/test_config.c b/src/test/test_config.c index d42335de3..3729c8aab 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -20,7 +20,6 @@ #include "connection_edge.h" #include "test.h" #include "util.h" -#include "address.h" #include "connection_or.h" #include "control.h" #include "cpuworker.h" @@ -42,9 +41,6 @@ #include "routerlist.h" #include "routerset.h" #include "statefile.h" -#include "test.h" -#include "transports.h" -#include "util.h" #include "test_helpers.h" diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index ca64dce5f..71faf70af 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -16,7 +16,6 @@ #include "directory.h" #include "test.h" #include "compress.h" -#include "connection.h" #include "rendcommon.h" #include "rendcache.h" #include "router.h" diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index 0da9cf64d..ab453d3bd 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -33,7 +33,6 @@ DISABLE_GCC_WARNING(overlength-strings) * at large. */ #endif #include "test_descriptors.inc" -#include "or.h" #include "circuitlist.h" #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS ENABLE_GCC_WARNING(overlength-strings) diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 55dfafbea..fe3236c33 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -14,7 +14,6 @@ #include "test.h" #include "log_test_helpers.h" #include "crypto.h" -#include "log_test_helpers.h" #include "or.h" #include "circuitlist.h" diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 52729147b..b9b36d96d 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -29,8 +29,6 @@ #include <dirent.h> #endif /* defined(_WIN32) */ -#include "or.h" - #ifdef USE_DMALLOC #include <dmalloc.h> #include "main.h" diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index fb7465c0e..0e7fc79e6 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -36,7 +36,6 @@ ENABLE_GCC_WARNING(redundant-decls) #include <assert.h> #endif -#include "compat.h" #include "util.h" #include "torlog.h" #include "crypto.h"

1 0

[tor/master] Merge remote-tracking branch 'fristonio/ticket-25261'
by nickm＠torproject.org 20 Feb '18

20 Feb '18

commit a4ab273a0dafdd85e8e9f204c6e3e092282d3620 Merge: 5199b9b33 355338331 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 20 10:03:52 2018 -0500 Merge remote-tracking branch 'fristonio/ticket-25261' changes/ticket25261 | 3 +++ src/or/connection.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] ticket 25261: Removed multiple includes of transports.h in connection.c
by nickm＠torproject.org 20 Feb '18

20 Feb '18

commit 35533833122942fe226b6bb6cadd6a39f7e050c4 Author: Deepesh Pathak <deepshpathak(a)gmail.com> Date: Thu Feb 15 22:28:34 2018 +0530 ticket 25261: Removed multiple includes of transports.h in connection.c --- changes/ticket25261 | 3 +++ src/or/connection.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket25261 b/changes/ticket25261 new file mode 100644 index 000000000..604a09d97 --- /dev/null +++ b/changes/ticket25261 @@ -0,0 +1,3 @@ + o Minor bugfix (Multiple includes): + - Fixed multiple includes of trasports.h in src/or/connection.c + Fixes bug 25261; bugfix on 0.2.5.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index fb87e5b05..7a1e1c5aa 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -101,7 +101,6 @@ #include "transports.h" #include "routerparse.h" #include "sandbox.h" -#include "transports.h" #ifdef HAVE_PWD_H #include <pwd.h>

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit 3b64f9b863a7719490043bd8877b7f8c8b2909fa Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 14:18:31 2018 +0000 Update translations for tails-misc_completed --- tails.pot | 53 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/tails.pot b/tails.pot index 85578ddff..68db0940e 100644 --- a/tails.pot +++ b/tails.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-19 18:35+0000\n" +"POT-Creation-Date: 2018-02-20 11:29+0100\n" +"PO-Revision-Date: 2018-02-20 14:06+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n" "MIME-Version: 1.0\n" @@ -100,24 +100,51 @@ msgstr "Build information:\n%s" msgid "not available" msgstr "not available" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:162 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:166 -msgid "Your additional software" -msgstr "Your additional software" +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +msgid "Your additional software installation failed" +msgstr "Your additional software installation failed" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:167 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 +msgid "" +"The installation failed. Please check your additional software " +"configuration, or read the system log to understand better the problem." +msgstr "The installation failed. Please check your additional software configuration, or read the system log to understand better the problem." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +msgid "Your additional software are installed" +msgstr "Your additional software are installed" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:127 +msgid "Your additional software are ready to use." +msgstr "Your additional software are ready to use." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:138 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 +msgid "Your additional software upgrade failed" +msgstr "Your additional software upgrade failed" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:139 +msgid "" +"The check for upgrades failed. This might be due to a network problem. " +"Please check your network connection, try to restart Tails, or read the " +"system log to understand better the problem." +msgstr "The check for upgrades failed. This might be due to a network problem. Please check your network connection, try to restart Tails, or read the system log to understand better the problem." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +msgid "Your additional software are up to date" +msgstr "Your additional software are up to date" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154 +msgid "The upgrade was successful." +msgstr "The upgrade was successful." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:158 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "The upgrade failed. This might be due to a network problem. Please check your network connection, try to restart Tails, or read the system log to understand better the problem." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:163 -msgid "The upgrade was successful." -msgstr "The upgrade was successful." - #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "Synchronizing the system's clock"

1 0