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

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 24d446dfae543301e2635f2657c64942d118678b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 23:17:12 2018 +0000 Update translations for tor-and-https --- mk.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mk.po b/mk.po index 4d64ecd1a..563830cea 100644 --- a/mk.po +++ b/mk.po @@ -1,12 +1,13 @@ # # Translators: +# Liljana Ackovska <liljanagjurova(a)gmail.com>, 2018 # Zarko Gjurov <zarkogjurov(a)gmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2018-11-14 20:38+0000\n" -"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" +"PO-Revision-Date: 2018-11-15 23:12+0000\n" +"Last-Translator: Liljana Ackovska <liljanagjurova(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,7 +103,7 @@ msgstr "Полиција" #: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" -msgstr "NSA/УБК" +msgstr "УБК" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max.

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit b1739316c2d03f8ee740c604a8c6e294e5d9c090 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 22:48:00 2018 +0000 Update translations for tor-browser-manual_completed --- fr/fr.po | 28 +++++++++++++++------------- mk/mk.po | 14 +++++++------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 5e331287b..e037b1624 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -1558,16 +1558,16 @@ msgstr "" #: translate.page:47 msgid "On the next page, select 'Join an existing project' and continue." msgstr "" -"À la page suivante, sélectionnez « Rejoindre un projet existant » et " -"poursuivre." +"Sur la page suivante, sélectionnez « Se joindre à un projet existant » et " +"poursuivez." #: translate.page:52 msgid "" "On the next page, select the languages you speak from the drop-down menu and" " continue." msgstr "" -"À la page suivante, sélectionnez les langues que vous parlez à partir du " -"menu déroulant et poursuivre." +"Sur la page suivante, sélectionnez dans le menu déroulant les langues que " +"vous parlez et poursuivez." #: translate.page:58 msgid "" @@ -1575,13 +1575,15 @@ msgid "" "href=\"https://www.transifex.com/otf/torproject/\">Tor Transifex " "page</link>." msgstr "" -"Vous êtes maintenant inscrit ! Allez sur la <link " +"Vous êtes maintenant inscrit ! Rendez-vous sur la <link " "href=\"https://www.transifex.com/otf/torproject/\">page Transifex de " "Tor</link>." #: translate.page:64 msgid "Click the blue 'Join Team' button on the far right:" -msgstr "Cliquez sur le bouton bleu « Rejoindre l'équipe » à droite :" +msgstr "" +"Cliquez sur le bouton bleu « Se joindre à l’équipe » situé complètement à " +"droite :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1600,8 +1602,8 @@ msgstr "" msgid "" "Select the language you would like to translate from the dropdown menu:" msgstr "" -"Sélectionnez la langue à partir de laquelle vous souhaitez traduire dans le " -"menu déroulant :" +"Sélectionnez dans le menu déroulant la langue vers laquelle vous souhaitez " +"traduire :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1619,7 +1621,7 @@ msgstr "" #: translate.page:80 msgid "A notification will now show up on the top of the page like so:" msgstr "" -"Une notification apparaîtra maintenant en haut de la page comme ceci :" +"Une notification comme celle-ci apparaîtra maintenant en haut de la page :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1641,11 +1643,11 @@ msgid "" "Transifex page</link> when you are ready to begin. Thanks for your interest " "in helping the project!" msgstr "" -"Une fois que votre adhésion est approuvée, vous pouvez commencer à traduire;" -" retournez simplement à la <link " +"Une fois que votre adhésion sera approuvée, vous pourrez commencer à " +"traduire ; retournez simplement vers la <link " "href=\"https://www.transifex.com/otf/torproject/\">page Transifex de " -"Tor</link> lorsque vous êtes prêt à commencer. Merci de votre intérêt à " -"aider le projet !" +"Tor</link> quand vous serez prêt à commencer. Nous vous remercions de votre " +"intérêt à aider le projet !" #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" diff --git a/mk/mk.po b/mk/mk.po index cc0778d98..1e4c0b33d 100644 --- a/mk/mk.po +++ b/mk/mk.po @@ -1716,7 +1716,7 @@ msgid "" "Web Services; meek-azure makes it look like you are using a Microsoft web " "site; and meek-google makes it look like you are using Google search." msgstr "" -"Сите овие транспорти прават да изгледа дека вие прелистувате главна веб " +"Сите овие транспорти прават да изгледа дека вие прелистувате позната веб " "страна наместо дека користите Tor. meek-amazon прави да изгледа дека " "користите Amazon Web Services; meek-azure прави да изгледа дека користите " "Микрософт веб страна; и meek-google прави да изгледа дека користите Google " @@ -1724,15 +1724,15 @@ msgstr "" #: transports.page:100 msgid "Snowflake" -msgstr "Снегулка" +msgstr "Snowflake" #: transports.page:105 msgid "" "Snowflake is an improvement upon Flashproxy. It sends your traffic through " "WebRTC, a peer-to-peer protocol with built-in NAT punching." msgstr "" -"Снегулка е подобрување на Flashproxy. Таа го испраќа вашиот сообраќај преку " -"WebRTC, пеар-то-пеар протокол со вграден NET удирач." +"Snowflake е подобрување на Flashproxy. Таа го испраќа вашиот сообраќај преку" +" WebRTC, корисник-до-корисник протокол со вграден NET удирач." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" @@ -1765,8 +1765,8 @@ msgid "" "Your computer’s system clock must be set correctly, or Tor will not be able " "to connect." msgstr "" -"Часовникот на вашиот компјутерски систем мора да биде поставен точно, или " -"нема да може да се поврзе." +"Часовникот на вашиот компјутерски систем мора да биде точно поставен, или " +"Tor нема да може да се поврзе." #: troubleshooting.page:35 msgid "" @@ -1789,7 +1789,7 @@ msgstr "" #: troubleshooting.page:49 msgid "Temporarily disable your firewall." -msgstr "Привремено оневозможете го вашиот огнен ѕид." +msgstr "Привремено оневозможете го вашиот заштитен ѕид." #: troubleshooting.page:54 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 63eaacfd943d771f5597f4d1fa085bc47bbe5797 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 22:47:52 2018 +0000 Update translations for tor-browser-manual --- fr/fr.po | 28 +++++++++++++++------------- mk/mk.po | 14 +++++++------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 5e331287b..e037b1624 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -1558,16 +1558,16 @@ msgstr "" #: translate.page:47 msgid "On the next page, select 'Join an existing project' and continue." msgstr "" -"À la page suivante, sélectionnez « Rejoindre un projet existant » et " -"poursuivre." +"Sur la page suivante, sélectionnez « Se joindre à un projet existant » et " +"poursuivez." #: translate.page:52 msgid "" "On the next page, select the languages you speak from the drop-down menu and" " continue." msgstr "" -"À la page suivante, sélectionnez les langues que vous parlez à partir du " -"menu déroulant et poursuivre." +"Sur la page suivante, sélectionnez dans le menu déroulant les langues que " +"vous parlez et poursuivez." #: translate.page:58 msgid "" @@ -1575,13 +1575,15 @@ msgid "" "href=\"https://www.transifex.com/otf/torproject/\">Tor Transifex " "page</link>." msgstr "" -"Vous êtes maintenant inscrit ! Allez sur la <link " +"Vous êtes maintenant inscrit ! Rendez-vous sur la <link " "href=\"https://www.transifex.com/otf/torproject/\">page Transifex de " "Tor</link>." #: translate.page:64 msgid "Click the blue 'Join Team' button on the far right:" -msgstr "Cliquez sur le bouton bleu « Rejoindre l'équipe » à droite :" +msgstr "" +"Cliquez sur le bouton bleu « Se joindre à l’équipe » situé complètement à " +"droite :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1600,8 +1602,8 @@ msgstr "" msgid "" "Select the language you would like to translate from the dropdown menu:" msgstr "" -"Sélectionnez la langue à partir de laquelle vous souhaitez traduire dans le " -"menu déroulant :" +"Sélectionnez dans le menu déroulant la langue vers laquelle vous souhaitez " +"traduire :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1619,7 +1621,7 @@ msgstr "" #: translate.page:80 msgid "A notification will now show up on the top of the page like so:" msgstr "" -"Une notification apparaîtra maintenant en haut de la page comme ceci :" +"Une notification comme celle-ci apparaîtra maintenant en haut de la page :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1641,11 +1643,11 @@ msgid "" "Transifex page</link> when you are ready to begin. Thanks for your interest " "in helping the project!" msgstr "" -"Une fois que votre adhésion est approuvée, vous pouvez commencer à traduire;" -" retournez simplement à la <link " +"Une fois que votre adhésion sera approuvée, vous pourrez commencer à " +"traduire ; retournez simplement vers la <link " "href=\"https://www.transifex.com/otf/torproject/\">page Transifex de " -"Tor</link> lorsque vous êtes prêt à commencer. Merci de votre intérêt à " -"aider le projet !" +"Tor</link> quand vous serez prêt à commencer. Nous vous remercions de votre " +"intérêt à aider le projet !" #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" diff --git a/mk/mk.po b/mk/mk.po index cc0778d98..1e4c0b33d 100644 --- a/mk/mk.po +++ b/mk/mk.po @@ -1716,7 +1716,7 @@ msgid "" "Web Services; meek-azure makes it look like you are using a Microsoft web " "site; and meek-google makes it look like you are using Google search." msgstr "" -"Сите овие транспорти прават да изгледа дека вие прелистувате главна веб " +"Сите овие транспорти прават да изгледа дека вие прелистувате позната веб " "страна наместо дека користите Tor. meek-amazon прави да изгледа дека " "користите Amazon Web Services; meek-azure прави да изгледа дека користите " "Микрософт веб страна; и meek-google прави да изгледа дека користите Google " @@ -1724,15 +1724,15 @@ msgstr "" #: transports.page:100 msgid "Snowflake" -msgstr "Снегулка" +msgstr "Snowflake" #: transports.page:105 msgid "" "Snowflake is an improvement upon Flashproxy. It sends your traffic through " "WebRTC, a peer-to-peer protocol with built-in NAT punching." msgstr "" -"Снегулка е подобрување на Flashproxy. Таа го испраќа вашиот сообраќај преку " -"WebRTC, пеар-то-пеар протокол со вграден NET удирач." +"Snowflake е подобрување на Flashproxy. Таа го испраќа вашиот сообраќај преку" +" WebRTC, корисник-до-корисник протокол со вграден NET удирач." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" @@ -1765,8 +1765,8 @@ msgid "" "Your computer’s system clock must be set correctly, or Tor will not be able " "to connect." msgstr "" -"Часовникот на вашиот компјутерски систем мора да биде поставен точно, или " -"нема да може да се поврзе." +"Часовникот на вашиот компјутерски систем мора да биде точно поставен, или " +"Tor нема да може да се поврзе." #: troubleshooting.page:35 msgid "" @@ -1789,7 +1789,7 @@ msgstr "" #: troubleshooting.page:49 msgid "Temporarily disable your firewall." -msgstr "Привремено оневозможете го вашиот огнен ѕид." +msgstr "Привремено оневозможете го вашиот заштитен ѕид." #: troubleshooting.page:54 msgid ""

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit db6a24d2a32fb13ceb01a6348a76524b4f76a6a1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 22:19:23 2018 +0000 Update translations for tor-launcher-properties --- fa/torlauncher.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties index 533c4918d..a3af3861e 100644 --- a/fa/torlauncher.properties +++ b/fa/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پ torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید. torlauncher.error_bridges_missing=شما باید یک یا پل های بیشتری را مشخص کنید. torlauncher.error_default_bridges_type_missing=نوع انتقال باید برای پل‌ها مشخص گردد. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=لطفا یک پل درخواست کنید. torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجود نیست. لطفا تنظیمات را اصلاح کنید. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(در چین کار می‌کند) +torlauncher.bridge_suffix.meek-azure=(در چین کار می‌کند) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=درخواست یک پل... +torlauncher.request_a_new_bridge=درخواست یک پل جدید... torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.captcha_prompt=برای درخواست یک پل کپچا را حل کنید. +torlauncher.bad_captcha_solution=راه حل درست نیست. لطفا دوباره تلاش کنید. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=متاسفم. در حال حاضر هیچ کدام از پل‌ها در دسترس نیستند. torlauncher.connect=اتصال torlauncher.restart_tor=تور را ریستارت کنید. @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن torlauncher.bootstrapWarning.pt_missing=انتقال جایگزین مفقود است. -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. +torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با کارساز از دست رفت. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 9779d9f1bcebbb0308451bc06fafbac2581aef0f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 22:17:56 2018 +0000 Update translations for tor-browser-manual_completed --- fr/fr.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 3582a2f63..5e331287b 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -765,8 +765,8 @@ msgstr "" #: managing-identities.page:6 msgid "Learn how to control personally-identifying information in Tor Browser" msgstr "" -"Apprendre à contrôler les informations permettant d’identifier les personnes" -" dans le Navigateur Tor" +"Apprenez à contrôler dans le Navigateur Tor les renseignements permettant " +"d’identifier quelqu’un" #: managing-identities.page:10 msgid "Managing identities" @@ -1202,14 +1202,14 @@ msgid "" " many websites from displaying correctly, so Tor Browser’s default setting " "is to allow all websites to run scripts in \"Standard\" mode." msgstr "" -"Les utilisateurs qui nécessitent un niveau de sécurité élevé lorsqu’ils " +"Les utilisateurs qui exigent un niveau de sécurité élevé quand ils " "parcourent le Web devraient régler le <link xref=\"security-slider\">curseur" " de sécurité</link> du Navigateur Tor à « Plus sûr » (ce qui désactive le " "JavaScript pour les sites Web sans HTTPS) ou « Le plus sûr » (ce qui le fait" " pour tous les sites Web). Cependant, la désactivation du JavaScript " "empêchera de nombreux sites Web de s’afficher correctement, et c’est " -"pourquoi les paramètres par défaut du Navigateur Tor permettent aux sites " -"Web d’exécuter des scripts dans le mode « Standard »." +"pourquoi les paramètres par défaut du Navigateur Tor permettent à tous les " +"sites Web d’exécuter des scripts en mode « Normal »." #: plugins.page:59 msgid "Browser Add-ons" @@ -1243,7 +1243,7 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" msgstr "" -"Apprendre comment protéger vos données en utilisant le Navigateur Tor et " +"Apprenez comment protéger vos données en utilisant le Navigateur Tor et " "HTTPS" #: secure-connections.page:12 @@ -1353,7 +1353,7 @@ msgstr "Si Tor est utilisé ou non." #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" -msgstr "Configurer le Navigateur Tor pour la sécurité et la facilité d’emploi" +msgstr "Configurez le Navigateur Tor pour la sécurité et la facilité d’emploi" #: security-slider.page:10 msgid "Security Slider" @@ -1482,11 +1482,11 @@ msgstr "" #: translate.page:6 msgid "Becoming a translator for the Tor Project" -msgstr "Devenir un traducteur pour le Projet Tor" +msgstr "Devenez traducteur pour le Projet Tor" #: translate.page:10 msgid "Becoming a Tor Translator" -msgstr "Devenir un Traducteur Tor" +msgstr "Devenir traducteur de Tor" #: translate.page:12 msgid "" @@ -1505,21 +1505,21 @@ msgstr "" #: translate.page:21 msgid "Signing up on Transifex" -msgstr "Inscription sur Transifex" +msgstr "S’inscrire sur Transifex" #: translate.page:24 msgid "" "Head over to the <link href=\"https://transifex.com/signup/\">Transifex " "signup page</link>." msgstr "" -"Dirigez-vous vers la <link href=\"https://transifex.com/signup/\">page " +"Rendez-vous sur la <link href=\"https://transifex.com/signup/\">page " "d'inscription de Transifex</link>." #: translate.page:30 msgid "Enter your information into the fields and click the 'Sign Up' button:" msgstr "" -"Remplissez les champs avec vos informations et cliquez sur le bouton « " -"S'inscrire » :" +"Remplissez les champs avec vos renseignements et cliquez sur le bouton « " +"S’inscrire » :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1540,7 +1540,7 @@ msgid "" "\"Translator\" from the drop-down menus:" msgstr "" "Remplissez la page suivante avec votre nom et choisissez « Localisation » et" -" « Traducteur » dans les menus déroulants :" +" « Traducteur » dans les menus déroulants :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 72bb5e7930b302d2c66c91040af3eed31aaac24b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 22:17:50 2018 +0000 Update translations for tor-browser-manual --- fr/fr.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 3582a2f63..5e331287b 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -765,8 +765,8 @@ msgstr "" #: managing-identities.page:6 msgid "Learn how to control personally-identifying information in Tor Browser" msgstr "" -"Apprendre à contrôler les informations permettant d’identifier les personnes" -" dans le Navigateur Tor" +"Apprenez à contrôler dans le Navigateur Tor les renseignements permettant " +"d’identifier quelqu’un" #: managing-identities.page:10 msgid "Managing identities" @@ -1202,14 +1202,14 @@ msgid "" " many websites from displaying correctly, so Tor Browser’s default setting " "is to allow all websites to run scripts in \"Standard\" mode." msgstr "" -"Les utilisateurs qui nécessitent un niveau de sécurité élevé lorsqu’ils " +"Les utilisateurs qui exigent un niveau de sécurité élevé quand ils " "parcourent le Web devraient régler le <link xref=\"security-slider\">curseur" " de sécurité</link> du Navigateur Tor à « Plus sûr » (ce qui désactive le " "JavaScript pour les sites Web sans HTTPS) ou « Le plus sûr » (ce qui le fait" " pour tous les sites Web). Cependant, la désactivation du JavaScript " "empêchera de nombreux sites Web de s’afficher correctement, et c’est " -"pourquoi les paramètres par défaut du Navigateur Tor permettent aux sites " -"Web d’exécuter des scripts dans le mode « Standard »." +"pourquoi les paramètres par défaut du Navigateur Tor permettent à tous les " +"sites Web d’exécuter des scripts en mode « Normal »." #: plugins.page:59 msgid "Browser Add-ons" @@ -1243,7 +1243,7 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" msgstr "" -"Apprendre comment protéger vos données en utilisant le Navigateur Tor et " +"Apprenez comment protéger vos données en utilisant le Navigateur Tor et " "HTTPS" #: secure-connections.page:12 @@ -1353,7 +1353,7 @@ msgstr "Si Tor est utilisé ou non." #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" -msgstr "Configurer le Navigateur Tor pour la sécurité et la facilité d’emploi" +msgstr "Configurez le Navigateur Tor pour la sécurité et la facilité d’emploi" #: security-slider.page:10 msgid "Security Slider" @@ -1482,11 +1482,11 @@ msgstr "" #: translate.page:6 msgid "Becoming a translator for the Tor Project" -msgstr "Devenir un traducteur pour le Projet Tor" +msgstr "Devenez traducteur pour le Projet Tor" #: translate.page:10 msgid "Becoming a Tor Translator" -msgstr "Devenir un Traducteur Tor" +msgstr "Devenir traducteur de Tor" #: translate.page:12 msgid "" @@ -1505,21 +1505,21 @@ msgstr "" #: translate.page:21 msgid "Signing up on Transifex" -msgstr "Inscription sur Transifex" +msgstr "S’inscrire sur Transifex" #: translate.page:24 msgid "" "Head over to the <link href=\"https://transifex.com/signup/\">Transifex " "signup page</link>." msgstr "" -"Dirigez-vous vers la <link href=\"https://transifex.com/signup/\">page " +"Rendez-vous sur la <link href=\"https://transifex.com/signup/\">page " "d'inscription de Transifex</link>." #: translate.page:30 msgid "Enter your information into the fields and click the 'Sign Up' button:" msgstr "" -"Remplissez les champs avec vos informations et cliquez sur le bouton « " -"S'inscrire » :" +"Remplissez les champs avec vos renseignements et cliquez sur le bouton « " +"S’inscrire » :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1540,7 +1540,7 @@ msgid "" "\"Translator\" from the drop-down menus:" msgstr "" "Remplissez la page suivante avec votre nom et choisissez « Localisation » et" -" « Traducteur » dans les menus déroulants :" +" « Traducteur » dans les menus déroulants :" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit fe1fb4b0c3ed175eccacbc1491ccab75375173bb Merge: 80a6228aa ab92f9342 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 17:01:54 2018 -0500 Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4 src/or/circuitlist.c | 21 ++++++++++++++++++--- src/or/connection_edge.c | 23 ++++++++++++++++++++++- src/or/connection_edge.h | 6 +++++- src/or/relay.c | 2 +- 4 files changed, 46 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit fe1fb4b0c3ed175eccacbc1491ccab75375173bb Merge: 80a6228aa ab92f9342 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 17:01:54 2018 -0500 Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4 src/or/circuitlist.c | 21 ++++++++++++++++++--- src/or/connection_edge.c | 23 ++++++++++++++++++++++- src/or/connection_edge.h | 6 +++++- src/or/relay.c | 2 +- 4 files changed, 46 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 1b4075cb272a6f9a14cd0e0b8c73d359666fc479 Merge: 8af8ecabb fe1fb4b0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 17:08:04 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid taking 25573 and 27686 again.

