- tbb-commits - lists.torproject.org

[torbutton/master] Translations update
by gk＠torproject.org 15 May '19

15 May '19

commit 999e5a388d4710330b2637618c76be8fb663b128 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:01:25 2019 +0000 Translations update --- src/chrome/locale/ar/aboutTor.dtd | 2 ++ src/chrome/locale/bn-BD/aboutTor.dtd | 2 ++ src/chrome/locale/ca/aboutTor.dtd | 2 ++ src/chrome/locale/cs/aboutTor.dtd | 2 ++ src/chrome/locale/da/aboutTor.dtd | 2 ++ src/chrome/locale/de/aboutTor.dtd | 2 ++ src/chrome/locale/el/aboutTor.dtd | 2 ++ src/chrome/locale/es-AR/aboutTor.dtd | 2 ++ src/chrome/locale/es-ES/aboutTor.dtd | 2 ++ src/chrome/locale/eu/aboutTor.dtd | 2 ++ src/chrome/locale/fa/aboutTor.dtd | 2 ++ src/chrome/locale/fr/aboutTor.dtd | 2 ++ src/chrome/locale/ga-IE/aboutTor.dtd | 2 ++ src/chrome/locale/he/aboutTor.dtd | 2 ++ src/chrome/locale/hu/aboutTor.dtd | 2 ++ src/chrome/locale/id/aboutTor.dtd | 2 ++ src/chrome/locale/is/aboutTor.dtd | 2 ++ src/chrome/locale/it/aboutTor.dtd | 2 ++ src/chrome/locale/ja/aboutTor.dtd | 2 ++ src/chrome/locale/ka/aboutTor.dtd | 2 ++ src/chrome/locale/ko/aboutTor.dtd | 2 ++ src/chrome/locale/nb-NO/aboutTor.dtd | 2 ++ src/chrome/locale/nl/aboutTor.dtd | 2 ++ src/chrome/locale/pl/aboutTor.dtd | 2 ++ src/chrome/locale/pt-BR/aboutTor.dtd | 2 ++ src/chrome/locale/ru/aboutTor.dtd | 2 ++ src/chrome/locale/sv-SE/aboutTor.dtd | 2 ++ src/chrome/locale/tr/aboutTor.dtd | 2 ++ src/chrome/locale/vi/aboutTor.dtd | 2 ++ src/chrome/locale/zh-CN/aboutTor.dtd | 2 ++ src/chrome/locale/zh-TW/aboutTor.dtd | 2 ++ 31 files changed, 62 insertions(+) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 16702c40..6f8460d3 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> +<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور."> +<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd index 7d40f0d0..76bc83da 100644 --- a/src/chrome/locale/bn-BD/aboutTor.dtd +++ b/src/chrome/locale/bn-BD/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "টর থেকে পাওয়া সর্বশেষ সব খবর সরাসরি আপনার ইনবক্সে দেখুন।"> <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> +<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। "> +<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index 1de2ee85..fd501f7b 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor directament a la safata d'entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Fes que Tor segueixi fort."> +<!ENTITY aboutTor.donationBanner.buttonA "Fes una donació"> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 860aa13c..06e411e5 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Nechte si posílat nejnovější informace o Toru."> <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> +<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit."> +<!ENTITY aboutTor.donationBanner.buttonA "Přispějte"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 499fa13a..6fba4caf 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> +<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk."> +<!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index dcb397ef..1263d928 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang."> <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> +<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark."> +<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index b5f39d50..1d23b6bb 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό."> +<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> diff --git a/src/chrome/locale/es-AR/aboutTor.dtd b/src/chrome/locale/es-AR/aboutTor.dtd index ec4cb73f..552db139 100644 --- a/src/chrome/locale/es-AR/aboutTor.dtd +++ b/src/chrome/locale/es-AR/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibí las últimas noticias de Tor derecho en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> diff --git a/src/chrome/locale/es-ES/aboutTor.dtd b/src/chrome/locale/es-ES/aboutTor.dtd index 1b1fb3df..aff6157d 100644 --- a/src/chrome/locale/es-ES/aboutTor.dtd +++ b/src/chrome/locale/es-ES/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 9ee3eb08..e73e755a 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara"> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 5cc12782..c097eb75 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "آخرین اخبار تور را در صندوق ورودی خود دریافت کنید."> <!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار تور."> +<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید."> +<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index ded5c16f..04cc2a61 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> +<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> diff --git a/src/chrome/locale/ga-IE/aboutTor.dtd b/src/chrome/locale/ga-IE/aboutTor.dtd index 8522b5cb..7f2f5d82 100644 --- a/src/chrome/locale/ga-IE/aboutTor.dtd +++ b/src/chrome/locale/ga-IE/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is déanaí maidir le Tor i do bhosca isteach."> <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index 471d2b8d..5f1efea6 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך."> <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> +<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק."> +<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index 3b8522de..a2b39bd1 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor híreket közvetlenül email fiókjába."> <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez."> +<!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erősnek."> +<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 1c265201..8e7691f7 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke inbox Anda."> <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index e54ee49b..2ee6f8d7 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> +<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku"> +<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index fb65f139..cc32558b 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 2ba4a9f7..339848eb 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Torからの最新ニュースを受信トレイに。"> <!ENTITY aboutTor.newsletter.link_text "Torニュースにを申し込む。"> +<!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。"> +<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index bdf92b30..144ae7e5 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "მიიღეთ სიახლეები Tor-ისგან, პირდაპირ თქვენს საფოსტო ყუთში."> <!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები."> +<!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი."> +<!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 0ae8263e..0e6b1748 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/nb-NO/aboutTor.dtd b/src/chrome/locale/nb-NO/aboutTor.dtd index 8fb5ba56..1b77d88d 100644 --- a/src/chrome/locale/nb-NO/aboutTor.dtd +++ b/src/chrome/locale/nb-NO/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de siste nyhetene fra Tor rett til innboksen din."> <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index db4f75ce..dc688d98 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste nieuws van Tor direct in uw postvak."> <!ENTITY aboutTor.newsletter.link_text "Meld u aan voor Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk."> +<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu"> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index dbade396..b2d905f9 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Otrzymuj najnowsze newsy o Tor, prosto do swojej skrzynki."> <!ENTITY aboutTor.newsletter.link_text "Zapisz się na Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Utrzymuj Tor silnym."> +<!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 5199560f..62792d16 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -29,3 +29,5 @@ <!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 981cc3b6..fddd66c7 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> +<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> diff --git a/src/chrome/locale/sv-SE/aboutTor.dtd b/src/chrome/locale/sv-SE/aboutTor.dtd index 68aa9bc5..d403bb76 100644 --- a/src/chrome/locale/sv-SE/aboutTor.dtd +++ b/src/chrome/locale/sv-SE/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> <!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> +<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark."> +<!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 9e540252..e11d658c 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin."> <!ENTITY aboutTor.newsletter.link_text "Tor Haber Bültenine Abone Olun"> +<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koruyalım."> +<!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 179102fb..c43ce61d 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> +<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 8c879049..33ea8eb4 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> +<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> +<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index 40cd6453..964a87e9 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">

