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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 28 Nov '20

28 Nov '20

commit bef5ad2136c91e1699156eeaa9eb4a2b7f30b20a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 28 16:18:01 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 07a2acbc59..b177284fa8 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1345,6 +1345,8 @@ msgid "" "Project name. Do not translate \"Onion\", however you can translate " "\"Browser\". Ex: Navegador Onion." msgstr "" +"Nom du projet. Ne traduisez pas \"Onion\", mais vous pouvez traduire " +"\"Navigateur\". Ex: Navegador Onion." #: https//support.torproject.org/glossary/onion-services/ #: (content/glossary/onion-services/contents+en.lrword.term) @@ -2606,6 +2608,8 @@ msgstr "" #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Don't open documents downloaded through Tor while online" msgstr "" +"### N'ouvrez pas les documents téléchargés via Tor tant que vous êtes " +"connectés" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2613,11 +2617,13 @@ msgid "" "Tor Browser will warn you before automatically opening documents that are " "handled by external applications." msgstr "" +"Le Navigateur Tor vous avertit avant d'ouvrir automatiquement les documents " +"gérés par des applications externes." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "**DO NOT IGNORE THIS WARNING**." -msgstr "" +msgstr "**N'ignorez pas cet avertissement**." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 28 Nov '20

28 Nov '20

commit 547325eaa1a4964950913d5c294d19e33501be2d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 28 15:45:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fr.po | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index d7015e6e7a..dafb037e8f 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -8,10 +8,10 @@ # Gus, 2020 # David Georges, 2020 # erinm, 2020 -# Emeric Vallespi <evallespi(a)protonmail.com>, 2020 # Cor l3ss <corl3ss(a)corl3ss.com>, 2020 # Silvio Fachinotti, 2020 # AO <ao(a)localizationlab.org>, 2020 +# Emeric Vallespi <evallespi(a)protonmail.com>, 2020 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-11-05 12:55+EST\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>, 2020\n" +"Last-Translator: Emeric Vallespi <evallespi(a)protonmail.com>, 2020\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5182,6 +5182,10 @@ msgid "" "you're going to install a Tor feature with someone during the interview, you" " may need to have it downloaded before the training." msgstr "" +"Gardez à l'esprit que vous n'aurez peut-être pas accès à Internet dans le " +"lieu, donc si vous prévoyez d'installer une fonctionnalité Tor avec " +"quelqu'un pendant l'entretien, vous devrez peut-être la télécharger avant la" +" formation." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -5198,6 +5202,13 @@ msgid "" "learned; 2. Tor project; and 3. Tor in general. It can also be questions - " "keep in mind that any feedback is a good feedback." msgstr "" +"Avant de terminer la formation, coordonnez la rétroaction avec le formateur." +" Vous devriez travailler ensemble pour distribuer des post-it au public, " +"vous pouvez donner à chaque participant des post-it d'une couleur différente" +" par question et leur demander de le remplir avec ce qu'ils pensent à propos" +" de : 1. le service qu'ils viennent de découvrir ; 2. Le Projet Tor ; et 3. " +"Tor en général. Il peut également s'agir de questions - gardez à l'esprit " +"que tout commentaire est une bonne rétroaction." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -5208,11 +5219,18 @@ msgid "" " a form at the end of the research, so we can get your address to send to " "you a researcher kit (t-shirt and stickers)." msgstr "" +"Il est très important pour nous de vous entendre ensuite. Nous voulons " +"savoir comment la formation et la recherche se sont passées pour vous, " +"comment nous pouvons améliorer notre assistante et aussi, si vous souhaitez " +"continuer à conduire des recherches sur les utilisateurs de Tor. Nous vous " +"demanderons de remplir un formulaire à la fin de la recherche, afin que nous" +" puissions obtenir votre adresse pour vous envoyer un kit de chercheur " +"(t-shirt et autocollants)." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) msgid "We hope to hear back from you very soon!" -msgstr "" +msgstr "Nous espérons avoir de vos nouvelles très bientôt !" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -5229,6 +5247,10 @@ msgid "" "would love to have another way to get the material you collected. You can " "take pictures or send your ´raw´ notes for us." msgstr "" +"Si vous pensez que vous n'aurez pas le temps de rassembler et de signaler " +"dans ce format, nous serions ravis de recevoir par un d'autres moyens les " +"contenus que vous avez collecté. Vous pouvez prendre des photos ou nous " +"envoyer vos notes \"brutes\"." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -5249,6 +5271,8 @@ msgid "" "There are plenty of documents online about how to run User Research, here " "you can find some of them:" msgstr "" +"Il existe de nombreux documents en ligne sur la façon de conduire une " +"recherche utilisateur, vous en trouverez ici quelques-uns :" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body)

1 0

[tpo/master] Add new Tor Browser version 10.0.5 (Android)
by sysrqb＠torproject.org 28 Nov '20

28 Nov '20