1 0

[tor/release-0.3.4] Use the correct function signatures in test_relaycell.c
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 6d33f65638734593d10c5c3a5e2eb9d7bdff8000 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 15:07:02 2018 -0400 Use the correct function signatures in test_relaycell.c This is now officially an antipattern: please let's never copy a function declaration in two places again. That's what headers are for. --- src/or/connection_edge.c | 5 ---- src/or/connection_edge.h | 6 +++++ src/test/test_relaycell.c | 65 ++++++++++++++++++++--------------------------- 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 1060e7461..3170dc493 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -136,11 +136,6 @@ static int connection_ap_process_natd(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); -STATIC void connection_half_edge_add(const edge_connection_t *conn, - origin_circuit_t *circ); -STATIC half_edge_t *connection_half_edge_find_stream_id( - const smartlist_t *half_conns, - streamid_t stream_id); /** An AP stream has failed/finished. If it hasn't already sent back * a socks reply, send one now (based on endreason). Also set diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 6dbba014c..c607c963e 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -202,6 +202,12 @@ STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn, rewrite_result_t *out); STATIC int connection_ap_process_http_connect(entry_connection_t *conn); +struct half_edge_t; +STATIC void connection_half_edge_add(const edge_connection_t *conn, + origin_circuit_t *circ); +STATIC struct half_edge_t *connection_half_edge_find_stream_id( + const smartlist_t *half_conns, + streamid_t stream_id); #endif /* defined(CONNECTION_EDGE_PRIVATE) */ #endif /* !defined(TOR_CONNECTION_EDGE_H) */ diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index ee495cada..2fc0288f6 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -5,6 +5,9 @@ #define RELAY_PRIVATE #define CIRCUITLIST_PRIVATE +#define CONNECTION_EDGE_PRIVATE +#define CONNECTION_PRIVATE + #include "or.h" #include "main.h" #include "config.h" @@ -18,6 +21,11 @@ #include "relay.h" #include "test.h" +#include "log_test_helpers.h" + +#include "circpathbias.h" +#include "connection_edge.h" + static int srm_ncalls; static entry_connection_t *srm_conn; static int srm_atype; @@ -27,23 +35,6 @@ static uint8_t srm_answer[512]; static int srm_ttl; static time_t srm_expires; -void connection_free_minimal(connection_t*); -int connected_cell_format_payload(uint8_t *payload_out, - const tor_addr_t *addr, - uint32_t ttl); -void pathbias_count_valid_cells(origin_circuit_t *circ, - cell_t *cell); -half_edge_t *connection_half_edge_find_stream_id( - const smartlist_t *half_conns, - streamid_t stream_id); -void connection_half_edge_add(const edge_connection_t *conn, - origin_circuit_t *circ); - -int mock_send_command(streamid_t stream_id, circuit_t *circ, - uint8_t relay_command, const char *payload, - size_t payload_len, crypt_path_t *cpath_layer, - const char *filename, int lineno); - /* Mock replacement for connection_ap_hannshake_socks_resolved() */ static void socks_resolved_mock(entry_connection_t *conn, @@ -143,7 +134,7 @@ mock_start_reading(connection_t *conn) return; } -int +static int mock_send_command(streamid_t stream_id, circuit_t *circ, uint8_t relay_command, const char *payload, size_t payload_len, crypt_path_t *cpath_layer, @@ -230,7 +221,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) /* Data cell not in the half-opened list */ PACK_CELL(4000, RELAY_COMMAND_DATA, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -239,7 +230,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) /* Sendme cell not in the half-opened list */ PACK_CELL(4000, RELAY_COMMAND_SENDME, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -248,7 +239,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) /* Connected cell not in the half-opened list */ PACK_CELL(4000, RELAY_COMMAND_CONNECTED, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -257,7 +248,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) /* Resolved cell not in the half-opened list */ PACK_CELL(4000, RELAY_COMMAND_RESOLVED, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -267,7 +258,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) edgeconn = ENTRY_TO_EDGE_CONN(entryconn2); PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_CONNECTED, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -279,7 +270,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn2)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_DATA, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -290,7 +281,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn2)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_DATA, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -302,7 +293,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn2)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_SENDME, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -313,7 +304,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn2)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_SENDME, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -324,7 +315,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn2)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_END, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -334,7 +325,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn2)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_END, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -359,7 +350,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) connection_edge_reached_eof(edgeconn); PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_CONNECTED, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -369,7 +360,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn3)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_CONNECTED, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -380,7 +371,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn3)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_END, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -399,7 +390,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn3)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_DATA, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -419,7 +410,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_RESOLVED, "\x04\x04\x12\x00\x00\x01\x00\x00\x02\x00"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -438,7 +429,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn4)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_DATA, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -449,7 +440,7 @@ subtest_circbw_halfclosed(origin_circuit_t *circ, streamid_t init_id) ENTRY_TO_CONN(entryconn4)->outbuf_flushlen = 0; PACK_CELL(edgeconn->stream_id, RELAY_COMMAND_END, "Data1234"); if (circ->base_.purpose == CIRCUIT_PURPOSE_PATH_BIAS_TESTING) - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); else connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, circ->cpath); @@ -870,7 +861,7 @@ test_circbw_relay(void *arg) /* Path bias: truncated */ tt_int_op(circ->base_.marked_for_close, OP_EQ, 0); PACK_CELL(0, RELAY_COMMAND_TRUNCATED, "Data1234"); - pathbias_count_valid_cells(circ, &cell); + pathbias_count_valid_cells(TO_CIRCUIT(circ), &cell); tt_int_op(circ->base_.marked_for_close, OP_EQ, 1); done:

1 0