1 0

[tor-launcher/master] Merge branch 'bug_30319_v2'
by gk＠torproject.org 14 May '19

14 May '19

commit 125c745b8d6dfd04251e7ad2e610aeb539e49fd3 Merge: 864170b cce75d8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 14:16:05 2019 +0000 Merge branch 'bug_30319_v2' src/modules/tl-bridgedb.jsm | 1 - 1 file changed, 1 deletion(-)

1 0

[tor-launcher/master] Bug 30139: Remove FTE bits
by gk＠torproject.org 14 May '19

14 May '19

commit cce75d8cbe1456b050097ff5a05205c986030a5f Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 10 11:04:23 2019 +0000 Bug 30139: Remove FTE bits --- src/modules/tl-bridgedb.jsm | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index bc9b300..de580bc 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -122,7 +122,6 @@ _MoatRequestor.prototype = // // aTransports is an array of transport strings. Supported values: // "vanilla" - // "fte" // "obfs3" // "obfs4" // "scramblesuit"

1 0

[tor-browser-build/master] Bug 30319: Drop FTE releated bits
by boklm＠torproject.org 14 May '19

14 May '19

commit 055266551e5a8e56ca4ea9ec1c3eebe0fb1bba4e Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 13:51:25 2019 +0000 Bug 30319: Drop FTE releated bits Clean up our LICENSE file as well. --- keyring/obfsproxy.gpg | Bin 2215 -> 0 bytes keyring/pyptlib.gpg | Bin 2215 -> 0 bytes keyring/winpython.gpg | Bin 1167 -> 0 bytes projects/argparse/build | 15 -- projects/argparse/config | 19 -- projects/fteproxy/build | 19 -- projects/fteproxy/config | 24 -- projects/fteproxy/fteproxy.wrapper | 10 - projects/gmp/build | 18 -- projects/gmp/config | 20 -- projects/libfte/build | 31 --- projects/libfte/config | 43 ---- projects/obfsproxy/build | 27 -- projects/obfsproxy/config | 38 --- projects/parsley/build | 16 -- projects/parsley/config | 19 -- projects/pycrypto/build | 25 -- projects/pycrypto/config | 38 --- projects/pyptlib/build | 16 -- projects/pyptlib/config | 21 -- projects/pyyaml/build | 16 -- projects/pyyaml/config | 19 -- .../Docs/Licenses/PluggableTransports/LICENSE | 278 --------------------- .../PTConfigs/linux/torrc-defaults-appendix | 3 - projects/tor-browser/build | 20 +- projects/tor-browser/config | 3 - projects/twisted/build | 22 -- projects/twisted/config | 39 --- projects/txsocksx/build | 21 -- projects/txsocksx/config | 19 -- projects/zope.interface/build | 16 -- projects/zope.interface/config | 19 -- rbm.conf | 3 - 33 files changed, 5 insertions(+), 872 deletions(-) diff --git a/keyring/obfsproxy.gpg b/keyring/obfsproxy.gpg deleted file mode 100644 index 4381baa..0000000 Binary files a/keyring/obfsproxy.gpg and /dev/null differ diff --git a/keyring/pyptlib.gpg b/keyring/pyptlib.gpg deleted file mode 100644 index 4381baa..0000000 Binary files a/keyring/pyptlib.gpg and /dev/null differ diff --git a/keyring/winpython.gpg b/keyring/winpython.gpg deleted file mode 100644 index 97abdc1..0000000 Binary files a/keyring/winpython.gpg and /dev/null differ diff --git a/projects/argparse/build b/projects/argparse/build deleted file mode 100644 index 3170601..0000000 --- a/projects/argparse/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -python2 setup.py build --build-lib build -cp -a build/argparse.py $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/argparse/config b/projects/argparse/config deleted file mode 100644 index 87f80b0..0000000 --- a/projects/argparse/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 1.2.1 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/a/argparse/argparse-[% c("version") %].tar.gz' - sha256sum: ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/projects/fteproxy/build b/projects/fteproxy/build deleted file mode 100644 index ea37d05..0000000 --- a/projects/fteproxy/build +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR $DOCSDIR -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/libfte') %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper -chmod +x $PTDIR/fteproxy.wrapper -cp -a bin/fteproxy $PTDIR/fteproxy.bin -cp -ra fteproxy $PTDIR/ -cp -a {COPYING,README.md} $DOCSDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fteproxy/config b/projects/fteproxy/config deleted file mode 100644 index 9f797c5..0000000 --- a/projects/fteproxy/config +++ /dev/null @@ -1,24 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/kpdyer/fteproxy.git -# tag 0.2.19 -git_hash: 597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - project: libfte - name: libfte - - filename: fteproxy.wrapper - enable: '[% c("var/linux") %]' diff --git a/projects/fteproxy/fteproxy.wrapper b/projects/fteproxy/fteproxy.wrapper deleted file mode 100644 index ca10086..0000000 --- a/projects/fteproxy/fteproxy.wrapper +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -basedir=$(dirname "$0") -libdir=$(cd "$basedir"/fteproxy-lib ; pwd) -if test -z "$LD_LIBRARY_PATH" -then - export LD_LIBRARY_PATH="$libdir" -else - export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH" -fi -exec "$basedir/fteproxy.bin" "$@" diff --git a/projects/gmp/build b/projects/gmp/build deleted file mode 100644 index 2752afe..0000000 --- a/projects/gmp/build +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.bz2 -cd /var/tmp/build/[% project %]-[% c('version') %] -# Even if we are not shipping libgmpxx anymore we still need --enable-xcc -# during compile time. -./configure --disable-static --enable-shared --enable-cxx \ - [% c("var/configure_opt") %] [% c("var/configure_opt_gmp") %] --prefix=$distdir -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/gmp/config b/projects/gmp/config deleted file mode 100644 index 41eb630..0000000 --- a/projects/gmp/config +++ /dev/null @@ -1,20 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 5.1.3 - -var: - container: - use_container: 1 - -targets: - linux: - var: - configure_opt_gmp: --enable-fat - -input_files: - - project: container-image - - name: gmp - URL: 'https://ftp.gnu.org/gnu/gmp/gmp-[% c("version") %].tar.bz2' - sha256sum: 752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' diff --git a/projects/libfte/build b/projects/libfte/build deleted file mode 100644 index 638df7a..0000000 --- a/projects/libfte/build +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% c("var/setarch") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR $DOCSDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %] -ln -s /var/tmp/dist/gmp thirdparty/gmp -mkdir -p $distdir -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] -[% IF c("var/linux-i686") -%] - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] -export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] -make -cp -ra fte $PTDIR/ -mkdir -p $PTDIR/fteproxy-lib -cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib -cp -a {LICENSE,README.md} $DOCSDIR/ -cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/libfte/config b/projects/libfte/config deleted file mode 100644 index 365ad81..0000000 --- a/projects/libfte/config +++ /dev/null @@ -1,43 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/kpdyer/libfte.git -git_hash: 85ef8ae58dbf0d02ea26b627e343784b5574c428 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux-x86_64: - var: - arch_deps: - - python-setuptools - - python-dev - - linux-i686: - var: - pre_pkginst: | - dpkg --add-architecture i386 - # python2.7:i386 cannot be installed because the mime-support package - # in wheezy is not marked "Multi-Arch: foreign": - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 - # We fix this by installing the jessie mime-support package. - wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… - echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c - dpkg -i mime-support_3.58_all.deb - post_pkginst: | - export DEBIAN_FRONTEND=noninteractive - apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 - apt-get install -q -y hardening-wrapper - apt-get download -q -y python-setuptools python-pkg-resources - dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: gmp - name: gmp - - project: obfsproxy - name: obfsproxy diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build deleted file mode 100644 index 46f9b7a..0000000 --- a/projects/obfsproxy/build +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR $DOCSDIR -mkdir -p $distdir -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pycrypto') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/twisted') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/argparse') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/parsley') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyptlib') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyyaml') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/txsocksx') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/zope.interface') %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/obfsproxy $PTDIR/ -cp -a bin/obfsproxy $PTDIR/obfsproxy.bin -cp -a {LICENSE,README} $DOCSDIR -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config deleted file mode 100644 index 9616eed..0000000 --- a/projects/obfsproxy/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.2.12 -git_url: https://git.torproject.org/pluggable-transports/obfsproxy.git -git_hash: 'obfsproxy-[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: obfsproxy.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - DOCSDIR_project: Obfsproxy - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - project: pycrypto - name: pycrypto - - project: twisted - name: twisted - - project: argparse - name: argparse - - project: parsley - name: parsley - - project: pyptlib - name: pyptlib - - project: pyyaml - name: pyyaml - - project: txsocksx - name: txsocksx - - project: zope.interface - name: zope.interface diff --git a/projects/parsley/build b/projects/parsley/build deleted file mode 100644 index e32060b..0000000 --- a/projects/parsley/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/Parsley-[% c('version') %].tar.gz -cd /var/tmp/build/Parsley-[% c('version') %] -PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/parsley.py build/ometa build/terml $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/parsley/config b/projects/parsley/config deleted file mode 100644 index 72d5bfc..0000000 --- a/projects/parsley/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 1.2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/P/Parsley/Parsley-[% c("version") %].tar.gz' - sha256sum: 50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 diff --git a/projects/pycrypto/build b/projects/pycrypto/build deleted file mode 100644 index 3162296..0000000 --- a/projects/pycrypto/build +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -[% c("var/set_default_env") -%] -[% c("var/setarch") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/linux-i686") -%] - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] -export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] -./configure --build=i686-linux-gnu [% c("var/configure_opt") %] -$PYTHON setup.py build --build-lib build -cp -a build/Crypto $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/pycrypto/config b/projects/pycrypto/config deleted file mode 100644 index 56fe397..0000000 --- a/projects/pycrypto/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2.6.1 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 - -targets: - linux-x86_64: - var: - arch_deps: - - python-dev - - python-setuptools - - linux-i686: - var: - pre_pkginst: | - dpkg --add-architecture i386 - # python2.7:i386 cannot be installed because the mime-support package - # in wheezy is not marked "Multi-Arch: foreign": - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 - # We fix this by installing the jessie mime-support package. - wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… - echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c - dpkg -i mime-support_3.58_all.deb - post_pkginst: | - export DEBIAN_FRONTEND=noninteractive - apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 - apt-get install -q -y hardening-wrapper - apt-get download -q -y python-setuptools python-pkg-resources - dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - URL: 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-[% c("version") %].tar.gz' - sha256sum: f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/projects/pyptlib/build b/projects/pyptlib/build deleted file mode 100644 index 1dc0c07..0000000 --- a/projects/pyptlib/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/pyptlib $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/pyptlib/config b/projects/pyptlib/config deleted file mode 100644 index e8ca100..0000000 --- a/projects/pyptlib/config +++ /dev/null @@ -1,21 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.0.6 -git_url: https://git.torproject.org/pluggable-transports/pyptlib.git -git_hash: 'pyptlib-[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: pyptlib.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image diff --git a/projects/pyyaml/build b/projects/pyyaml/build deleted file mode 100644 index c10855c..0000000 --- a/projects/pyyaml/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/PyYAML-[% c('version') %].tar.gz -cd /var/tmp/build/PyYAML-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/yaml $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/pyyaml/config b/projects/pyyaml/config deleted file mode 100644 index 5324c10..0000000 --- a/projects/pyyaml/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 3.11 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-[% c("version") %].tar.gz' - sha256sum: c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE index c6efd2c..8bf0661 100644 --- a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE +++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE @@ -145,284 +145,6 @@ OpenSSL =============================================================================== -M2Crypto - -Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. - -Portions copyright (c) 2004-2006 Open Source Applications Foundation. -All rights reserved. - -Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. -All rights reserved. - -Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation. - -THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=============================================================================== - -py2exe - -Windows binary packages are built using py2exe. - -Copyright (c) 2000-2008 Thomas Heller, Mark Hammond, Jimmy Retzlaff - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -=============================================================================== - -pyptlib - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - - * Neither the names of the copyright owners nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=============================================================================== - -PyCrypto - -To the best of our knowledge, with the exceptions noted below or -within the files themselves, the files that constitute PyCrypto are in -the public domain. Most are distributed with the following notice: - - The contents of this file are dedicated to the public domain. To - the extent that dedication to the public domain is not available, - everyone is granted a worldwide, perpetual, royalty-free, - non-exclusive license to exercise all rights associated with the - contents of this file for any purpose whatsoever. - No rights are reserved. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - -Exceptions: - - - Portions of HMAC.py and setup.py are derived from Python 2.2, and - are therefore Copyright (c) 2001, 2002, 2003 Python Software - Foundation (All Rights Reserved). They are licensed by the PSF - under the terms of the Python 2.2 license. (See the file - LEGAL/copy/LICENSE.python-2.2 for details.) - - - The various GNU autotools (autoconf, automake, aclocal, etc.) are - used during the build process. This includes macros from - autoconf-archive, which are located in the m4/ directory. As is - customary, some files from the GNU autotools are included in the - source tree (in the root directory, and in the build-aux/ - directory). These files are merely part of the build process, and - are not included in binary builds of the software. - -EXPORT RESTRICTIONS: - -Note that the export or re-export of cryptographic software and/or -source code may be subject to regulation in your jurisdiction. - -=============================================================================== - -Twisted - -Copyright (c) 2001-2013 -Allen Short -Andy Gayton -Andrew Bennetts -Antoine Pitrou -Apple Computer, Inc. -Benjamin Bruheim -Bob Ippolito -Canonical Limited -Christopher Armstrong -David Reid -Donovan Preston -Eric Mangold -Eyal Lotem -Itamar Turner-Trauring -James Knight -Jason A. Mobarak -Jean-Paul Calderone -Jessica McKellar -Jonathan Jacobs -Jonathan Lange -Jonathan D. Simms -Jürgen Hermann -Kevin Horn -Kevin Turner -Mary Gardiner -Matthew Lefkowitz -Massachusetts Institute of Technology -Moshe Zadka -Paul Swartz -Pavel Pergamenshchik -Ralph Meijer -Sean Riley -Software Freedom Conservancy -Travis B. Hartwell -Thijs Triemstra -Thomas Herve -Timothy Allen - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -=============================================================================== - -zope.interface - -# Copyright (c) 2006 Zope Corporation and Contributors. -# All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. - -Zope Public License (ZPL) Version 2.1 -------------------------------------- - -A copyright notice accompanies this license document that -identifies the copyright holders. - -This license has been certified as open source. It has also -been designated as GPL compatible by the Free Software -Foundation (FSF). - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: - -1. Redistributions in source code must retain the - accompanying copyright notice, this list of conditions, - and the following disclaimer. - -2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - -3. Names of the copyright holders must not be used to - endorse or promote products derived from this software - without prior written permission from the copyright - holders. - -4. The right to distribute this software or to use it for - any purpose does not give you the right to use - Servicemarks (sm) or Trademarks (tm) of the copyright - holders. Use of them is covered by separate agreement - with the copyright holders. - -5. If any files are modified, you must cause the modified - files to carry prominent notices stating that you changed - the files and the date of any change. - -Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' - AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT - NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - NO EVENT SHALL THE COPYRIGHT HOLDERS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. - -=============================================================================== - -argparse - -argparse is (c) 2006-2009 Steven J. Bethard <steven.bethard(a)gmail.com>. - -The argparse module was contributed to Python as of Python 2.7 and thus -was licensed under the Python license. Same license applies to all files in -the argparse package project. - -For details about the Python License, please see LICENSE.PYTHON. - -=============================================================================== - goptlib To the extent possible under law, the authors have dedicated all diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d9988fb..75d5c5e 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,6 +1,3 @@ -## fteproxy configuration -ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed - ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 45dbb53..1f155d1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -60,10 +60,6 @@ mv "$TBDIR/meek-http-helper(a)bamsoftware.com.xpi" "$TBDIR/$MEEKPROFILEPATH/extens tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] [% END -%] -[% IF c("var/fteproxy") -%] - tar -C "$TBDIR" -xf [% c('input_files_by_name/fteproxy') %] -[% END -%] - tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] [% IF c("var/linux") %] @@ -119,24 +115,18 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -[% IF c("var/linux") -%] +[% IF c("var/linux") || c("var/osx") -%] [% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$GENERATEDPREFSPATH" + >> "$GENERATEDPREFSPATH" [% ELSE %] cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" [% END %] [% END -%] [% IF c("var/windows") -%] - # We don't have snowflake and FTE available on Windows (yet). - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js | \ - grep -v 'default_bridge\.fte' >> "$GENERATEDPREFSPATH" -[% END -%] -[% IF c("var/osx") -%] - # FTE is temporarily removed due to bug 18495. - grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ - [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ - >> "$GENERATEDPREFSPATH" + # We don't have snowflake available on Windows (yet). + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + >> "$GENERATEDPREFSPATH" [% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index ad382e2..ee62944 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,9 +74,6 @@ input_files: - project: obfs4 name: obfs4 enable: '[% ! c("var/android") %]' - - project: fteproxy - name: fteproxy - enable: '[% c("var/fteproxy") %]' - project: snowflake name: snowflake enable: '[% c("var/snowflake") %]' diff --git a/projects/twisted/build b/projects/twisted/build deleted file mode 100644 index 3ce2eb0..0000000 --- a/projects/twisted/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 -cd /var/tmp/build/Twisted-[% c('version') %] -[% IF c("var/linux-i686") -%] - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] -export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] -$PYTHON setup.py build --build-lib build -cp -a build/twisted $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/twisted/config b/projects/twisted/config deleted file mode 100644 index bbe3fc5..0000000 --- a/projects/twisted/config +++ /dev/null @@ -1,39 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 13.2.0 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux-x86_64: - var: - arch_deps: - - python-setuptools - - python-dev - - linux-i686: - var: - pre_pkginst: | - dpkg --add-architecture i386 - # python2.7:i386 cannot be installed because the mime-support package - # in wheezy is not marked "Multi-Arch: foreign": - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 - # We fix this by installing the jessie mime-support package. - wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… - echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c - dpkg -i mime-support_3.58_all.deb - post_pkginst: | - export DEBIAN_FRONTEND=noninteractive - apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 - apt-get install -q -y hardening-wrapper - apt-get download -q -y python-setuptools python-pkg-resources - dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2' - sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' diff --git a/projects/txsocksx/build b/projects/txsocksx/build deleted file mode 100644 index 3491a26..0000000 --- a/projects/txsocksx/build +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -# Let's pretend we have the setup dependency already as we don't want to get -# it downloaded during building. Just pretending and thus avoiding another -# dependency should be fine here as txsocksx catches the exception due to -# missing __version__ and __sha__ . -mkdir vcversioner-1.14.1.1-py2.7.egg -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/txsocksx $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/txsocksx/config b/projects/txsocksx/config deleted file mode 100644 index 6142943..0000000 --- a/projects/txsocksx/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/habnabit/txsocksx.git -git_hash: 216eb0894a1755872f4789f9458aa6cf543b8433 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image diff --git a/projects/zope.interface/build b/projects/zope.interface/build deleted file mode 100644 index 23501a3..0000000 --- a/projects/zope.interface/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -unzip -d /var/tmp/build $rootdir/[% project %]-[% c('version') %].zip -cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/zope $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/zope.interface/config b/projects/zope.interface/config deleted file mode 100644 index 9743b79..0000000 --- a/projects/zope.interface/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 4.0.5 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-[% c("version") %].zip' - sha256sum: 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc diff --git a/rbm.conf b/rbm.conf index 2202776..b6b2acf 100644 --- a/rbm.conf +++ b/rbm.conf @@ -196,7 +196,6 @@ targets: # API 16 is the minimum we currently support for Tor Browser on Android android_min_api: 16 snowflake: 0 - fteproxy: 0 container: suite: stretch arch: amd64 @@ -237,7 +236,6 @@ targets: # We only build snowflake for linux and macOS on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - fteproxy: 1 container: suite: wheezy arch: amd64 @@ -297,7 +295,6 @@ targets: LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 - fteproxy: 0 deps: - build-essential - python