commit 569210d2989dac0b59bd1339621a4dc2e7d295d8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Nov 28 14:33:50 2020 +0000 Add new Tor Browser version 10.0.5 (Android) --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index c1300e00..0e5f07e3 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 10.0.5 win32 = 0.4.4.6 [torbrowser-android-stable] -version = 10.0.4 +version = 10.0.5 [torbrowser-alpha] version = 10.5a4

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 28 Nov '20

28 Nov '20

commit 9760261c0edeb6d025b3695d13bb1405e9a30e22 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 28 13:16:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+tr.po | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 9b51ced1d8..38df6e6038 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1152,6 +1152,9 @@ msgid "" "the option \"Provide a bridge I know,\" enter each bridge address on a " "separate line." msgstr "" +"\"Köprüler\" bölümünde, \"Bir köprü kullanılsın\" seçeneğini işaretleyin ve " +"\"Bildiğim Bir Köprüyü Kullanacağım\" seçeneğini seçip köprüleri her bir " +"köprü adresini ayrı bir satırda olacak şekilde yazın." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -2375,12 +2378,12 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.description) msgid "Learn about Tor for mobile devices" -msgstr "" +msgstr "Mobil aygıtlar için Tor hakkında ayrıntılı bilgiler" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### Tor Browser for Android" -msgstr "" +msgstr "### Android için Tor Browser" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2388,12 +2391,15 @@ msgid "" "Tor Browser for Android is the only official mobile browser supported and " "developed by the Tor Project." msgstr "" +"Android için Tor Browser, Tor Project tarafından geliştirilen ve desteklenen" +" tek resmi mobil tarayıcıdır." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "" "It is like the desktop Tor Browser, but for your Android mobile device." msgstr "" +"Masaüstü Tor Browser gibidir ancak Android mobil aygıtlarda kullanılır." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2402,6 +2408,9 @@ msgid "" "tracking across websites, defending against surveillance, resisting browser " "fingerprinting, and circumventing censorship." msgstr "" +"Android için Tor Browser uygulamasının öne çıkan bazı özellikleri: web " +"siteleri arasında izlemenin azaltılması, gözetime karşı korunma, web " +"tarayıcı parmak izinin alınmasını engelleme ve sansürü aşmadır." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 28 Nov '20

28 Nov '20

commit 0cb67904fb3e01dbd5d32862a722422cd2b48946 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 28 13:15:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 13efacf581..acff24c580 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -6,9 +6,9 @@ # Aydemir Ak <benbudunyadandegilimevladim(a)gmail.com>, 2020 # Gus, 2020 # erinm, 2020 -# Kaya Zeren <kayazeren(a)gmail.com>, 2020 # uskumru, 2020 # T. E. Kalayci <tekrei(a)gmail.com>, 2020 +# Kaya Zeren <kayazeren(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -16,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-11-05 12:55+EST\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>, 2020\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2020\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4833,7 +4833,7 @@ msgstr "" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) msgid "### Tor Browser for Android" -msgstr "" +msgstr "### Android için Tor Browser" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body)

1 0

[collector/master] Correctly index files that are moved away and back.
by karsten＠torproject.org 28 Nov '20

28 Nov '20

commit 42a0dd280924cdf1ad5c2be3c6c18536a197c88f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 28 11:14:21 2020 +0100 Correctly index files that are moved away and back. The indexer did not handle a (mostly theoretic) edge case of a file being moved away and then moved back shortly after. In such a case the file should not be marked for deletion anymore and it should be included in the index again. That's what this commit does. The other minor changes to unit tests are just cosmetic. Fixes #34030. --- .../metrics/collector/indexer/CreateIndexJson.java | 6 ++++++ .../collector/indexer/CreateIndexJsonTest.java | 23 +++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java index 6613e9f..3d86947 100644 --- a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java @@ -426,6 +426,12 @@ public class CreateIndexJson extends CollecTorMain { /* We do have index results, but we don't have a link yet, so we're * going to create a link. */ linksToCreate.put(linkPath, filePath); + if (null != fileNode.markedForDeletion) { + /* We had already marked the link for deletion, but given that the + * original file has returned, we're going to list this file again + * and not delete the link in the future. */ + fileNode.markedForDeletion = null; + } } else { String linkLastModified = dateTimeFormatter .format(Files.getLastModifiedTime(linkPath).toInstant()); diff --git a/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java b/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java index 9c01293..a176d27 100644 --- a/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java +++ b/src/test/java/org/torproject/metrics/collector/indexer/CreateIndexJsonTest.java @@ -404,8 +404,7 @@ public class CreateIndexJsonTest { createFile(recentExitListFilePath, Instant.parse("2016-09-20T13:02:00Z")); writeIndexJson(recentExitListIndexJsonString); startProcessing(firstExecution); - startProcessing(secondExecution); - assertEquals(recentExitListIndexJsonString, readIndexJson()); + assertTrue(this.indexerTasks.isEmpty()); } /** @@ -422,7 +421,6 @@ public class CreateIndexJsonTest { deleteFile(recentExitListFilePath); startProcessing(secondExecution); assertEquals(emptyIndexJsonString, readIndexJson()); - fileExists(recentExitListLinkPath); assertTrue(fileExists(recentExitListLinkPath)); startProcessing(thirdExecution); assertFalse(fileExists(recentExitListLinkPath)); @@ -518,5 +516,24 @@ public class CreateIndexJsonTest { startProcessing(thirdExecution); assertTrue(this.indexerTasks.isEmpty()); } + + /** + * Test whether a file that was previously contained in the index and deleted + * or moved away and that is later recreated or moved back to its original + * location is included in the index again and still has a corresponding link + * three hours later. + */ + @Test + public void testMoveBackFile() { + writeIndexJson(recentExitListIndexJsonString); + startProcessing(firstExecution); + createFile(recentExitListFilePath, Instant.parse("2016-09-20T13:02:00Z")); + startProcessing(secondExecution); + assertTrue(this.indexerTasks.isEmpty()); + assertTrue(Files.exists(recentExitListLinkPath)); + assertEquals(recentExitListIndexJsonString, readIndexJson()); + startProcessing(thirdExecution); + assertTrue(Files.exists(recentExitListLinkPath)); + } }

