December 2016 - tor-commits - lists.torproject.org

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit 8a9d5f6e3a6a343a5b07d8d3e006fef3076f0cff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 13:15:09 2016 +0000 Update translations for bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 24 ++++++++++++------------ fr_CA/LC_MESSAGES/bridgedb.po | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index d1dbe1e..528b8bb 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -28,7 +28,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: 2016-12-16 12:40+0000\n" +"PO-Revision-Date: 2016-12-16 13:14+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -75,11 +75,11 @@ msgstr "Tout sélectionner" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Afficher le QRCode" +msgstr "Afficher le code QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Code QR pour vos lignes de ponts" +msgstr "Code QR pour vos lignes de pont" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -92,13 +92,13 @@ msgstr "Un problème est survenu !" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Il semblerait qu'il y ait eu une erreur en chargeant votre QRCode." +msgstr "Il semble qu’il y ait eu une erreur de récupération de votre code QR." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Ce QRCode contient vos lignes de ponts. Scannez-le avec un lecteur de QRCode pour copier vos lignes de ponts dans votre smartphone ou autres appareils." +msgstr "Ce code QR contient vos lignes de pont. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont sur vos appareils, mobiles ou autres." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -129,7 +129,7 @@ msgstr "Étape %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Récupérez les %s ponts %s" +msgstr "Récupérez des %s ponts %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -139,7 +139,7 @@ msgstr "Étape %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Maintenant %s ajoutez les ponts au navigateur Tor %s" +msgstr "Maintenant, %s ajoutez les ponts au navigateur Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -168,7 +168,7 @@ msgstr "aucun" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "%sO%sui!" +msgstr "%sO%sui !" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -180,7 +180,7 @@ msgstr "%sO%sbtenir des ponts" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[Ceci est un message automatique, merci de ne pas y répondre.]" +msgstr "[Ceci est un message automatisé ; veuillez ne pas y répondre.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" @@ -215,7 +215,7 @@ msgstr "Bonjour, %s !" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Bonjour amical !" +msgstr "Bonjour, l'ami !" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" @@ -243,7 +243,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB peut fournir des ponts (bridges) avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions vers le réseau Tor, ce qui rend la surveillance de votre trafic Internet pour déterminer si vous utilisez Tor.\n" +msgstr "BridgeDB peut fournir des ponts (bridges) avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions vers le réseau Tor. Il est ainsi plus difficile pour quiconque surveille votre trafic Internet de déterminer que vous utilisez Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -310,7 +310,7 @@ msgstr "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Voici vos lignes de ponts:" +msgstr "Voici vos lignes de pont :" #: bridgedb/strings.py:129 msgid "Get Bridges!" diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po index dcb557b..c5aca67 100644 --- a/fr_CA/LC_MESSAGES/bridgedb.po +++ b/fr_CA/LC_MESSAGES/bridgedb.po @@ -16,7 +16,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: 2016-12-08 20:32+0000\n" +"PO-Revision-Date: 2016-12-16 13:15+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "Tout sélectionner" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Montrer le code QR" +msgstr "Afficher le code QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" @@ -76,7 +76,7 @@ msgstr "Code QR de vos lignes de pont" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Une erreur est survenue!" +msgstr "Un problème est survenu !" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." @@ -86,7 +86,7 @@ msgstr "Il semble qu’il y ait eu une erreur de récupération de votre code QR msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Ce code QR contient vos lignes de pont. Balayez-le avec un lecteur de codes QR pour copier vos lignes de pont sur votre appareil." +msgstr "Ce code QR contient vos lignes de pont. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont sur vos appareils, mobiles ou autres." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -117,7 +117,7 @@ msgstr "Étape %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Récupérez %s les ponts %s" +msgstr "Récupérez des %s ponts %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -203,7 +203,7 @@ msgstr "Allô, %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Bonjour l'ami!" +msgstr "Bonjour, l'ami!" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" @@ -302,7 +302,7 @@ msgstr "Voici vos lignes de pont :" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "Obtenir des ponts!" +msgstr "Obtenez des ponts!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit 5a46ce476ff1aa6da02221c0dca26ad80938602b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 13:15:04 2016 +0000 Update translations for bridgedb --- fr/LC_MESSAGES/bridgedb.po | 24 ++++++++++++------------ fr_CA/LC_MESSAGES/bridgedb.po | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index d1dbe1e..528b8bb 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -28,7 +28,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: 2016-12-16 12:40+0000\n" +"PO-Revision-Date: 2016-12-16 13:14+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -75,11 +75,11 @@ msgstr "Tout sélectionner" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Afficher le QRCode" +msgstr "Afficher le code QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Code QR pour vos lignes de ponts" +msgstr "Code QR pour vos lignes de pont" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -92,13 +92,13 @@ msgstr "Un problème est survenu !" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Il semblerait qu'il y ait eu une erreur en chargeant votre QRCode." +msgstr "Il semble qu’il y ait eu une erreur de récupération de votre code QR." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Ce QRCode contient vos lignes de ponts. Scannez-le avec un lecteur de QRCode pour copier vos lignes de ponts dans votre smartphone ou autres appareils." +msgstr "Ce code QR contient vos lignes de pont. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont sur vos appareils, mobiles ou autres." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -129,7 +129,7 @@ msgstr "Étape %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Récupérez les %s ponts %s" +msgstr "Récupérez des %s ponts %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -139,7 +139,7 @@ msgstr "Étape %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Maintenant %s ajoutez les ponts au navigateur Tor %s" +msgstr "Maintenant, %s ajoutez les ponts au navigateur Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -168,7 +168,7 @@ msgstr "aucun" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "%sO%sui!" +msgstr "%sO%sui !" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -180,7 +180,7 @@ msgstr "%sO%sbtenir des ponts" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[Ceci est un message automatique, merci de ne pas y répondre.]" +msgstr "[Ceci est un message automatisé ; veuillez ne pas y répondre.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" @@ -215,7 +215,7 @@ msgstr "Bonjour, %s !" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Bonjour amical !" +msgstr "Bonjour, l'ami !" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" @@ -243,7 +243,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB peut fournir des ponts (bridges) avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions vers le réseau Tor, ce qui rend la surveillance de votre trafic Internet pour déterminer si vous utilisez Tor.\n" +msgstr "BridgeDB peut fournir des ponts (bridges) avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions vers le réseau Tor. Il est ainsi plus difficile pour quiconque surveille votre trafic Internet de déterminer que vous utilisez Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -310,7 +310,7 @@ msgstr "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Voici vos lignes de ponts:" +msgstr "Voici vos lignes de pont :" #: bridgedb/strings.py:129 msgid "Get Bridges!" diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po index dcb557b..d3686bd 100644 --- a/fr_CA/LC_MESSAGES/bridgedb.po +++ b/fr_CA/LC_MESSAGES/bridgedb.po @@ -16,7 +16,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: 2016-12-08 20:32+0000\n" +"PO-Revision-Date: 2016-12-16 13:08+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "Tout sélectionner" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Montrer le code QR" +msgstr "Afficher le code QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" @@ -76,7 +76,7 @@ msgstr "Code QR de vos lignes de pont" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Une erreur est survenue!" +msgstr "Un problème est survenu !" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." @@ -86,7 +86,7 @@ msgstr "Il semble qu’il y ait eu une erreur de récupération de votre code QR msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Ce code QR contient vos lignes de pont. Balayez-le avec un lecteur de codes QR pour copier vos lignes de pont sur votre appareil." +msgstr "Ce code QR contient vos lignes de pont. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont sur vos appareils, mobiles ou autres." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -117,7 +117,7 @@ msgstr "Étape %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Récupérez %s les ponts %s" +msgstr "Récupérez des %s ponts %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -203,7 +203,7 @@ msgstr "Allô, %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Bonjour l'ami!" +msgstr "Bonjour, l'ami!" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys"

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit df00856ddcd0319341848f35252cbcabce9e64c1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 12:48:20 2016 +0000 Update translations for exoneratorproperties_completed --- fr/exonerator.properties | 52 +++++++++++++++++++++++++++++++++++++++++++++ fr_CA/exonerator.properties | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties new file mode 100644 index 0000000..c71f350 --- /dev/null +++ b/fr/exonerator.properties @@ -0,0 +1,52 @@ +form.explanation=Entrer une adresse IP et une date pour découvrir si cette adresse a été utilisé comme relai Tor \: +form.ip.label=Adresse IP +form.timestamp.label=Date +form.search.label=Rechercher +summary.heading=Résumé +summary.serverproblem.dbnoconnect.title=Problème de serveur +summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. +summary.serverproblem.dbnoconnect.body.link=faites-nous savoir +summary.serverproblem.dbempty.title=Problème de serveur +summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez réessayer ultérieurement. Si le problème persiste, veuillez %s \! +summary.serverproblem.dbempty.body.link=faites-nous savoir +summary.invalidparams.notimestamp.title=Aucun paramètre de date n'est donné +summary.invalidparams.notimestamp.body=Désolé, vous devez aussi fournir un paramètre de date. +summary.invalidparams.noip.title=Aucun paramètre d'adresse IP n'est donné +summary.invalidparams.noip.body=Désolé, vous devez aussi fournir un paramètre d'adresse IP. +summary.invalidparams.timestamprange.title=Paramètre de date hors fourchette +summary.invalidparams.timestamprange.body=Désolé, la base de données ne contient aucune donnée de %s. Veuillez choisir une date entre %s et %s. +summary.invalidparams.invalidip.title=Paramètre d'adresse IP invalide +summary.invalidparams.invalidip.body=Désolé, %s n'est pas une adresse IP valide. Les formats attendus des adresses IP est %s ou %s. +summary.invalidparams.invalidtimestamp.title=Paramètre de date invalide +summary.invalidparams.invalidtimestamp.body=Désolé, %s n'est pas une date valide. Le format date attendu est %s. +summary.serverproblem.nodata.title=Problème de serveur +summary.serverproblem.nodata.body.text=La base de données ne contient aucune donnée pour la date demandée. Merci de réessayer ultérieurement. Si le problème persiste, veuillez %s \! +summary.serverproblem.nodata.body.link=faites-nous savoir +summary.negativesamenetwork.title=Le résultat est négatif +summary.negativesamenetwork.body=Nous n'avons pas trouvé l'adresse IP %s à la date %s ou à un jour de celle-ci. Mais nous avons trouvé d'autres adresses IP de relais Tor sur le même réseau /%d aux alentours de \: +summary.positive.title=Le résultat est positif +summary.positive.body=Nous avons trouvé un ou plusieurs relais Tor à l'adresse iIP %s à la date %s ou à un jour de celle-ci que les clients Tor devraient connaître. +summary.negative.title=Le résultat est négatif +summary.negative.body=Nous n'avons pas trouvé l'adresse IP %s à la date %s ou à un jour de celle-ci. +technicaldetails.heading=Détails techniques +technicaldetails.pre=Chercher l'adresse IP %s à la date %s ou à un jour de celle-ci. Les clients de Tor ont pu choisir ce ou ces relais Tor pour construire les circuits. +technicaldetails.colheader.timestamp=Horodatage (UTC) +technicaldetails.colheader.ip=Adresse(s) IP +technicaldetails.colheader.fingerprint=Empreinte d'identité +technicaldetails.colheader.nickname=Pseudonyme +technicaldetails.colheader.exit=Relais de sortie +technicaldetails.nickname.unknown=Inconnu +technicaldetails.exit.unknown=Inconnu +technicaldetails.exit.yes=Oui +technicaldetails.exit.no=Non +permanentlink.heading=Lien permanent +footer.abouttor.heading=À propos de Tor +footer.abouttor.body.text=Tor est un projet international de logiciel afin d'anonymiser le trafic Internet en %s.  Par conséquent, si vous voyez le trafic d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plutôt que de l'opérateur du relais.  Le projet Tor et les opérateurs de relais Tor n'ont aucune trace du trafic relayé par le réseau et ne peuvent ainsi fournir aucune information sur son origine.  Assurez-vous d'%s et n'hésitez pas à %s pour davantage d'informations. +footer.abouttor.body.link1=chiffrant les paquets et les envoyant via une série de sauts avant qu'ils n'arrivent à destination +footer.abouttor.body.link2=en savoir plus sur Tor +footer.abouttor.body.link3=contacter 'The Tor project, Inc.' +footer.aboutexonerator.heading=À propos d'ExoneraTor +footer.aboutexonerator.body=Le service ExoneraTor gère une base de données d'adresses IP qui ont fait partie du réseau Tor.  Il répond à la question de savoir si un relais Tor fonctionnait pour une adresse IP donnée à une date précise.  ExoneraTor peut enregistrer plus d'une adresse IP par relais si les relais utilisent une adresse IP différente pour se brancher à Internet que pour s'enregistrer sur le réseau Tor, et il enregistre si un relais permettait le transit du trafic Tor vers l'Internet ouvert à ce moment précis. +footer.trademark.text=« Tor » et le « logo Oignon » sont des %s de The Tor Project, Inc. +footer.trademark.link=marques déposées + diff --git a/fr_CA/exonerator.properties b/fr_CA/exonerator.properties index 89301d0..746225b 100644 --- a/fr_CA/exonerator.properties +++ b/fr_CA/exonerator.properties @@ -41,7 +41,7 @@ technicaldetails.exit.yes=Oui technicaldetails.exit.no=Non permanentlink.heading=Lien permanent footer.abouttor.heading=À propos de Tor -footer.abouttor.body.text=Tor est un projet international de logiciel afin d'anonymiser le trafic Internet en %s.  Par conséquent, si vous voyez le trafic d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plutôt que de l'opérateur du relais.  Le projet Tor et les opérateurs de relais Tor n'ont aucune trace du trafic relayé par le réseau et ne peuvent ainsi fournir aucune information sur leur origine.  Assurez-vous d'%s et n'hésitez pas à %s pour davantage d'informations. +footer.abouttor.body.text=Tor est un projet international de logiciel afin d'anonymiser le trafic Internet en %s.  Par conséquent, si vous voyez le trafic d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plutôt que de l'opérateur du relais.  Le projet Tor et les opérateurs de relais Tor n'ont aucune trace du trafic relayé par le réseau et ne peuvent ainsi fournir aucune information sur son origine.  Assurez-vous d'%s et n'hésitez pas à %s pour davantage d'informations. footer.abouttor.body.link1=chiffrant les paquets et en les envoyant par une série de sauts avant qu'ils n'atteignent leur destination footer.abouttor.body.link2=en apprendre davantage au sujet de Tor footer.abouttor.body.link3=contacter The Tor Project, Inc.

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit 656d3236cac4b2225e6156f86fc2978abcfe8dc1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 12:48:16 2016 +0000 Update translations for exoneratorproperties --- fr/exonerator.properties | 2 +- fr_CA/exonerator.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index c0d2bb1..c71f350 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -41,7 +41,7 @@ technicaldetails.exit.yes=Oui technicaldetails.exit.no=Non permanentlink.heading=Lien permanent footer.abouttor.heading=À propos de Tor -footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by %s.  Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator.  The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin.  Be sure to %s, and don't hesitate to %s for more information. +footer.abouttor.body.text=Tor est un projet international de logiciel afin d'anonymiser le trafic Internet en %s.  Par conséquent, si vous voyez le trafic d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plutôt que de l'opérateur du relais.  Le projet Tor et les opérateurs de relais Tor n'ont aucune trace du trafic relayé par le réseau et ne peuvent ainsi fournir aucune information sur son origine.  Assurez-vous d'%s et n'hésitez pas à %s pour davantage d'informations. footer.abouttor.body.link1=chiffrant les paquets et les envoyant via une série de sauts avant qu'ils n'arrivent à destination footer.abouttor.body.link2=en savoir plus sur Tor footer.abouttor.body.link3=contacter 'The Tor project, Inc.' diff --git a/fr_CA/exonerator.properties b/fr_CA/exonerator.properties index 89301d0..746225b 100644 --- a/fr_CA/exonerator.properties +++ b/fr_CA/exonerator.properties @@ -41,7 +41,7 @@ technicaldetails.exit.yes=Oui technicaldetails.exit.no=Non permanentlink.heading=Lien permanent footer.abouttor.heading=À propos de Tor -footer.abouttor.body.text=Tor est un projet international de logiciel afin d'anonymiser le trafic Internet en %s.  Par conséquent, si vous voyez le trafic d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plutôt que de l'opérateur du relais.  Le projet Tor et les opérateurs de relais Tor n'ont aucune trace du trafic relayé par le réseau et ne peuvent ainsi fournir aucune information sur leur origine.  Assurez-vous d'%s et n'hésitez pas à %s pour davantage d'informations. +footer.abouttor.body.text=Tor est un projet international de logiciel afin d'anonymiser le trafic Internet en %s.  Par conséquent, si vous voyez le trafic d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plutôt que de l'opérateur du relais.  Le projet Tor et les opérateurs de relais Tor n'ont aucune trace du trafic relayé par le réseau et ne peuvent ainsi fournir aucune information sur son origine.  Assurez-vous d'%s et n'hésitez pas à %s pour davantage d'informations. footer.abouttor.body.link1=chiffrant les paquets et en les envoyant par une série de sauts avant qu'ils n'atteignent leur destination footer.abouttor.body.link2=en apprendre davantage au sujet de Tor footer.abouttor.body.link3=contacter The Tor Project, Inc.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit d8e6c699387673856c3c15a9743ad295a4e7a637 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 12:45:09 2016 +0000 Update translations for bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index dfac7cf..d1dbe1e 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -28,7 +28,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: 2016-12-08 20:32+0000\n" +"PO-Revision-Date: 2016-12-16 12:40+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Désolé ! Un problème est survenu lors de votre requête." +msgstr "Désolé ! Quelque chose a mal tourné avec votre requête." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit 58930f9fd198ee26d630ab467970283b90b0f446 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 12:45:03 2016 +0000 Update translations for bridgedb --- fr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index dfac7cf..d1dbe1e 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -28,7 +28,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: 2016-12-08 20:32+0000\n" +"PO-Revision-Date: 2016-12-16 12:40+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Désolé ! Un problème est survenu lors de votre requête." +msgstr "Désolé ! Quelque chose a mal tourné avec votre requête." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit e9f0d4d79cb6d3bf341e89ceea6429d575314933 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 12:18:18 2016 +0000 Update translations for tor-browser-manual --- bg/bg.po | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 9d297ee..9fb22f1 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -1272,46 +1272,52 @@ msgid "" "When both buttons are green, you see the data that is visible to observers " "when you are using both tools." msgstr "" +"Когато и двата бутона са зелени ще видите каква информация е видима за " +"наблюдаващите, когато и двете услуги са включени." #: secure-connections.page:55 msgid "" "When both buttons are grey, you see the data that is visible to observers " "when you don't use either tool." msgstr "" +"Когато и двата бутона са сиви ще видите каква информация е видима за " +"наблюдаващите, когато нито една услуга не е включена." #: secure-connections.page:62 msgid "Potentially visible data" -msgstr "" +msgstr "Потенциално видима информация" #: secure-connections.page:70 msgid "The site being visited." -msgstr "" +msgstr "Сайтът, който посещавате." #: secure-connections.page:81 msgid "Username and password used for authentication." -msgstr "" +msgstr "Потребителско име и парола използване за вписване." #: secure-connections.page:92 msgid "Data being transmitted." -msgstr "" +msgstr "Информацията, която е предавана." #: secure-connections.page:103 msgid "" "Network location of the computer used to visit the website (the public IP " "address)." msgstr "" +"Местоположение на компютърът използван за посещаване на уебсайта (публичен " +"IP адрес)." #: secure-connections.page:115 msgid "Whether or not Tor is being used." -msgstr "" +msgstr "Дали се използва Tor браузърът." #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" -msgstr "" +msgstr "Настройки на Tor браузърът за сигурност и използваемост" #: security-slider.page:10 msgid "Security Slider" -msgstr "" +msgstr "Плъзгач на сигурност" #: security-slider.page:11 msgid "" @@ -1321,10 +1327,16 @@ msgid "" "some web pages from functioning properly, so you should weigh your security " "needs against the degree of usability you require." msgstr "" +"Tor браузърът включва \"Плъзгач на сигурност\", който разрешава да увеличава" +" сигурноста като се изключват определени уеб функции, които могат да бъда " +"използвани за атакуване на Вашата сигурност и анонимост. Увеличаването на " +"нивото на сигурност на Tor браузъраможе да попречи на някои уеб страници да " +"функционират правилно, така че трябва да вземете решение за баланса между " +"нуждите си за сигурност и използваемост." #: security-slider.page:21 msgid "Accessing the Security Slider" -msgstr "" +msgstr "Достъп до Плъзгача на сигурност" #. 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 @@ -1336,16 +1348,20 @@ msgid "" "external ref='media/security-slider/slider.png' " "md5='3c469cd3ed9f60ebb6bbbc63daa90082'" msgstr "" +"external ref='media/security-slider/slider.png' " +"md5='3c469cd3ed9f60ebb6bbbc63daa90082'" #: security-slider.page:25 msgid "" "The Security Slider is located in Torbutton’s “Privacy and Security " "Settings” menu." msgstr "" +"Плъзгача на сигурност се намира в \"Настройки на лично пространсто и " +"сигурност\" в менюто на Tor бутона." #: security-slider.page:32 msgid "Security Levels" -msgstr "" +msgstr "Нива на сигурност" #. 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 @@ -1357,12 +1373,16 @@ msgid "" "external ref='media/security-slider/slider_window.png' " "md5='c733bdccd1731ed1a772777b25bae7a1'" msgstr "" +"external ref='media/security-slider/slider_window.png' " +"md5='c733bdccd1731ed1a772777b25bae7a1'" #: security-slider.page:36 msgid "" "Increasing the level of the Security Slider will disable or partially " "disable certain browser features to protect against possible attacks." msgstr "" +"Увеличаването на нивто на Плъзгача на сигурност ще изключи напълно или " +"частично някои функции на браузъра, за да защити от възможни атаки." #: security-slider.page:42 msgid "High" @@ -1377,6 +1397,13 @@ msgid "" "disabled by default on all sites; most video and audio formats are disabled;" " and some fonts and icons may not display correctly." msgstr "" +"На това ниво, HTML5 видео и аудио стават активни само при кликане върху тях " +"чрез NoScript; всички JavaScript оптимизации са деактивирани; някои " +"математически уравнения може да не се показват правилно; някои функции по " +"показване на шрифтове са деактивирани; някои видове изображения са " +"деактивирани; JavaScript е деактивиран по подразбиране на всички сайтове; " +"повечето видео и аудио формати са деактивирани; и някои шрифтове и икони " +"може да не се показват правилно." #: security-slider.page:53 msgid "Medium-High" @@ -1391,6 +1418,12 @@ msgid "" "disabled by default on all non-<link xref=\"secure-" "connections\">HTTPS</link> sites." msgstr "" +"На това ниво, HTML5 видео и аудио стават активни само при кликане върху тях " +"чрез NoScript; всички JavaScript оптимизации са деактивирани; някои " +"математически уравнения може да не се показват правилно; някои функции по " +"показване на шрифтове са деактивирани; някои видове изображения са " +"деактивирани; JavaScript е деактивиран по подразбиране на всички не-<link " +"xref=\"secure-connections\">HTTPS</link> сайтове." #: security-slider.page:64 msgid "Medium-Low" @@ -1403,24 +1436,30 @@ msgid "" "optimizations are disabled, causing some websites to run more slowly; and " "some mathematical equations may not display properly." msgstr "" +"На това ниво, HTML5 видео и аудио стават активни само при кликане върху тях " +"чрез NoScript; някои <link xref=\"plugins\">JavaScript</link> оптимизации " +"са деактивирани, което означава, че някои уебсайтове ще вървят по-бавно; и " +"някои математически уравнения може да не се показват правилно." #: security-slider.page:73 msgid "Low" -msgstr "" +msgstr "Ниско" #: security-slider.page:74 msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"На това ниво, всички функции на браузъра са активирани. Това е опцията, " +"която дава най-голяма функционалност." #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" -msgstr "" +msgstr "Видове вградяеми транспорти" #: transports.page:10 msgid "Pluggable Transports" -msgstr "" +msgstr "Вградяеми транспорти" #: transports.page:12 msgid "" @@ -1429,26 +1468,34 @@ msgid "" "Provider or other authority is actively blocking connections to the Tor " "network." msgstr "" +"Вградяемите транспорти са инструменти, които Tor може да използва за " +"прикриване на трафика, който изпраща. Това може да е полезно при ситуации, в" +" които интернет доставчикът или друга власт активно блокират връзките към " +"Tor мрежата." #: transports.page:21 msgid "" "Currently there are six pluggable transports available, but more are being " "developed." msgstr "" +"В момента има шест вградяеми транспорта на разположение, но дъпълнителни са " +"в процес на разработване." #: transports.page:28 msgid "obfs3" -msgstr "" +msgstr "obfs3" #: transports.page:33 msgid "" "obfs3 makes Tor traffic look random, so that it does not look like Tor or " "any other protocol. obfs3 bridges will work in most places." msgstr "" +"obfs3 кара Tor трафикът да изглежда произволен, така че да не изглежда като " +"Tor или някой друг протокол. obfs3 мостовете ще работят в повечето ситуации." #: transports.page:42 msgid "obfs4" -msgstr "" +msgstr "obfs4" #: transports.page:47 msgid "" @@ -1456,28 +1503,33 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" +"obfs4 кара Tor трафикът да изглежда произволен като при obfs3 и също така " +"спира цензуриращите от намирането на мостове, когато сканират интернетът. " +"obfs4 мостовете са по-малко вероятно да бъдат блокирани от obfs3 мостовете." #: transports.page:56 msgid "Scramblesuit" -msgstr "" +msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." -msgstr "" +msgstr "ScrambleSuit е подобен на obfs4, но изпозлва друг набор от мостове." #: transports.page:69 msgid "FTE" -msgstr "" +msgstr "FTE" #: transports.page:74 msgid "" "FTE (format-transforming encryption) disguises Tor traffic as ordinary web " "(HTTP) traffic." msgstr "" +"FTE (формато-трансофрмиращо криптиране) прикрива Tor трафика като обикновен " +"(HTTP) трафик." #: transports.page:82 msgid "meek" -msgstr "" +msgstr "meek" #: transports.page:87 msgid "" @@ -1486,6 +1538,10 @@ 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. mee-kazure прави да " +"изглежда, като че ли използвате Microsoft уебсайта; a meek-google прави да " +"изглежда, като че ли използвате търсенето на Google." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work"

1 0

[tor-browser-bundle/hardened-builds] Bug 20147: (re-)dzip.sh: various improvements
by gk＠torproject.org 16 Dec '16

16 Dec '16

commit 4704bcdec26e2662d3765fd9a3bc69fc11e69453 Author: Rusty Bird <rustybird(a)openmailbox.org> Date: Thu Dec 8 17:18:12 2016 +0000 Bug 20147: (re-)dzip.sh: various improvements - Don't ignore errors (except unzip exit status 1 or 2) - Quote $@ and $1 - Work with absolute filenames and filenames starting with a dash - Pass many files per chmod invocation (much faster) - Pass $UNZIPOPTS, like $ZIPOPTS - Reuse dzip.sh in re-dzip.sh The (re)generated zip files are identical. --- gitian/build-helpers/dzip.sh | 17 ++++++++--------- gitian/build-helpers/re-dzip.sh | 23 ++++++++++------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 5772c8b..64fcdca 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -1,14 +1,13 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip wrapper export LC_ALL=C -ZIPFILE=$1 +ZIPFILE=${1:?} shift -[ -n "$REFERENCE_DATETIME" ] && \ - find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; - -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; - -find $@ | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" +if [ -n "$REFERENCE_DATETIME" ]; then + find "$@" -exec touch --date="$REFERENCE_DATETIME" -- {} + +fi +find "$@" -executable -exec chmod 700 {} + +find "$@" ! -executable -exec chmod 600 {} + +find "$@" | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 27828e9..8e8abbf 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -1,17 +1,14 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip repackager export LC_ALL=C -ZIPFILE=`basename $1` +ZIPFILE_BASENAME=$(basename -- "${1:?}") +TEMPDIR=tmp-re-dzip-$$ +RE_DZIP=$(readlink -f -- "$(which -- "$0")") +PATH=$PATH:$(dirname "$RE_DZIP") -mkdir tmp_dzip -cd tmp_dzip -unzip ../$1 -[ -n "$REFERENCE_DATETIME" ] && \ - find . -exec touch --date="$REFERENCE_DATETIME" {} \; -find . -executable -exec chmod 700 {} \; -find . ! -executable -exec chmod 600 {} \; -find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE -mv $ZIPFILE ../$1 -cd .. -rm -rf tmp_dzip +mkdir "$TEMPDIR" +unzip $UNZIPOPTS -d "$TEMPDIR" -- "$1" || [ $? -lt 3 ] +(cd "$TEMPDIR"; dzip.sh ./"$ZIPFILE_BASENAME" .) +mv -- "$TEMPDIR"/"$ZIPFILE_BASENAME" "$1" +rm -rf "$TEMPDIR"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit a77a1a5d7df8771b422bb2f12b94546782306f4f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 11:48:17 2016 +0000 Update translations for tor-browser-manual --- bg/bg.po | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/bg/bg.po b/bg/bg.po index 70628e7..9d297ee 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -1206,10 +1206,11 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" msgstr "" +"Научете как да защитите своята информация, използвайки Tor браузъра и HTTPS" #: secure-connections.page:12 msgid "Secure Connections" -msgstr "" +msgstr "Сигурни връзки" #: secure-connections.page:14 msgid "" @@ -1220,6 +1221,12 @@ msgid "" " verify this in the URL bar: if your connection is encrypted, the address " "will begin with “https://”, rather than “http://”." msgstr "" +"Ако лична информация като парола пътува не криптирана през интернет, тя може" +" много лесно да бъде пресрешната от подслушвател. Ако се вписвате, в който и" +" да е уебсайт е най-добре да се уверите, че той предлага HTTPS криптиране, " +"което предпазва срещи този тип подслушване. Може да се уверите в това като " +"погледнете полето с интерент адреса: ако връзката е криптирана, адресът ще " +"започва с \"https://\", а не с \"http://\"." #. 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 @@ -1231,24 +1238,34 @@ msgid "" "external ref='media/secure-connections/https.png' " "md5='364bcbde7a649b0cea9ae178007c1a50'" msgstr "" +"external ref='media/secure-connections/https.png' " +"md5='364bcbde7a649b0cea9ae178007c1a50'" #: secure-connections.page:26 msgid "" "The following visualization shows what information is visible to " "eavesdroppers with and without Tor Browser and HTTPS encryption:" msgstr "" +"Следната визуализация показва каква информация е видима на подслушващите с и" +" без Tor браузъра и HTTPS криптиране:" #: secure-connections.page:35 msgid "" "Click the “Tor” button to see what data is visible to observers when you're " "using Tor. The button will turn green to indicate that Tor is on." msgstr "" +"Натиснете \"Tor\" бутона, за да видите каква информация е видима за " +"наблюдаващите, когато ползвате Tor. Бутонът ще стане зелен, за да покаже, че" +" Tor е включен." #: secure-connections.page:42 msgid "" "Click the “HTTPS” button to see what data is visible to observers when " "you're using HTTPS. The button will turn green to indicate that HTTPS is on." msgstr "" +"Натиснете \"HTTPS\" бутона, за да видите каква информация е видима за " +"наблюдаващите, когато ползвате HTTPS. Бутонът ще стане зелен, за да покажа, " +"че HTTPS е включен." #: secure-connections.page:49 msgid ""

1 0

[tor-browser-bundle/master] Bug 20147: (re-)dzip.sh: various improvements
by gk＠torproject.org 16 Dec '16

16 Dec '16

commit cb3acb5f6a878e9b34f60b6d9bb2bacb5194a3b8 Author: Rusty Bird <rustybird(a)openmailbox.org> Date: Thu Dec 8 17:18:12 2016 +0000 Bug 20147: (re-)dzip.sh: various improvements - Don't ignore errors (except unzip exit status 1 or 2) - Quote $@ and $1 - Work with absolute filenames and filenames starting with a dash - Pass many files per chmod invocation (much faster) - Pass $UNZIPOPTS, like $ZIPOPTS - Reuse dzip.sh in re-dzip.sh The (re)generated zip files are identical. --- gitian/build-helpers/dzip.sh | 17 ++++++++--------- gitian/build-helpers/re-dzip.sh | 23 ++++++++++------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 5772c8b..64fcdca 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -1,14 +1,13 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip wrapper export LC_ALL=C -ZIPFILE=$1 +ZIPFILE=${1:?} shift -[ -n "$REFERENCE_DATETIME" ] && \ - find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; - -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; - -find $@ | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" +if [ -n "$REFERENCE_DATETIME" ]; then + find "$@" -exec touch --date="$REFERENCE_DATETIME" -- {} + +fi +find "$@" -executable -exec chmod 700 {} + +find "$@" ! -executable -exec chmod 600 {} + +find "$@" | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 27828e9..8e8abbf 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -1,17 +1,14 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip repackager export LC_ALL=C -ZIPFILE=`basename $1` +ZIPFILE_BASENAME=$(basename -- "${1:?}") +TEMPDIR=tmp-re-dzip-$$ +RE_DZIP=$(readlink -f -- "$(which -- "$0")") +PATH=$PATH:$(dirname "$RE_DZIP") -mkdir tmp_dzip -cd tmp_dzip -unzip ../$1 -[ -n "$REFERENCE_DATETIME" ] && \ - find . -exec touch --date="$REFERENCE_DATETIME" {} \; -find . -executable -exec chmod 700 {} \; -find . ! -executable -exec chmod 600 {} \; -find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE -mv $ZIPFILE ../$1 -cd .. -rm -rf tmp_dzip +mkdir "$TEMPDIR" +unzip $UNZIPOPTS -d "$TEMPDIR" -- "$1" || [ $? -lt 3 ] +(cd "$TEMPDIR"; dzip.sh ./"$ZIPFILE_BASENAME" .) +mv -- "$TEMPDIR"/"$ZIPFILE_BASENAME" "$1" +rm -rf "$TEMPDIR"

1 0