1 0

[tor-browser-build/master] Merge branch 'bug_29641'
by gk＠torproject.org 14 May '19

14 May '19

commit dd098db690092cba90a315853d624b5bf1cd97fe Merge: da3351f f75cf0b Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 13:47:47 2019 +0000 Merge branch 'bug_29641' projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults | 1 + projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 1 + projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults | 1 + 3 files changed, 3 insertions(+)

1 0

[tor-browser-build/master] Bug 29641: Try to connect over IPv6 if needed
by gk＠torproject.org 14 May '19

14 May '19

commit f75cf0bd2e1c4cef96a31e266da4a0385e5f2016 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 9 08:57:31 2019 +0000 Bug 29641: Try to connect over IPv6 if needed --- projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults | 1 + projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 1 + projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults | 1 + 3 files changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults b/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults index f3645cd..d0c074e 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -13,3 +13,4 @@ AvoidDiskWrites 1 Log notice stdout CookieAuthentication 1 DormantCanceledByStartup 1 +ClientAutoIPv6ORPort 1 diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index f3645cd..d0c074e 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -13,3 +13,4 @@ AvoidDiskWrites 1 Log notice stdout CookieAuthentication 1 DormantCanceledByStartup 1 +ClientAutoIPv6ORPort 1 diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults b/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults index f3645cd..d0c074e 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -13,3 +13,4 @@ AvoidDiskWrites 1 Log notice stdout CookieAuthentication 1 DormantCanceledByStartup 1 +ClientAutoIPv6ORPort 1