1 0

[collector/master] Fix minor issue with cleaning up directories.
by karsten＠torproject.org 28 Nov '20

28 Nov '20

commit cd15f3446376847f359040016fb95791dabfce15 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 28 11:10:30 2020 +0100 Fix minor issue with cleaning up directories. One of the previously made changes to cleaning up directories was that empty directories were deleted. This was necessary, because otherwise there would be a growing number of directories as files get deleted after reaching an age of seven weeks. However, this change should not have included deleting the cleaned up directory itself. In practice, this will not happen. But in tests it's certainly possible that a directory is empty and then gets deleted. This leads to all sorts of problems in tests. The fix is to limit deleting empty directories to subdirectories. That's what this commit does. --- .../org/torproject/metrics/collector/persist/PersistenceUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java index e787c39..2b7621d 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java +++ b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java @@ -132,7 +132,8 @@ public class PersistenceUtils { @Override public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - if (!Files.list(dir).findFirst().isPresent()) { + if (!pathToClean.equals(dir) + && !Files.list(dir).findFirst().isPresent()) { Files.delete(dir); } return FileVisitResult.CONTINUE;

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 28 Nov '20

28 Nov '20

commit b6aee26fd4ac21aed46d20e78888322ce215e1ef Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 28 09:16:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs.po b/cs.po index 68264b0834..c5b7c2f462 100644 --- a/cs.po +++ b/cs.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-11-16 10:33+0100\n" -"PO-Revision-Date: 2020-11-28 08:45+0000\n" +"PO-Revision-Date: 2020-11-28 08:46+0000\n" "Last-Translator: petr_gremlica <petr.gremlica(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 28 Nov '20

28 Nov '20

commit 31ae53ed4a1f3255bfb9bb18dc831020d9317910 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 28 09:15:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- cs.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cs.po b/cs.po index 43e76b5891..f527f9b228 100644 --- a/cs.po +++ b/cs.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-11-16 10:33+0100\n" -"PO-Revision-Date: 2020-11-28 08:45+0000\n" +"PO-Revision-Date: 2020-11-28 08:46+0000\n" "Last-Translator: petr_gremlica <petr.gremlica(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -1640,11 +1640,11 @@ msgstr "<i>Thunderbird</i> 78 nyní nahrazuje <i>Enigmail</i> rozšíření s in #: config/chroot_local-includes/usr/local/bin/thunderbird:44 msgid "_Open Migration Instructions" -msgstr "" +msgstr "_Otevřete pokyny k migraci" #: config/chroot_local-includes/usr/local/bin/thunderbird:45 msgid "_Migrate Later" -msgstr "" +msgstr "_Migrovat později" #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Tor is not ready"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 28 Nov '20

28 Nov '20

commit e9f2974db929f9e468f73739cf1821b32a900b6d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 28 08:46:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- cs.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cs.po b/cs.po index 5ecb7915fd..68264b0834 100644 --- a/cs.po +++ b/cs.po @@ -16,6 +16,7 @@ # Michal Vašíček <michalvasicek(a)icloud.com>, 2017 # multiflexi <multi.flexi(a)seznam.cz>, 2019 # e4c80bb921a3c296c143562260ee1dad_f42e1ae, 2014 +# petr_gremlica <petr.gremlica(a)gmail.com>, 2020 # Roman Ondráček <ondracek.roman(a)centrum.cz>, 2016 # 789a65649261a6c6e79de75af5171cc5_5587230, 2015 # 21efbac3a9def20c26f4869b16e85d8e_941b4b7 <039a9b1b0494d7365f3495af265a9a6d_318499>, 2015 @@ -24,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-11-16 10:33+0100\n" -"PO-Revision-Date: 2020-11-16 12:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-11-28 08:45+0000\n" +"Last-Translator: petr_gremlica <petr.gremlica(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0