1 0

[torbutton/master] Merge branch 'bug_30497'
by gk＠torproject.org 14 May '19

14 May '19

commit 28afffe498ddfd8db2190a285fa5662ecb33e802 Merge: b7813fdc fd4c553c Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 13:40:51 2019 +0000 Merge branch 'bug_30497' src/chrome/content/aboutTor/aboutTor.xhtml | 3 +++ src/chrome/locale/en-US/aboutTor.dtd | 2 ++ 2 files changed, 5 insertions(+)

1 0

[torbutton/master] Bug 30497: Add donation text and link
by gk＠torproject.org 14 May '19

14 May '19

commit fd4c553ca957e3116f4905d2ad5e765d61bfc4e0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 07:05:07 2019 +0000 Bug 30497: Add donation text and link --- src/chrome/content/aboutTor/aboutTor.xhtml | 3 +++ src/chrome/locale/en-US/aboutTor.dtd | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 0789f851..4736f653 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -72,6 +72,9 @@ window.addEventListener("pageshow", function() { </div> <div id="bottom"> + <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.line2e; + <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> + </p> <p id="manual" class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label; <a id="manualLink" target="_blank">&aboutTor.torbrowser_user_manual_link.label;</a></p> <p id="newsletter" class="moreInfoLink"><img class="imageStyle" src="resource://torbutton-assets/icon-newsletter.png"/><br/>&aboutTor.newsletter.tagline;<br/> diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 4f360a91..c4273ad2 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">

1 0

[tor-browser-build/master] Bug 30503: Don't clean alpha builds in nightly builds
by boklm＠torproject.org 14 May '19

14 May '19

commit da3351fbb60f4ed456504d2bd9114002ad6e9210 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue May 14 11:58:54 2019 +0200 Bug 30503: Don't clean alpha builds in nightly builds --- tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf index fcd6b34..f83d8f3 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -63,10 +63,6 @@ var: HEAD: - project: release target: - - alpha - - torbrowser-all - - project: release - target: - nightly - torbrowser-all #

1 0

[torbutton/master] Translations update
by gk＠torproject.org 14 May '19

14 May '19

commit b7813fdc6c7163dc5923937e2ba86a7e091b14dd Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 09:03:00 2019 +0000 Translations update --- src/chrome/locale/da/browserOnboarding.properties | 8 +++---- src/chrome/locale/fa/browserOnboarding.properties | 26 +++++++++++----------- src/chrome/locale/fr/aboutDialog.dtd | 2 +- src/chrome/locale/fr/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/fr/browserOnboarding.properties | 22 +++++++++--------- src/chrome/locale/fr/securityLevel.properties | 4 ++-- src/chrome/locale/fr/torbutton.dtd | 2 +- src/chrome/locale/fr/torbutton.properties | 2 +- src/chrome/locale/is/securityLevel.properties | 2 +- .../locale/sv-SE/browserOnboarding.properties | 2 +- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties index 36b9bbe6..815c42bf 100644 --- a/src/chrome/locale/da/browserOnboarding.properties +++ b/src/chrome/locale/da/browserOnboarding.properties @@ -34,11 +34,11 @@ onboarding.tour-tor-expect-differences=Oplevelesestips onboarding.tour-tor-expect-differences.title=Forvent nogen forskelle. onboarding.tour-tor-expect-differences.description=Med alle de sikkerheds- og privatlivsfunktionaliteter som gives af Tor, kan din oplevelse på internettet være lidt anderledes. Ting man være lidt langsommere, og afhængig af dit sikkerhedsniveau, kan det være at nogle elementer ikke virker eller ikke indlæses. Du bliver måske også spurgt om du er et menneske eller en robot. onboarding.tour-tor-expect-differences.button=Se FAQ'er -onboarding.tour-tor-expect-differences.next-button=Gå til Onion-tjenester +onboarding.tour-tor-expect-differences.next-button=Gå til Oniontjenester -onboarding.tour-tor-onion-services=Onion-tjenester +onboarding.tour-tor-onion-services=Oniontjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. -onboarding.tour-tor-onion-services.description=Onion-tjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Onion-tjenester giver alle mulighed for at levere indhold og tjenester anonymt. Klik nedenfor for at besøge DuckDuckGo's onion-sted. +onboarding.tour-tor-onion-services.description=Oniontjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Oniontjenester giver alle mulighed for at levere indhold og tjenester anonymt. Klik nedenfor for at besøge DuckDuckGo's onionsted. onboarding.tour-tor-onion-services.button=Besøg et onion onboarding.tour-tor-onion-services.next-button=Fuldført @@ -62,7 +62,7 @@ onboarding.tor-circuit-display.two-of-three=2 af 3 onboarding.tor-circuit-display.three-of-three=3 af 3 onboarding.tor-circuit-display.intro.title=Hvordan virker kredsløb? -onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giver dig mulighed for at bruge internettet privat og at oprette forbindelse til onion-tjenester. +onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giver dig mulighed for at bruge internettet privat og at oprette forbindelse til oniontjenester. onboarding.tor-circuit-display.diagram.title=Kredsløb-visning onboarding.tor-circuit-display.diagram.msg=Diagrammet viser relæene som opgør kredsløbet til webstedet. For at forhindre sammenkædning af aktivitet på tværs af forskellige steder, så får hvert websted et andet kredsløb. diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties index 936163a5..7607ec10 100644 --- a/src/chrome/locale/fa/browserOnboarding.properties +++ b/src/chrome/locale/fa/browserOnboarding.properties @@ -5,7 +5,7 @@ onboarding.tour-tor-welcome=خوش آمدید onboarding.tour-tor-welcome.title=شما آماده هستید. onboarding.tour-tor-welcome.description=مرورگر تور در هنگام مرورگری وب بالاترین استاندارد در حریم شخصی و امنیت را به شما ارائه می‌دهد. شما حالا در برابر ردیابی, زیرنظر داشتن و سانسور محافظت می‌شوید. چگونگی این امر توسط این پذیرش سازمانی سریع به شما نشان داده خواهد شد. -onboarding.tour-tor-welcome.next-button=Go to Privacy +onboarding.tour-tor-welcome.next-button=برو به حریم خصوصی onboarding.tour-tor-privacy=حریم خصوصی onboarding.tour-tor-privacy.title=بو کشنده ها و جاسوس ها @@ -21,20 +21,20 @@ onboarding.tour-tor-circuit-display=نمایش جریان onboarding.tour-tor-circuit-display.title=مسیر خود را ببینید. onboarding.tour-tor-circuit-display.description=برای هر دامنه که بازدید می‌کنید، ترافیک شما در جریانی از سه رله‌ی تور در سراسر جهان رمزگذاری می‌شود. وبسایت مورد نظر نمی‌داند که شما از کجا ارتباط را برقرار کرده‌اید. شما می‌توانید درخواست یک جریان جدید را با کلیک بر 'جریان جدید برای این سایت' در بخش نمایش جریان داشته باشید. onboarding.tour-tor-circuit-display.button=مشاهده مسیر من -onboarding.tour-tor-circuit-display.next-button=Go to Security +onboarding.tour-tor-circuit-display.next-button=برو به امنیت onboarding.tour-tor-security=امنیت onboarding.tour-tor-security.title=انتخاب تجربه‌ی شما onboarding.tour-tor-security.description=همچنین ما تنظیمات اضافی برای بالا بردن امنیت مرورگر شما فراهم کرده‌ایم. تنظیمات امنیت ما به شما اجازه می‌دهد تا اجزایی که ممکن است برای حمله به رایانه شما استفاده شوند را مسدود کنید. برای مشاهده‌ی گزینه‌های مختلفی که وجود دارد، پایین را کلیک کنید. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +onboarding.tour-tor-security.description-suffix=نکته: به طور پیش فرض، NoScript و HTTPS در همه جا در نوار ابزار گنجانده نشده است، اما می‌توانید نوار ابزار خود را برای افزودن آن‌ها سفارشی کنید. onboarding.tour-tor-security-level.button=سطح امنیت خود را مشاهده نمایید -onboarding.tour-tor-security-level.next-button=Go to Experience Tips +onboarding.tour-tor-security-level.next-button=برو به نکات تجربه onboarding.tour-tor-expect-differences=نکات تجربه onboarding.tour-tor-expect-differences.title=انتظار برخی تفاوت‌ها را داشته باشید. onboarding.tour-tor-expect-differences.description=با تمام امکانات امنیت و حریم خصوصی که تور فراهم کرده، تجربه شما در حال استفاده از اینترنت ممکن است کمی متفاوت باشد. همه چیز ممکن است کمی آهسته‌تر باشد و بسته به سطح امنیت شما بعضی اجزا ممکن است کار نکنند یا بارگیری نشوند. ممکن است گاها از شما درخواست شود که انسان بودن و ربات نبودن خود را اثبات کنید. onboarding.tour-tor-expect-differences.button=مشاهده پرسشگان -onboarding.tour-tor-expect-differences.next-button=Go to Onion Services +onboarding.tour-tor-expect-differences.next-button=به خدمات پیازی بروید onboarding.tour-tor-onion-services=خدمات پیازی onboarding.tour-tor-onion-services.title=بیشتر محافظت شوید. @@ -42,17 +42,17 @@ onboarding.tour-tor-onion-services.description=خدمات پیازی وبگاه onboarding.tour-tor-onion-services.button=یک پیاز را ملاقات کنید. onboarding.tour-tor-onion-services.next-button=انجام شد -onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S +onboarding.overlay-icon-tooltip-updated2=ببینید چه چیزی جدید است\nدر %S onboarding.tour-tor-update.prefix-new=جدید -onboarding.tour-tor-update.prefix-updated=Updated +onboarding.tour-tor-update.prefix-updated=به‌روزرسانی شد -onboarding.tour-tor-toolbar=Toolbar -onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout -onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. -onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security +onboarding.tour-tor-toolbar=نوار ابزار +onboarding.tour-tor-toolbar-update-8.5.title=طرح بندی نوار ابزار +onboarding.tour-tor-toolbar-update-8.5.description=ما طرح نوار ابزار مرورگر را بهبود بخشیدیم. نماد دکمه‌تور را بعد از نوار آدرس اینترنتی منتقل کردیم و یک نماد سطح امنیت در کنار آن اضافه کردیم. +onboarding.tour-tor-toolbar-update-8.5.next-button=برو به امنیت -onboarding.tour-tor-security-update-8.5.title=Security level experience -onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. +onboarding.tour-tor-security-update-8.5.title=تجربه سطح امنیت +onboarding.tour-tor-security-update-8.5.description=ما بهبود یافته‌ایم و شما سطح امنیت خود را می‌توانید تنظیم کنید. نوار لغزنده امنیت را با یک نماد نوار ابزار جایگزین کردیم که سطح فعلی شما را در همه زمان‌ها قابل مشاهده است. برای مشاهده اطلاعات بیشتر در مورد سطح فعلی خود و یا تغییر تنظیمات امنیت خود، روی آن کلیک کنید. # Circuit Display onboarding. onboarding.tor-circuit-display.next=بعدی diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd index 7c561c09..6630cd94 100644 --- a/src/chrome/locale/fr/aboutDialog.dtd +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -16,4 +16,4 @@ <!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !">  <!ENTITY bottomLinks.license "Renseignements relatifs à la licence"> -<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques de commerce de « The Projet Tor, Inc. »"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Onion » sont des marques de commerce de « The Projet Tor, Inc. »"> diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index 5cacaad9..95ce0249 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.changelogTitle "Journal des changements du Navigateur Tor"> -<!ENTITY aboutTBUpdate.updated "Le navigateur Tor a été mis à jour."> -<!ENTITY aboutTBUpdate.linkPrefix "Pour obtenir les renseignements les plus à jour au sujet de cette version,"> +<!ENTITY aboutTBUpdate.updated "Le Navigateur Tor a été mis à jour."> +<!ENTITY aboutTBUpdate.linkPrefix "Pour obtenir les renseignements les plus à jour au sujet de cette version, "> <!ENTITY aboutTBUpdate.linkLabel "visitez notre site Web"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Version"> diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties index 403a0f4e..8ebbdb33 100644 --- a/src/chrome/locale/fr/browserOnboarding.properties +++ b/src/chrome/locale/fr/browserOnboarding.properties @@ -4,41 +4,41 @@ onboarding.tour-tor-welcome=Bienvenue onboarding.tour-tor-welcome.title=Vous êtes prêts. -onboarding.tour-tor-welcome.description=Le Navigateur Tor offre le plus haut niveau de confidentialité et de sécurité quand vous parcourez le Web. Vous êtes maintenant protégé contre le pistage, la surveillance et la censure. Cette introduction rapide vous montrera comment faire. -onboarding.tour-tor-welcome.next-button=Aller vers Confidentialité +onboarding.tour-tor-welcome.description=Le Navigateur Tor offre le plus haut niveau de confidentialité et de sécurité quand vous parcourez le Web. Vous êtes maintenant protégé contre le pistage, la surveillance et la censure. Cette présentation rapide vous montrera comment faire. +onboarding.tour-tor-welcome.next-button=Poursuivre vers Confidentialité onboarding.tour-tor-privacy=Confidentialité onboarding.tour-tor-privacy.title=Repoussez les traqueurs et les fouineurs. onboarding.tour-tor-privacy.description=Le Navigateur Tor isole les témoins et supprime l’historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour découvrir comment nous vous protégeons au niveau du réseau. -onboarding.tour-tor-privacy.button=Aller vers Réseau Tor +onboarding.tour-tor-privacy.button=Poursuivre vers Réseau Tor onboarding.tour-tor-network=Réseau Tor onboarding.tour-tor-network.title=Naviguez sur un réseau décentralisé. onboarding.tour-tor-network.description=Le Navigateur Tor vous connecte au réseau Tor exploité par des milliers de bénévoles dans le monde entier. Contrairement à un RPV, il n’y a pas de point de défaillance unique ou d’entité centralisée auxquels vous devez faire confiance pour profiter d’Internet en toute confidentialité. -onboarding.tour-tor-network.button=Aller vers Affichage des circuits +onboarding.tour-tor-network.button=Poursuivre vers Affichage des circuits onboarding.tour-tor-circuit-display=Affichage des circuits onboarding.tour-tor-circuit-display.title=Visualisez votre chemin. -onboarding.tour-tor-circuit-display.description=Pour chaque domaine que vous visitez, votre trafic est relayé et chiffré dans un circuit passant par trois relais Tor disséminés de par le monde. Aucun site Web ne sait d’où vous vous connectez. Vous pouvez demander un nouveau circuit en cliquant sur « Nouveau circuit Tor pour ce site » dans votre Affichage des circuits. +onboarding.tour-tor-circuit-display.description=Pour chaque domaine que vous visitez, votre trafic est relayé et chiffré dans un circuit passant par trois relais Tor disséminés de par le monde. Aucun site Web ne sait d’où vous vous connectez. Vous pouvez demander un nouveau circuit en cliquant sur « Nouveau circuit Tor pour ce site » dans notre Affichage des circuits. onboarding.tour-tor-circuit-display.button=Visualiser mon chemin -onboarding.tour-tor-circuit-display.next-button=Aller vers Sécurité +onboarding.tour-tor-circuit-display.next-button=Poursuivre vers Sécurité onboarding.tour-tor-security=Sécurité onboarding.tour-tor-security.title=Choisissez votre expérience. onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent. onboarding.tour-tor-security.description-suffix=Note : Par défaut, NoScript et HTTPS partout n’apparaissent pas dans la barre d’outils, mais vous pouvez la personnaliser pour les ajouter. onboarding.tour-tor-security-level.button=Voir votre niveau de sécurité -onboarding.tour-tor-security-level.next-button=Aller vers Conseils sur l’expérience +onboarding.tour-tor-security-level.next-button=Poursuivre vers Conseils sur l’expérience onboarding.tour-tor-expect-differences=Conseils sur l’expérience onboarding.tour-tor-expect-differences.title=Attendez-vous à des différences. onboarding.tour-tor-expect-differences.description=Avec toutes les fonctions de sécurité et de confidentialité offertes par Tor, votre expérience de navigation sur Internet pourrait être un peu différente. Les choses pourraient être un peu plus lentes et selon votre niveau de sécurité, certains éléments pourraient ne pas fonctionner ou ne pas se charger. On pourrait aussi vous demander de prouver que vous êtes un humain et non un robot. onboarding.tour-tor-expect-differences.button=Consulter les FAQ -onboarding.tour-tor-expect-differences.next-button=Aller vers Services Onion +onboarding.tour-tor-expect-differences.next-button=Poursuivre vers Services onion -onboarding.tour-tor-onion-services=Les services onion +onboarding.tour-tor-onion-services=Services onion onboarding.tour-tor-onion-services.title=Soyez plus que protégé. -onboarding.tour-tor-onion-services.description=Les services onion sont des sites se terminant par .onion qui offrent des protections accrues aux diffuseurs et aux visiteurs, dont des mesures de protection contre la censure. Les services onion permettent à tous de proposer anonymement du contenu et des services. Cliquez ci-dessous pour visiter le site onion de DuckDuckGo. +onboarding.tour-tor-onion-services.description=Les services onion sont des sites qui se terminent par .onion. Ils offrent des protections accrues aux diffuseurs et aux visiteurs, dont des mesures de protection contre la censure. Les services onion permettent à tous de proposer anonymement du contenu et des services. Cliquez ci-dessous pour visiter le site onion de DuckDuckGo. onboarding.tour-tor-onion-services.button=Visiter un Onion onboarding.tour-tor-onion-services.next-button=Terminé @@ -62,7 +62,7 @@ onboarding.tor-circuit-display.two-of-three=2 de 3 onboarding.tor-circuit-display.three-of-three=3 de 3 onboarding.tor-circuit-display.intro.title=Comment les circuits fonctionnent-ils ? -onboarding.tor-circuit-display.intro.msg=Les circuits sont composés de relais attribués au hasard et qui sont des ordinateurs disséminés dans le monde entier et configurés pour acheminer le trafic de Tor. +onboarding.tor-circuit-display.intro.msg=Les circuits sont composés de relais attribués au hasard. Ce sont des ordinateurs disséminés dans le monde entier, configurés pour acheminer le trafic de Tor. onboarding.tor-circuit-display.diagram.title=Affichage des circuits onboarding.tor-circuit-display.diagram.msg=Ce diagramme affiche les relais qui composent le circuit de ce site Web. Pour empêcher de relier l’activité d’un site à l’autre, chaque site Web obtient un circuit différent. diff --git a/src/chrome/locale/fr/securityLevel.properties b/src/chrome/locale/fr/securityLevel.properties index f0106a9e..99d19fbe 100644 --- a/src/chrome/locale/fr/securityLevel.properties +++ b/src/chrome/locale/fr/securityLevel.properties @@ -2,7 +2,7 @@ securityLevel.securityLevel = Niveau de sécurité securityLevel.customWarning = Personnalisé securityLevel.overview = Désactive certaines fonctions Web qui peuvent être utilisées pour attaquer votre sécurité et votre anonymat. securityLevel.standard.level = Normal -securityLevel.standard.tooltip = Niveau de sûreté : normal +securityLevel.standard.tooltip = Niveau de sécurité : normal securityLevel.standard.summary = Toutes les fonctions du Navigateur Tor et des sites Web sont activées. securityLevel.safer.level = Plus sûr securityLevel.safer.tooltip = Niveau de sécurité : plus sûr @@ -12,7 +12,7 @@ securityLevel.safer.description2 = Certaines polices et certains symboles mathé securityLevel.safer.description3 = Le son et la vidéo (médias HTML5) sont « cliquer pour lire ». securityLevel.safest.level = Le plus sûr securityLevel.safest.tooltip = Niveau de sécurité : le plus sûr -securityLevel.safest.summary = Ne permettre que les fonctions de sites Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts. +securityLevel.safest.summary = Ne permet que les fonctions de sites Web exigées pour les sites statiques et les services de base. Ces changements affectent les images, les médias et les scripts. securityLevel.safest.description1 = JavaScript est désactivé par défaut pour tous les sites. securityLevel.safest.description2 = Certaines polices, icônes, images et certains symboles mathématiques sont désactivés. securityLevel.safest.description3 = Le son et la vidéo (médias HTML5) sont « cliquer pour lire ». diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index ea4e0246..d56508bb 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -29,7 +29,7 @@ <!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web."> <!ENTITY torbutton.prefs.sec_safer_list_label "Au réglage Plus sûr :"> <!ENTITY torbutton.prefs.sec_safest_label "Le plus sûr"> -<!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de sites Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "Ne permet que les fonctions de sites Web exigées pour les sites statiques et les services de base. Ces changements affectent les images, les médias et les scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Au réglage Le plus sûr :"> <!ENTITY torbutton.prefs.sec_learn_more_label "En apprendre davantage"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé pour les sites non HTTPS."> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 3731d87d..846dac04 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -6,7 +6,7 @@ torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu torbutton.circuit_display.guard = garde -torbutton.circuit_display.guard_note = Votre nœud de [Guard] ne peut pas changer. +torbutton.circuit_display.guard_note = Votre nœud de [garde] ne peut pas changer. torbutton.circuit_display.learn_more = En apprendre davantage torbutton.content_sizer.margin_tooltip = Le Navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l’on vous suive à la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor diff --git a/src/chrome/locale/is/securityLevel.properties b/src/chrome/locale/is/securityLevel.properties index 98ed0e4a..50c66702 100644 --- a/src/chrome/locale/is/securityLevel.properties +++ b/src/chrome/locale/is/securityLevel.properties @@ -16,7 +16,7 @@ securityLevel.safest.summary = Leyfir aðeins þá eiginleika vefsvæða sem kra securityLevel.safest.description1 = JavaScript er sjálfgefið óvirkt á öllum vefsvæðum. securityLevel.safest.description2 = Sumt letur, táknmyndir, myndir og stærðfræðitákn eru óvirk. securityLevel.safest.description3 = Hljóð og myndskeið (HTML5-gagnamiðla) þarf að smella á til að spila. -securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. +securityLevel.custom.summary = Sérsniðnar kjörstillingar vafrans þíns valda mjög óvenjulegum öryggisstillingum. Til að uppfylla sem best öryggi og gagnaleynd, mælum við með því að þú veljir eitt af sjálfgefnum öryggisstigum. securityLevel.learnMore = Fræðast frekar securityLevel.restoreDefaults = Frumstilla á sjálfgefið securityLevel.advancedSecuritySettings = Ítarlegar öryggisstillingar… diff --git a/src/chrome/locale/sv-SE/browserOnboarding.properties b/src/chrome/locale/sv-SE/browserOnboarding.properties index 82290a84..61779ce7 100644 --- a/src/chrome/locale/sv-SE/browserOnboarding.properties +++ b/src/chrome/locale/sv-SE/browserOnboarding.properties @@ -28,7 +28,7 @@ onboarding.tour-tor-security.title=Välj din upplevelse. onboarding.tour-tor-security.description=Vi ger dig också ytterligare inställningar för att stöta upp din webbläsares säkerhet. Våra säkerhetsinställningar kan du blockera element som kan användas för att attackera din dator. Klicka nedan för att se vad de olika alternativen gör. onboarding.tour-tor-security.description-suffix=Observera: Som standard ingår inte NoScript och HTTPS Everywhere i verktygsfältet, men du kan anpassa verktygsfältet för att lägga till dem. onboarding.tour-tor-security-level.button=Se din säkerhetsnivå -onboarding.tour-tor-security-level.next-button=Go to Experience Tips +onboarding.tour-tor-security-level.next-button=Gå till Erfarenhets tips onboarding.tour-tor-expect-differences=Erfarenhets tips onboarding.tour-tor-expect-differences.title=Förvänta dig vissa skillnader.

1 0