- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit 726047a459acf9d8c26fcfdd72584f0196dd60ce Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Sep 27 19:37:42 2019 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 15563 - Disable ServiceWorkers on all platforms --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 09386d32a12c..1b936a3beb3d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -119,6 +119,9 @@ pref("browser.pocket.api", ""); pref("browser.pocket.site", ""); pref("network.http.referer.hideOnionSource", true); +// Disable ServiceWorkers by default +pref("dom.serviceWorkers.enabled", false); + // Fingerprinting pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true);

1 0

[tor-browser-build/master] Bug 29187: Bump NSIS to 3.04
by boklm＠torproject.org 27 Sep '19

27 Sep '19

commit 936f5d7ad170e4d0dddc141906f006a6273196c8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 28 09:24:01 2019 +0000 Bug 29187: Bump NSIS to 3.04 --- projects/nsis/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/nsis/config b/projects/nsis/config index 81273ab..0e6f7ad 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.03 +version: 3.04 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,7 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' - sha256sum: abae7f4488bc6de7a4dd760d5f0e7cd3aad7747d4d7cd85786697c8991695eaa + sha256sum: 609536046c50f35cfd909dd7df2ab38f2e835d0da3c1048aa0d48c59c5a4f4f5 - filename: no-insert-timestamp.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]'

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Update Torbutton to latest master
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit 13e5b02421dd03a5625091847608dd832466d98e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 27 19:29:49 2019 +0000 Update Torbutton to latest master --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 2abe720e3f1d..a85133e2dc52 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 2abe720e3f1dbe1b49b41fe78719f318407babd0 +Subproject commit a85133e2dc52c707f936857402d4753d961c30f9

1 0

[torbutton/master] Update translations
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit a85133e2dc52c707f936857402d4753d961c30f9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 27 19:27:45 2019 +0000 Update translations --- chrome/locale/ar/torbutton.dtd | 2 +- chrome/locale/bn-BD/torbutton.dtd | 6 +++--- chrome/locale/ca/torbutton.dtd | 4 ++-- chrome/locale/el/torbutton.dtd | 2 +- chrome/locale/es-AR/torbutton.dtd | 8 ++++---- chrome/locale/fa/torbutton.dtd | 4 ++-- chrome/locale/fr/torbutton.dtd | 4 ++-- chrome/locale/he/torbutton.dtd | 10 +++++----- chrome/locale/id/torbutton.dtd | 6 +++--- chrome/locale/ja/aboutTor.dtd | 8 ++++---- chrome/locale/ja/torbutton.dtd | 10 +++++----- chrome/locale/ja/torbutton.properties | 4 ++-- chrome/locale/ko/torbutton.dtd | 14 +++++++------- chrome/locale/mk/torbutton.dtd | 6 +++--- chrome/locale/nl/torbutton.dtd | 10 +++++----- chrome/locale/pt-BR/torbutton.dtd | 2 +- chrome/locale/ro/torbutton.dtd | 3 ++- chrome/locale/ru/torbutton.dtd | 2 +- chrome/locale/tr/torbutton.dtd | 2 +- chrome/locale/zh-TW/torbutton.dtd | 6 +++--- 20 files changed, 57 insertions(+), 56 deletions(-) diff --git a/chrome/locale/ar/torbutton.dtd b/chrome/locale/ar/torbutton.dtd index 015fddfa..ec8a3c9c 100644 --- a/chrome/locale/ar/torbutton.dtd +++ b/chrome/locale/ar/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "الأكثر أمنا"> <!ENTITY torbutton.prefs.sec_safest_description "اسمح فقط بالخصائص المطلوبة للمواقع غير الديناميكية والخدمات الأساسية. تؤثر هذه التغييرات على الصور والوسائط والنصوص البرمجية."> <!ENTITY torbutton.prefs.sec_safest_list_label "في الإعداد الأكثر أمنا:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "تعرف على المزيد"> +<!ENTITY torbutton.prefs.sec_learn_more_label "تعرّف على المزيد"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "تعطل جافا سكربت على المواقع التي لا تستخدم HTTPS"> <!ENTITY torbutton.prefs.sec_js_disabled "تعطل جافا سكربت مبدئيا على جميع المواقع."> <!ENTITY torbutton.prefs.sec_limit_typography "تعطّل بعض الخطوط والرموز الرياضية."> diff --git a/chrome/locale/bn-BD/torbutton.dtd b/chrome/locale/bn-BD/torbutton.dtd index 118a4866..cd7491ed 100644 --- a/chrome/locale/bn-BD/torbutton.dtd +++ b/chrome/locale/bn-BD/torbutton.dtd @@ -28,15 +28,15 @@ <!ENTITY torbutton.prefs.sec_safer_label "নিরাপদ"> <!ENTITY torbutton.prefs.sec_safer_description "ওয়েবসাইটের বৈশিষ্ট্যগুলি প্রায়ই বিপজ্জনক করে, যা কিছু সাইটগুলি কার্যকারিতা হারাতে বাধা দেয়।"> <!ENTITY torbutton.prefs.sec_safer_list_label "নিরাপদ সেটিংসে:"> -<!ENTITY torbutton.prefs.sec_safest_label "সবচে’ নিরাপদ"> +<!ENTITY torbutton.prefs.sec_safest_label "নিরাপদ"> <!ENTITY torbutton.prefs.sec_safest_description "শুধুমাত্র স্থায়ী সাইট এবং মৌলিক পরিষেবাগুলির জন্য প্রয়োজনীয় ওয়েবসাইট বৈশিষ্ট্যগুলি মঞ্জুরি দেয় এই পরিবর্তনগুলি ইমেজ, মিডিয়া এবং স্ক্রিপ্টগুলি প্রভাবিত করে।"> <!ENTITY torbutton.prefs.sec_safest_list_label "নিরাপদ সেটিং এ:"> <!ENTITY torbutton.prefs.sec_learn_more_label "আরও জানুন"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Non-HTTPS সাইটগুলিতে জাভাস্ক্রিপ্ট অক্ষম করা আছে।"> -<!ENTITY torbutton.prefs.sec_js_disabled "স্বয়ংক্রিয়ভাবে সকল সাইটে জাভাস্ক্রিপ্ট নিষ্ক্রিয়কৃত।"> +<!ENTITY torbutton.prefs.sec_js_disabled "জাভাস্ক্রিপ্ট সব সাইটে ডিফল্ট দ্বারা নিষ্ক্রিয় করা হয়।"> <!ENTITY torbutton.prefs.sec_limit_typography "কিছু ফন্ট এবং গণিত চিহ্ন অক্ষম আছে।"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "কিছু ফন্ট, আইকন, গণিত প্রতীক এবং ছবি অক্ষম রয়েছে।"> -<!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও ও ভিডিও (এইচটিএমএল5 মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন"> +<!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও ও ভিডিও (এইচটিএমএল৫ মিডিয়া) এবং ওয়েবজিএলসমুহ ক্লিক করে সচল করুন"> <!ENTITY torbutton.prefs.sec_custom_warning "পছন্দসই"> <!ENTITY torbutton.prefs.sec_overview "আপনার নিরাপত্তা এবং গোপনীয়তা আক্রমণ করতে ব্যবহার করা যেতে পারে এমন কিছু ওয়েব বৈশিষ্ট্য অক্ষম করুন।"> <!ENTITY torbutton.prefs.sec_standard_tooltip "নিরাপত্তা স্তর: স্ট্যান্ডার্ড"> diff --git a/chrome/locale/ca/torbutton.dtd b/chrome/locale/ca/torbutton.dtd index e7434a76..4d4c2790 100644 --- a/chrome/locale/ca/torbutton.dtd +++ b/chrome/locale/ca/torbutton.dtd @@ -25,13 +25,13 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "El control lliscant de seguretat permet deshabilitar característiques del navegador que poden permetre vulnerabilitats en atemptats de furoners."> <!ENTITY torbutton.prefs.sec_standard_label "Estàndard"> <!ENTITY torbutton.prefs.sec_standard_description "Totes les característiques del buscador Tor i de la pàgina web estan actives."> -<!ENTITY torbutton.prefs.sec_safer_label "Més segur"> +<!ENTITY torbutton.prefs.sec_safer_label "Més segur."> <!ENTITY torbutton.prefs.sec_safer_description "Desactivar les funcions del lloc web que sovint són perilloses, pot fent que alguns llocs perden funcionalitat."> <!ENTITY torbutton.prefs.sec_safer_list_label "A la configuració més segura:"> <!ENTITY torbutton.prefs.sec_safest_label "més segur"> <!ENTITY torbutton.prefs.sec_safest_description "Només es permeten funcions del lloc web requerides per a llocs estàtics i serveis bàsics. Aquests canvis afecten imatges, mitjans de comunicació i scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "A la configuració més segura:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Aprèn més"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Apreneu-ne més"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "El JavaScript està desactivat per defecte en tots els llocs no-HTTPS"> <!ENTITY torbutton.prefs.sec_js_disabled "El JavaScript està desactivat per defecte a tots els llocs."> <!ENTITY torbutton.prefs.sec_limit_typography "Algunes fonts i símbols matemàtics estan desactivats. "> diff --git a/chrome/locale/el/torbutton.dtd b/chrome/locale/el/torbutton.dtd index d2e51f99..7c5deb34 100644 --- a/chrome/locale/el/torbutton.dtd +++ b/chrome/locale/el/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Ασφαλέστατο"> <!ENTITY torbutton.prefs.sec_safest_description "Επιτρέπει μόνο τις παροχές ιστοσελίδας που απαιτούνται για βασικές ιστοσελίδες και υπηρεσίες. Αυτό επηρεάζει εικόνες, μέσα και scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Στην πιο ασφαλή ρύθμιση:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Μάθε περισσότερα"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Μάθετε περισσότερα"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Η JavaScript είναι απενεργοποιημένη σε ιστότοπους που δεν είναι HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "Η JavaScript είναι απενεργοποιημένη σε όλους τους ιστότοπους ως προεπιλογή."> <!ENTITY torbutton.prefs.sec_limit_typography "Μερικές γραμματοσειρές και μαθηματικά σύμβολα είναι απενεργοποιημένα."> diff --git a/chrome/locale/es-AR/torbutton.dtd b/chrome/locale/es-AR/torbutton.dtd index b45d0e84..8adc028a 100644 --- a/chrome/locale/es-AR/torbutton.dtd +++ b/chrome/locale/es-AR/torbutton.dtd @@ -21,17 +21,17 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas "> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies"> -<!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad"> +<!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad"> <!ENTITY torbutton.prefs.sec_caption_tooltip "La regla deslizante de Seguridad te deja deshabilitar ciertas características del navegador que pueden hacerlo más vulnerable a intentos de apropiación."> <!ENTITY torbutton.prefs.sec_standard_label "Estándar"> -<!ENTITY torbutton.prefs.sec_standard_description "Todas las características del Navegador Tor y el sitio web están habilitadas."> +<!ENTITY torbutton.prefs.sec_standard_description "Todas las características del navegador Tor y el sitio web están habilitadas."> <!ENTITY torbutton.prefs.sec_safer_label "Más seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Deshabilita características del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad."> <!ENTITY torbutton.prefs.sec_safer_list_label "En el ajuste "Más seguro":"> -<!ENTITY torbutton.prefs.sec_safest_label "El más seguro"> +<!ENTITY torbutton.prefs.sec_safest_label "En extremo seguro"> <!ENTITY torbutton.prefs.sec_safest_description "Sólo permite características del sitio web requeridas por sitios estáticos y servicios básicos. Estos cambios afectan imágenes, medios y código ejecutable."> <!ENTITY torbutton.prefs.sec_safest_list_label "En el ajuste "En extremo seguro":"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Aprendé más"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Más informacion"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está deshabilitado en sitios no-HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está deshabilitado por defecto en todos los sitios."> <!ENTITY torbutton.prefs.sec_limit_typography "Algunos tipos de letra y símbolos matemáticos están deshabilitados."> diff --git a/chrome/locale/fa/torbutton.dtd b/chrome/locale/fa/torbutton.dtd index 5883e8ef..93daabb0 100644 --- a/chrome/locale/fa/torbutton.dtd +++ b/chrome/locale/fa/torbutton.dtd @@ -25,10 +25,10 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "نوار لغزنده امنیتی به شما اجازه می‌دهد که مشخصه‌های خاص مرورگر را غیرفعال کنید که ممکن است مرورگر شما را در برابر تلاش‌های هک آسیب‌پذیر سازد."> <!ENTITY torbutton.prefs.sec_standard_label "استاندارد"> <!ENTITY torbutton.prefs.sec_standard_description "همه مرورگر تور و ویژگی‌های وبسایت به کار انداخته شده‌اند."> -<!ENTITY torbutton.prefs.sec_safer_label "ایمن تر"> +<!ENTITY torbutton.prefs.sec_safer_label "ایمن تر "> <!ENTITY torbutton.prefs.sec_safer_description "از کار انداختن ویژگی‌های وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایت‌ها می‌شوند."> <!ENTITY torbutton.prefs.sec_safer_list_label "تنظیم مکانی امن‌تر:"> -<!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین"> +<!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین "> <!ENTITY torbutton.prefs.sec_safest_description "تنها اجازه می‌دهد که ویژگی‌های وبسایت برای سایت‌های ایستا و خدمات پایه مورد نیاز باشد. این تغییرات بر تصاویر، رسانه‌ها و متن تاثیر می‌گذارند."> <!ENTITY torbutton.prefs.sec_safest_list_label "تنظیم امن‌ترین مکان"> <!ENTITY torbutton.prefs.sec_learn_more_label "اطلاعات بیشتر"> diff --git a/chrome/locale/fr/torbutton.dtd b/chrome/locale/fr/torbutton.dtd index ed86525a..68d9b5f8 100644 --- a/chrome/locale/fr/torbutton.dtd +++ b/chrome/locale/fr/torbutton.dtd @@ -38,12 +38,12 @@ <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Certaines polices, icônes, images et certains symboles mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Le son et la vidéo (médias HTML5) ainsi que WebGL sont « cliquer pour lire »."> <!ENTITY torbutton.prefs.sec_custom_warning "Personnalisé"> -<!ENTITY torbutton.prefs.sec_overview "Désactive certaines fonctions Web qui peuvent être utilisées pour attaquer votre sécurité et votre anonymat."> +<!ENTITY torbutton.prefs.sec_overview "Désactives certaines fonctions Web qui peuvent être utilisées pour attaquer votre sécurité et votre anonymat."> <!ENTITY torbutton.prefs.sec_standard_tooltip "Niveau de sécurité : normal"> <!ENTITY torbutton.prefs.sec_safer_tooltip "Niveau de sécurité : plus sûr"> <!ENTITY torbutton.prefs.sec_safest_tooltip "Niveau de sécurité : le plus sûr"> <!ENTITY torbutton.prefs.sec_custom_summary "Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des données personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut."> <!ENTITY torbutton.prefs.sec_restore_defaults "Rétablir les paramètres par défaut"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Paramètres de sécurité avancés…"> -<!ENTITY torbutton.circuit_display.title "Circuit Tor"> +<!ENTITY torbutton.circuit_display.title "Circuit Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Nouveau circuit pour ce site"> diff --git a/chrome/locale/he/torbutton.dtd b/chrome/locale/he/torbutton.dtd index 77527559..befc9fdc 100644 --- a/chrome/locale/he/torbutton.dtd +++ b/chrome/locale/he/torbutton.dtd @@ -23,12 +23,12 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "אל תגן על עוגיות חדשות"> <!ENTITY torbutton.prefs.sec_caption "רמת אבטחה"> <!ENTITY torbutton.prefs.sec_caption_tooltip "מחוון האבטחה נותן לך להשבית תכונות דפדפן מסוימות אשר עלולות לעשות את הדפדפן שלך יותר פגיע לנסיונות פיצוח."> -<!ENTITY torbutton.prefs.sec_standard_label "תקנית"> -<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מאופשרים."> -<!ENTITY torbutton.prefs.sec_safer_label "בטוחה יותר"> +<!ENTITY torbutton.prefs.sec_standard_label "תקני"> +<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מושבתים."> +<!ENTITY torbutton.prefs.sec_safer_label "בטוח יותר"> <!ENTITY torbutton.prefs.sec_safer_description "משבית מאפייני אתר שמסוכנים לעיתים קרובות, מה שגורם למספר אתרים לאבד תפקודיות."> <!ENTITY torbutton.prefs.sec_safer_list_label "בהגדרה הבטוחה יותר:"> -<!ENTITY torbutton.prefs.sec_safest_label "הכי בטוחה"> +<!ENTITY torbutton.prefs.sec_safest_label "הכי בטוח"> <!ENTITY torbutton.prefs.sec_safest_description "מתיר רק למאפייני אתר הדרושים עבור אתרים נייחים ושירותים יסודיים. שינויים אלו משפיעים על תמונות, מדיה ותסריטים."> <!ENTITY torbutton.prefs.sec_safest_list_label "בהגדרה הבטוחה ביותר:"> <!ENTITY torbutton.prefs.sec_learn_more_label "למד עוד"> @@ -36,7 +36,7 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript מושבת כברירת מחדל בכל האתרים."> <!ENTITY torbutton.prefs.sec_limit_typography "מספר גופנים וסמלים מתמטיים מושבתים."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "מספר גופנים, צלמיות, סמלים מתמטיים ותמונות מושבתים."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "שמע, וידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "שמע ווידיאו (מדית HTML5) ו־WebGL הם לחץ־כדי־לנגן."> <!ENTITY torbutton.prefs.sec_custom_warning "מותאמת אישית"> <!ENTITY torbutton.prefs.sec_overview "השבת מאפייני אתר מסוימים אשר יכולים לשמש כדי לתקוף את אבטחתך ואלמוניותך."> <!ENTITY torbutton.prefs.sec_standard_tooltip "רמת אבטחה: תקנית"> diff --git a/chrome/locale/id/torbutton.dtd b/chrome/locale/id/torbutton.dtd index 414a7554..4d0aa1e7 100644 --- a/chrome/locale/id/torbutton.dtd +++ b/chrome/locale/id/torbutton.dtd @@ -29,11 +29,11 @@ <!ENTITY torbutton.prefs.sec_safer_description "Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas."> <!ENTITY torbutton.prefs.sec_safer_list_label "Di pengaturan yang lebih aman:"> <!ENTITY torbutton.prefs.sec_safest_label "Paling aman"> -<!ENTITY torbutton.prefs.sec_safest_description "Hanya mengizinkan fitur-fitur situs web yang diperlukan untuk menjalankan situs web statis dan layanan dasar. Perubahan ini mempengaruhi gambar, media, dan skrip."> +<!ENTITY torbutton.prefs.sec_safest_description "Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip."> <!ENTITY torbutton.prefs.sec_safest_list_label "Di pengaturan yang paling aman:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari Selengkapnya"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari lebih lanjut"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript dinonaktifkan di semua situs non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara bawaan di semua situs."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara default di semua situs."> <!ENTITY torbutton.prefs.sec_limit_typography "Beberapa font dan simbol matematika dinonaktifkan."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio dan video (media HTML5), dan WebGL dijalankan saat diklik."> diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd index 339848eb..b657853f 100644 --- a/chrome/locale/ja/aboutTor.dtd +++ b/chrome/locale/ja/aboutTor.dtd @@ -22,11 +22,11 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser マニュアル"> -<!ENTITY aboutTor.tor_mission.label "Torプロジェクトはフリーオープンソース匿名性やプライバシーソフトウェアの開発と展開によって人権や自由の向上に尽力するUS 501(c)(3)非営利団体である。ソフトウェアへの無制限アクセスと利用をサポート、そしてその科学的と国民の理解を深めたいと思います。"> -<!ENTITY aboutTor.getInvolved.label "参加しよう！»"> +<!ENTITY aboutTor.tor_mission.label "Tor Project はフリー・オープンソースの匿名性技術・プライバシー技術の開発と展開によって人権と自由を向上し、その制限されない有効性と利用を支援し、また、人々の正確な理解を促進している US 501(c)(3) 非営利団体です。"> +<!ENTITY aboutTor.getInvolved.label "参加しよう »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Torからの最新ニュースを受信トレイに。"> -<!ENTITY aboutTor.newsletter.link_text "Torニュースにを申し込む。"> +<!ENTITY aboutTor.newsletter.tagline "Tor からの最新ニュースを受信トレイに。"> +<!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。"> <!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。"> <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> diff --git a/chrome/locale/ja/torbutton.dtd b/chrome/locale/ja/torbutton.dtd index 321a052b..1894af5d 100644 --- a/chrome/locale/ja/torbutton.dtd +++ b/chrome/locale/ja/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "このサイト用の新しい Tor サーキット"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.networksettings "Tor ネットワークの設定..."> +<!ENTITY torbutton.context_menu.networksettings "Tor ネットワークの設定…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser のアップデートを確認"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> @@ -31,19 +31,19 @@ <!ENTITY torbutton.prefs.sec_safest_label "最も安全"> <!ENTITY torbutton.prefs.sec_safest_description "静的なサイトと基本的なサービスに必要な機能だけを許可します。この変更は画像、メディア、スクリプトに影響します。"> <!ENTITY torbutton.prefs.sec_safest_list_label "「最も安全」設定では："> -<!ENTITY torbutton.prefs.sec_learn_more_label "さらに知る"> +<!ENTITY torbutton.prefs.sec_learn_more_label "詳細情報"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "HTTPS非対応のサイトで JavaScript が無効化されます。"> <!ENTITY torbutton.prefs.sec_js_disabled "すべてのサイトで JavaScript が無効化されます。"> <!ENTITY torbutton.prefs.sec_limit_typography "いくつかのフォントと数学記号が無効化されます。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "いくつかのアイコン、数学記号および画像が無効化されます。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "オーディオ、ビデオ(HTML5メディア)、WebGLはクリックすると再生されます。"> <!ENTITY torbutton.prefs.sec_custom_warning "カスタム"> -<!ENTITY torbutton.prefs.sec_overview "セキュリティと匿名性を攻撃するために利用されるあるウェブ機能を無効にする。"> +<!ENTITY torbutton.prefs.sec_overview "セキュリティと匿名性を攻撃するために利用される可能性のあるウェブ機能を無効化します。"> <!ENTITY torbutton.prefs.sec_standard_tooltip "セキュリティレベル：標準"> -<!ENTITY torbutton.prefs.sec_safer_tooltip "セキュリティレベル：やや安全"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "セキュリティレベル：より安全"> <!ENTITY torbutton.prefs.sec_safest_tooltip "セキュリティレベル：最も安全"> <!ENTITY torbutton.prefs.sec_custom_summary "あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。"> <!ENTITY torbutton.prefs.sec_restore_defaults "デフォルトにもどす"> -<!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定..."> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定…"> <!ENTITY torbutton.circuit_display.title "Tor サーキット"> <!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使用する"> diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index daf9abd4..b30ecc3c 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -56,5 +56,5 @@ profileMigrationFailed=存在しているプロファイル %S へのマイグ updateDownloadingPanelUILabel=%S 更新をダウンロードしています # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=接続は暗号化された（オニオンサービス、%1$S, %2$S ビットキー、 %3$S） -pageInfo_OnionEncryption=接続は暗号化された（オニオンサービス） +pageInfo_OnionEncryptionWithBitsAndProtocol=接続が暗号化されています (Onionサービス、%1$S、鍵長 %2$S bit、%3$S) +pageInfo_OnionEncryption=接続が暗号化されています (Onionサービス) diff --git a/chrome/locale/ko/torbutton.dtd b/chrome/locale/ko/torbutton.dtd index 605c01e8..52d981bc 100644 --- a/chrome/locale/ko/torbutton.dtd +++ b/chrome/locale/ko/torbutton.dtd @@ -24,18 +24,18 @@ <!ENTITY torbutton.prefs.sec_caption "보안 등급"> <!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다."> <!ENTITY torbutton.prefs.sec_standard_label "표준"> -<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화됩니다."> +<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화 됩니다."> <!ENTITY torbutton.prefs.sec_safer_label "더 안전합니다"> -<!ENTITY torbutton.prefs.sec_safer_description "이 설정을 하여 흔히 위험한 웹사이트의 기능이 비활성화하면, 일부 사이트의 기능들을 사용할 수 없습니다."> +<!ENTITY torbutton.prefs.sec_safer_description "이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다."> <!ENTITY torbutton.prefs.sec_safer_list_label "더 안전한 설정을 선택하고 있습니다:"> <!ENTITY torbutton.prefs.sec_safest_label "제일 안전합니다"> -<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능에만 허용됩니다. 이 변경사항들은 이미지, 미디어, 스크립트에 영향을 줍니다."> +<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다."> <!ENTITY torbutton.prefs.sec_safest_list_label "제일 안전한 설정을 선택하고 있습니다:"> <!ENTITY torbutton.prefs.sec_learn_more_label "더 알아보기"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "HTTPS을 적용되지 않은 사이트에서는 JavaScript가 비활성화됩니다."> -<!ENTITY torbutton.prefs.sec_js_disabled "기본 설정으로 모든 사이트에서 자바스크립트는 비활성화되어 있습니다."> -<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴과 수학기호가 비활성화됩니다."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴과 아이콘, 수학기호, 이미지는 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_js_disabled "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> +<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴이며 수학기호가 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> <!ENTITY torbutton.prefs.sec_custom_warning "사용자 맞춤"> <!ENTITY torbutton.prefs.sec_overview "보안과 익명성을 공격하는 데 사용될 수 있는 특정한 웹의 기능을 해제합니다."> diff --git a/chrome/locale/mk/torbutton.dtd b/chrome/locale/mk/torbutton.dtd index f4a1aa14..677300f0 100644 --- a/chrome/locale/mk/torbutton.dtd +++ b/chrome/locale/mk/torbutton.dtd @@ -26,10 +26,10 @@ <!ENTITY torbutton.prefs.sec_standard_label "Стандардно"> <!ENTITY torbutton.prefs.sec_standard_description "Сите можности на Tor Browser и веб страните се овозможени."> <!ENTITY torbutton.prefs.sec_safer_label "Побезбедно"> -<!ENTITY torbutton.prefs.sec_safer_description "Оневозможува можности на веб страните кои често се опасни, сепак воедно предизвикувајќи некои веб страни да ја изгубат функционалноста."> +<!ENTITY torbutton.prefs.sec_safer_description "Оневозможува можности на веб страните кои често се опасни, предизвикувајќи некои страни да ја изгубат функционалноста."> <!ENTITY torbutton.prefs.sec_safer_list_label "На побезбедна поставка:"> <!ENTITY torbutton.prefs.sec_safest_label "Најбезбедно"> -<!ENTITY torbutton.prefs.sec_safest_description "Дозволува само можности на веб страните потребни за статичните страни и основните услужни сервиси. Овие измени влијаат на сликите, разни мултимедијални датотеки, и скрипти."> +<!ENTITY torbutton.prefs.sec_safest_description "Дозволува само можности на веб страните потребни за статичните страни и основните услужни сервиси. Овие измени влијаат на сликите, разни мултимедијални датотеки, и на скрптите."> <!ENTITY torbutton.prefs.sec_safest_list_label "На најбезбедна поставка:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Научи повеќе"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript е оневозможен на не-HTTPS веб страните."> @@ -44,6 +44,6 @@ <!ENTITY torbutton.prefs.sec_safest_tooltip "Безбедносно ниво: Најбезбедно"> <!ENTITY torbutton.prefs.sec_custom_summary "Вашите прилагодени својства на прелистувачот резултираа со невообичаени безбедносни поставки. Од причини поврзани со безбедноста и приватноста, ви препорачуваме да ги изберете почетните безбедносни нивоа."> <!ENTITY torbutton.prefs.sec_restore_defaults "Врати на стандардно"> -<!ENTITY torbutton.prefs.sec_advanced_security_settings "Напредни Безбедносни Поставки"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Напредни Безбедносни Поставки..."> <!ENTITY torbutton.circuit_display.title "Tor круг"> <!ENTITY torbutton.circuit_display.new_circuit "Нов круг за оваа веб страна"> diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd index 3ab23642..a84bf230 100644 --- a/chrome/locale/nl/torbutton.dtd +++ b/chrome/locale/nl/torbutton.dtd @@ -29,14 +29,14 @@ <!ENTITY torbutton.prefs.sec_safer_description "Schakelt websitefuncties uit die vaak gevaarlijk zijn, waardoor sommige websites functionaliteit verliezen."> <!ENTITY torbutton.prefs.sec_safer_list_label "Op de veiliger instelling:"> <!ENTITY torbutton.prefs.sec_safest_label "Veiligste"> -<!ENTITY torbutton.prefs.sec_safest_description "Staat alleen websitefuncties toe die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Meer info"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is uitgeschakeld op niet-HTTPS-websites."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is standaard uitgeschakeld op alle websites."> +<!ENTITY torbutton.prefs.sec_learn_more_label "Leer Meer"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript zijn uitgeschakeld op non-HTTP sites."> +<!ENTITY torbutton.prefs.sec_js_disabled "Javascript zijn standaard uitgeschakeld op alle sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klikken-voor-afspelen."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) en WebGL zijn klikken-voor-afspelen."> <!ENTITY torbutton.prefs.sec_custom_warning "Aangepast"> <!ENTITY torbutton.prefs.sec_overview "Bepaalde websitefuncties uitschakelen die kunnen worden gebruikt om uw beveiliging en anonimiteit aan te vallen."> <!ENTITY torbutton.prefs.sec_standard_tooltip "Beveiligingsniveau: standaard"> diff --git a/chrome/locale/pt-BR/torbutton.dtd b/chrome/locale/pt-BR/torbutton.dtd index 10fd6924..632a814d 100644 --- a/chrome/locale/pt-BR/torbutton.dtd +++ b/chrome/locale/pt-BR/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Saber mais"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Algumas fontes e símbolos matemáticos estão desativados."> diff --git a/chrome/locale/ro/torbutton.dtd b/chrome/locale/ro/torbutton.dtd index eb075065..e1ba1570 100644 --- a/chrome/locale/ro/torbutton.dtd +++ b/chrome/locale/ro/torbutton.dtd @@ -38,7 +38,8 @@ <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Unele fonturi, pictograme, simboluri matematice și imagini sunt dezactivate."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Fișierele audio și video (HTML5 media) și WebGL sunt pot fi redate la clic."> <!ENTITY torbutton.prefs.sec_custom_warning "Personalizat"> -<!ENTITY torbutton.prefs.sec_overview "Dezactivează anuminte facilități web care pot fi folosite pentru a-ți ataca securitatea și anonimitatea.\n"> +<!ENTITY torbutton.prefs.sec_overview "Dezactivează anuminte facilități web care pot fi folosite pentru a-ți ataca securitatea și anonimitatea. +"> <!ENTITY torbutton.prefs.sec_standard_tooltip "Nivel Securitate: Normal"> <!ENTITY torbutton.prefs.sec_safer_tooltip "Nivel Securitate: Sigur"> <!ENTITY torbutton.prefs.sec_safest_tooltip "Nivel Securitate: Prudent"> diff --git a/chrome/locale/ru/torbutton.dtd b/chrome/locale/ru/torbutton.dtd index 08b03019..da471978 100644 --- a/chrome/locale/ru/torbutton.dtd +++ b/chrome/locale/ru/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Наиболее безопасные"> <!ENTITY torbutton.prefs.sec_safest_description "Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты."> <!ENTITY torbutton.prefs.sec_safest_list_label "При самых безопасных настройках:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Узнать больше"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Подробнее"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only " JavaScript отключен на всех не HTTPS сайтах. "> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript отключен по умолчанию на всех сайтах."> <!ENTITY torbutton.prefs.sec_limit_typography "Некоторые шрифты и математические символы отключены."> diff --git a/chrome/locale/tr/torbutton.dtd b/chrome/locale/tr/torbutton.dtd index a10c034d..1da81004 100644 --- a/chrome/locale/tr/torbutton.dtd +++ b/chrome/locale/tr/torbutton.dtd @@ -43,7 +43,7 @@ <!ENTITY torbutton.prefs.sec_safer_tooltip "Güvenlik Düzeyi : Daha Güvenli"> <!ENTITY torbutton.prefs.sec_safest_tooltip "Güvenlik Düzeyi : En Güvenli"> <!ENTITY torbutton.prefs.sec_custom_summary "Tarayıcınız standart olmayan özel güvenlik düzeyi ayarları kullanıyor. Güvenlik ve gizliliğinizi korumak için aşağıdaki varsayılan güvenlik ayarı düzeylerinden birini seçmeniz önerilir."> -<!ENTITY torbutton.prefs.sec_restore_defaults "Varsayılanlara Sıfırla"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Varsayılanları Yükle"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Gelişmiş Güvenlik Düzeyi Ayarları…"> <!ENTITY torbutton.circuit_display.title "Tor Devresi"> <!ENTITY torbutton.circuit_display.new_circuit "Bu Sitenin Devresini Yenile"> diff --git a/chrome/locale/zh-TW/torbutton.dtd b/chrome/locale/zh-TW/torbutton.dtd index 2d85dbca..b9d9611f 100644 --- a/chrome/locale/zh-TW/torbutton.dtd +++ b/chrome/locale/zh-TW/torbutton.dtd @@ -21,17 +21,17 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "全部刪除，但受保護"> <!ENTITY torbutton.cookiedialog.saveAllCookies "保護新的 Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保護新的 Cookie"> -<!ENTITY torbutton.prefs.sec_caption "安全性等級"> +<!ENTITY torbutton.prefs.sec_caption "安全等級"> <!ENTITY torbutton.prefs.sec_caption_tooltip "此安全性調整滑棒會關閉某些瀏覽器的功能，導致您的瀏覽器更容易遭受駭客攻擊。"> <!ENTITY torbutton.prefs.sec_standard_label "標準"> -<!ENTITY torbutton.prefs.sec_standard_description "啟用 Tor 瀏覽器及網站的所有功能。"> +<!ENTITY torbutton.prefs.sec_standard_description "所有瀏覽器與網站的功能都啟用"> <!ENTITY torbutton.prefs.sec_safer_label "較安全"> <!ENTITY torbutton.prefs.sec_safer_description "停用某些功能,因為其有危險,會造成部份網站失能"> <!ENTITY torbutton.prefs.sec_safer_list_label "在較安全設定:"> <!ENTITY torbutton.prefs.sec_safest_label "最安全"> <!ENTITY torbutton.prefs.sec_safest_description "只同意靜態網站和基本服務的網站功能.這些變動會影響圖片,媒體和腳本."> <!ENTITY torbutton.prefs.sec_safest_list_label "在最安全設定:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "了解更多"> +<!ENTITY torbutton.prefs.sec_learn_more_label "繼續閱讀"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "所有非HTTPS網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_js_disabled "所有網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_limit_typography "有些字型與數學符號被停用。">

1 0

[tor-launcher/master] Release prep for 0.2.19.4
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit e5db13e282265dc3441013fa308042976d9b2669 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 27 17:36:49 2019 +0000 Release prep for 0.2.19.4 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 8989427..5676e6d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.19.3</em:version> + <em:version>0.2.19.4</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Update Translations
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit 11229d9d6ad5a4be1d9fca479f0e5a6598bec69a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 27 17:35:39 2019 +0000 Update Translations --- src/chrome/locale/ja/network-settings.dtd | 4 +- src/chrome/locale/ml/network-settings.dtd | 68 +++++------ src/chrome/locale/ml/torlauncher.properties | 152 ++++++++++++------------- src/chrome/locale/nb/torlauncher.properties | 10 +- src/chrome/locale/nl/network-settings.dtd | 2 +- src/chrome/locale/nl/torlauncher.properties | 108 +++++++++--------- src/chrome/locale/sk/torlauncher.properties | 2 +- src/chrome/locale/ur/torlauncher.properties | 4 +- src/chrome/locale/zh-TW/network-settings.dtd | 16 +-- src/chrome/locale/zh-TW/torlauncher.properties | 12 +- 10 files changed, 189 insertions(+), 189 deletions(-) diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 1f22ffa..40b8739 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -29,7 +29,7 @@ <!ENTITY torsettings.useProxy.type "ãããã·ã®çš®é¡:"> <!ENTITY torsettings.useProxy.type.placeholder "ãããã·ã®çš®é¡ãéžæ"> <!ENTITY torsettings.useProxy.address "ã¢ãã¬ã¹:"> -<!ENTITY torsettings.useProxy.address.placeholder "IPã¢ãã¬ã¹ ãŸãã¯ãã¹ãããŒã "> +<!ENTITY torsettings.useProxy.address.placeholder "IP ã¢ãã¬ã¹ãŸãã¯ãã¹ãå"> <!ENTITY torsettings.useProxy.port "ããŒã"> <!ENTITY torsettings.useProxy.username "ãŠãŒã¶ãŒå:"> <!ENTITY torsettings.useProxy.password "ãã¹ã¯ãŒã:"> @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Torã®ãã°ãã¯ãªããããŒãã«ã³ããŒ"> <!ENTITY torsettings.proxyHelpTitle "ãããã·ãã«ã"> -<!ENTITY torsettings.proxyHelp1 "äŒç€ŸãåŠæ ¡ãå€§åŠçã®ãããã¯ãŒã¯ãéããŠæ¥ç¶ããå ŽåãããŒã«ã«ããã¯ã·ãå¿èŠã«ãªãå ŽåããããŸãã ããã¯ã·ãå¿èŠã§ãããã©ããããããªãå Žåã¯ãä»ã®ãã©ãŠã¶ã®ã€ã³ã¿ãŒãããèšå®ãèŠãããã·ã¹ãã ã®ãããã¯ãŒã¯èšå®ãç¢ºèªããŠãã ããã"> +<!ENTITY torsettings.proxyHelp1 "äŒç€ŸãåŠæ ¡ãå€§åŠçã®ãããã¯ãŒã¯ãéããŠæ¥ç¶ããå ŽåãããŒã«ã«ãããã·ãå¿èŠã«ãªãå ŽåããããŸãã ãããã·ãå¿èŠã§ãããã©ããããããªãå Žåã¯ãä»ã®ãã©ãŠã¶ã®ã€ã³ã¿ãŒãããèšå®ãèŠãããã·ã¹ãã ã®ãããã¯ãŒã¯èšå®ãç¢ºèªããŠãã ããã"> <!ENTITY torsettings.bridgeHelpTitle "ããªããžãªã¬ãŒã®ãã«ã"> <!ENTITY torsettings.bridgeHelp1 "ããªããžãšã¯Torãããã¯ãŒã¯ãžã®æ¥ç¶ããããã¯ããããšãé£ããããããã®ãªã¹ããããŠããªããªã¬ãŒã§ãã  ããããã®çš®é¡ã®ããªããžã¯æ€é²ãé¿ããããã®ç°ãªãææ³ãå©çšããŠããŸãã  obfsã®ãã®ã¯ããªãã®ãã©ãã£ãã¯ãã©ã³ãã ãªãã€ãºã®ããã«èŠãããïŒmeekã®ãã®ã¯ããªãã®ãã©ãã£ãã¯ãTorã§ã¯ãªããã®ãµãŒãã¹ãžã®æ¥ç¶ã§ããããã«èŠããããŸãã"> diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 986e8f4..93f3e79 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -9,54 +9,54 @@  -<!ENTITY torSettings.connectPrompt "Click âConnectâ to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click âConfigureâ to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "àŽàµàŽ±àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽŸàµ» àŽàŽ£àŽàµàŽàŽ¿àµœ àŽàµàŽ²àŽ¿àŽàµàŽàµ àŽàµàŽ¯àµàŽ "> +<!ENTITY torSettings.configurePrompt "àŽàµàµŒ àŽžàµàµ»àŽžàµŒ àŽàµàŽ¯àµàŽ€àŽ¿àŽàµàŽàµàŽ³àµàŽ³ àŽ°àŽŸàŽàµàŽ¯àŽàµàŽàŽ³àŽ¿àµœàŽªàµàŽàµàŽ (àŽàŽ€àŽŸàŽ¯àŽ€àµ àŽàŽàŽ¿àŽªàµàŽ€àµ , àŽàµàŽš , àŽ€àµàµŒàŽàµàŽàŽ¿ )àŽàŽ³àŽŸàŽ£àµ àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµàŽàŽ¿àµœ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽàµŸ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàŽ€àµ àŽªàµàŽ±àµàŽàµàŽžàŽ¿ àŽàŽµàŽ¶àµàŽ¯àŽ®àµàŽ³àµàŽ³ àŽ°àµ àŽžàµàŽµàŽàŽŸàŽ°àµàŽ¯ àŽšàµàŽ±àµàŽµàµŒàŽàŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽàŽ£àµàŽàµàŽàŽ¿àµœ àŽšàµàŽ±àµàŽ±àµâàŽµàµŒàŽàµàŽàµ àŽžàµàŽ±àµàŽ±àŽ¿àŽàŽàµàŽžàŽ¿àµœ àŽ®àŽŸàŽ±àµàŽ±àŽ àŽµàŽ°àµàŽ€àµàŽ€àŽŸàµ» àŽàµàµºàŽ«àŽ¿àŽàµàµŒ àŽ¬àŽàµàŽàŽ£àŽ¿àµœ àŽàµàŽ²àŽ¿àŽàµàŽàµ àŽàµàŽ¯àµàŽ "> <!ENTITY torSettings.configure "àŽàµàŽ°àŽ®àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµ "> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽ ">  -<!ENTITY torsettings.startingTor "Waiting for Tor to startâŠ"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽŸàµ» àŽàŽŸàŽ€àµàŽ€àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ "> +<!ENTITY torsettings.restartTor "àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµàŽàµ àŽ€àµàŽàŽàµàŽàµàŽ "> <!ENTITY torsettings.reconfigTor "àŽªàµàŽšàŽàµŒàŽàµàŽ°àŽ®àµàŽàŽ°àŽ¿àŽàµàŽàµàŽ "> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "àŽšàŽ¿àŽàµàŽàµŸ àŽàµàµŒ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽžàµ àŽ°àµàŽªàŽªàµàŽªàµàŽàµàŽ€àµàŽ€àŽ¿àŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽàŽ°àµ àŽžàŽŸàŽ§àŽŸàŽ°àŽ£ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽžàµàŽ±àµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽàŽšàµàŽ±àµŒ àŽàµàŽ¯àµàŽ€àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ &#160 àŽàµàŽ±àµàŽ®àŽŸàŽ¯àŽ¿ àŽàŽ°àµ àŽšàµàµŒ àŽ¬àŽšàµàŽ§àŽ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàŽŸàµ» àŽ àŽžàµàŽ±àµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àµàŽ£àµàŽàŽ€àŽŸàŽ£àµ "> +<!ENTITY torsettings.discardSettings.proceed "àŽžàµàŽ±àµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ€àµ àŽ¬àŽšàµàŽ§àŽ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàµàŽ "> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "àŽšàŽ¿àŽ°àµàŽ¬àŽšàµàŽ§àŽ®àŽ¿àŽ²àµàŽ²àŽŸàŽ€àµàŽ€àŽ€àµ "> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.checkbox "àŽàŽŸàµ» àŽàŽšàµàŽ±àµŒàŽšàµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàŽŸàµ» àŽàŽ°àµ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµàŽšàµàŽšàµ "> +<!ENTITY torsettings.useProxy.type "àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàŽšàŽ :"> +<!ENTITY torsettings.useProxy.type.placeholder "àŽàŽ°àµ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàŽšàŽ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ :"> +<!ENTITY torsettings.useProxy.address "àŽ®àµàµœàŽµàŽ¿àŽ²àŽŸàŽžàŽ :"> +<!ENTITY torsettings.useProxy.address.placeholder "àŽ àŽªàŽ¿ àŽ®àµàµœàŽµàŽ¿àŽ²àŽŸàŽžàŽ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ¹àµàŽžàµàŽ±àµàŽ±àµ àŽšàµàŽ¯àŽ¿àŽ "> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "àŽ¯àµàŽžàµŒ àŽšàµàŽ¯àŽ¿àŽ :"> +<!ENTITY torsettings.useProxy.password "àŽªàŽŸàŽžàµàŽžàµâàŽµàµàµŒàŽ¡àµâ "> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useProxy.type.http "àŽàŽàµ àŽàŽ¿ àŽàŽ¿ àŽªàŽ¿ /àŽàŽàµ àŽàŽ¿ àŽàŽ¿ àŽªàŽ¿ àŽàŽžàµ "> +<!ENTITY torsettings.firewall.checkbox "àŽ àŽàŽàŽªàµàŽ¯àµàŽàµàŽàµŒ àŽàŽ¿àŽ² àŽªàµàŽ°àŽ€àµàŽ¯àµàŽ àŽªàµàµŒàŽàµàŽàµàŽàŽ³àŽ¿àŽ²àµàŽàµ àŽ®àŽŸàŽ€àµàŽ°àŽ àŽ¬àŽšàµàŽ§àŽ àŽàŽšàµàŽµàŽŠàŽ¿àŽàµàŽàµàŽšàµàŽš àŽ«àŽ¯àµŒàŽµàŽŸàµŸ àŽµàŽŽàŽ¿àŽ¯àŽŸàŽ£àµ àŽªàµàŽàµàŽšàµàŽšàŽ€àµ"> +<!ENTITY torsettings.firewall.allowedPorts "àŽàŽšàµàŽµàŽŠàŽ¿àŽàµàŽàŽ¿àŽàµàŽàµàŽ³àµàŽ³ àŽªàµàµŒàŽàµàŽàµàŽàµŸ "> +<!ENTITY torsettings.useBridges.checkbox "àŽàŽšàµàŽ±àµ àŽ°àŽŸàŽàµàŽ¯àŽ€àµàŽ€àµ àŽàµàµŒ àŽžàµàµ»àŽžàµŒ àŽàµàŽ¯àµàŽ€àŽ¿àŽàµàŽàµàŽ³àµàŽ³àŽ€àŽŸàŽ£àµ "> +<!ENTITY torsettings.useBridges.default "àŽàŽ€àŽ¿àŽšàŽàŽ€àµàŽ€àµ àŽ€àŽšàµàŽšàµàŽ¯àµàŽ³àµàŽ³ àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ "> +<!ENTITY torsettings.useBridges.default.placeholder "àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ "> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org àŽšàŽ¿àŽšàµàŽšàµàŽ àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ "> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder " àŽàŽŸàŽ£àµàŽšàµàŽš àŽàŽ¿àŽ€àµàŽ°àŽ€àµàŽ€àŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽàŽàµàŽ·àŽ°àŽàµàŽàµŸ àŽàµàµŒàŽàµàŽàµàŽ "> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "àŽàŽ°àµ àŽªàµàŽ€àŽ¿àŽ¯ àŽàŽ¹àµàŽµàŽŸàŽšàŽ àŽàµàŽ¯àµàŽ¯àµàŽ "> <!ENTITY torsettings.useBridges.captchaSubmit "àŽžàŽ®àµŒàŽªàµàŽªàŽ¿àŽàµàŽàµàŽ "> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.custom "àŽàŽšàŽ¿àŽàµàŽàµ àŽàŽ±àŽ¿àŽ¯àŽŸàŽµàµàŽšàµàŽš àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽ€àŽ°àŽ¿àŽ "> +<!ENTITY torsettings.useBridges.label "àŽµàŽ¿àŽ¶àµàŽµàŽžàŽ¿àŽàµàŽàŽŸàŽµàµàŽšàµàŽš àŽ¶àµàŽ°àŽ¿àŽ€àŽžàµàŽžàŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽàŽ¿àŽàµàŽàŽ¿àŽ¯ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµàŽ±àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàµàµŒàŽàµàŽàµàŽ "> +<!ENTITY torsettings.useBridges.placeholder "àŽàŽ¡àµàŽ°àŽžàµ : àŽªàµàµŒàŽàµàŽàµ (àŽàŽ°àµ àŽµàŽ°àŽ¿àŽ¯àŽ¿àµœ àŽàŽ°àµàŽ£àµàŽ£àŽ àŽàŽšàµàŽš àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽàµŸ àŽàµàµŒàŽàµàŽàµàŽ )"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.copyLog "àŽàµàµŒ àŽµàŽ¿àŽµàŽ°àŽªàµàŽªàŽàµàŽàŽ¿àŽ àŽàµàŽ³àŽ¿àŽªàµ àŽ¬àµàµŒàŽ¡àŽ¿àŽ²àµàŽàµàŽàµ àŽàµàµŒàŽàµàŽàµàŽ "> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelpTitle "àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽžàŽ¹àŽŸàŽ¯àŽ "> +<!ENTITY torsettings.proxyHelp1 "àŽàŽ®àµàŽªàŽšàŽ¿ , àŽžàµâàŽàµàµŸ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ¯àµàŽ£àŽ¿àŽµàµàŽŽàµàŽžàŽ¿àŽ±àµàŽ±àŽ¿ àŽàŽšàµàŽšàŽ¿àŽµàŽ¿àŽàŽàµàŽàŽ³àŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽ®àµàŽªàµàµŸ àŽàŽ°àµ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàŽµàŽ¶àµàŽ¯àŽ®àŽŸàŽ¯àŽ¿ àŽµàŽ°àµàŽ &#160 , àŽàŽ°àµ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàŽµàŽžàŽŸàŽ¯àŽ®àŽŸàŽ£àµ àŽàŽ²àµàŽ²àŽ¯àµ àŽàŽšàµàŽšàµ àŽšàŽ¿àŽàµàŽàµŸàŽàµ àŽàŽ±àŽ¿àŽ¯àŽ¿àŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ , àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽàŽšàµàŽ±àµŒàŽšàµàŽ±àµàŽ±àµ àŽžàµàŽ±àµàŽ±àŽ¿àŽàµàŽžàŽ¿àŽ²àµ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ®àŽ±àµàŽ±àµàŽ°àµ àŽ¬àµàŽ°àµàŽžàµàŽ°àŽ¿àŽ²àµ àŽàŽ€àµàŽ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽžàŽ¿àŽžàµàŽ±àµàŽ±àŽ€àµàŽ€àŽ¿àŽšàµàŽ±àµ àŽšàµàŽ±àµàŽ±àµâàŽµàµŒàŽàµàŽàµ àŽžàµàŽ±àµàŽ±àŽ¿àŽàµàŽžàŽ¿àŽ²àµ àŽšàµàŽàµàŽàµàŽ "> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ±àŽ¿àŽ²àµ àŽžàŽ¹àŽŸàŽ¯àŽ "> +<!ENTITY torsettings.bridgeHelp1 "àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽàŽšàµàŽšàµ àŽªàŽ±àŽ¯àµàŽšàµàŽšàŽ€àµ àŽµàŽ¿àŽµàŽ°àŽªàµàŽªàŽàµàŽàŽ¿àŽàŽ¯àŽ¿àµœ àŽàµàµŒàŽàµàŽàŽªàµàŽàŽŸàŽ€àµàŽ€ àŽ±àµàŽ²àŽ¯àµàŽàŽ³àŽŸàŽ£àµ àŽàŽ€àµ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàŽ€àµ àŽ€àŽàŽžàµàŽžàŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽàµàŽàµàŽ€àµœ àŽŠàµàŽ·àµàŽàŽ°àŽ®àŽŸàŽàµàŽàµàŽšàµàŽšàµ &#160. àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµâàŽàµàŽ àŽžàµàŽšàµàŽžàŽ°àµàŽ·àŽ¿àŽªàµ àŽ€àŽàŽ¯àµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽµàµàŽ£àµàŽàŽ¿ àŽµàµàŽ¯àŽ€àµàŽ¯àŽžàµàŽ€àŽ®àŽŸàŽ¯ àŽ°àµàŽ€àŽ¿àŽàµŸ àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµàŽšàµàŽšàµ &#160. obfs àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽªàµàŽàµàŽàµàŽµàŽ°àŽµàŽ¿àŽšàµ àŽàŽàµàŽàµàŽàŽ¿àŽ²àµàŽ²àŽŸàŽ€àµàŽ€ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ àŽ®àµàŽàµ àŽªàµàŽ²àµàŽ³àµàŽ³àŽ€àµ àŽžàµàŽ°àŽ¿àŽàµàŽàµàŽ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµ àŽš àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àµœ àŽ€àŽšàµàŽšàµàŽ¯àµàŽ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµ "> +<!ENTITY torsettings.bridgeHelp2 "àŽ°àŽŸàŽàµàŽ¯àŽàµàŽàµŸ àŽàŽ€àµàŽàµàŽàµ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ àŽàµàŽ±àŽ¿àŽšàµ àŽ€àŽàŽ¯àŽŸàµ» àŽ¶àµàŽ°àµàŽ®àŽ¿àŽàµàŽàŽŸàŽ²àµàŽ , àŽªàµàŽ°àŽ€àµàŽ¯àµàŽàŽ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽªàµàŽ°àŽ€àµàŽ¯àµàŽàŽ àŽ°àŽŸàŽàµàŽ¯àŽàµàŽàµŸ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµàŽ£àµàŽàµ &#160. àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽ°àŽŸàŽàµàŽ¯àŽ€àµàŽ€àµ àŽàŽ€àµàŽàµàŽàµ àŽ¬àµàŽ°àŽ¿àŽ¡àµâàŽàµàŽàŽ³àŽŸàŽ£àµ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àµ àŽàŽšàµàŽšàµ àŽšàŽ¿àŽàµàŽàµŸàŽàµàŽàµ àŽàŽ±àŽªàµàŽªàŽ¿àŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ torproject.org/about/contact.html#support àŽàŽŸàŽ£àµàŽ ">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àµ àŽµàŽ°àµ àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽàµàŽ·àµàŽ®àŽ¿àŽàµàŽàµàŽ &#160. àŽàŽ€àµ àŽšàŽ¿àŽ°àŽµàŽ§àŽ¿ àŽžàŽ®àŽ¯àŽ àŽàŽàµàŽàµàŽàµàŽ "> diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index 7abbd44..31467ce 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -1,94 +1,94 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=àŽàµàµŒ àŽàŽ¯àµŒàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àµ -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited_during_startup=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽ€àµàŽ€àŽ¿àŽ²àµ àŽªàµàŽ±àŽ€àµàŽ€àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàµ . àŽàŽ€àµ àŽ®àŽ¿àŽàµàŽàŽµàŽŸàŽ±àµàŽ àŽàµàµŒ àŽàµŒ àŽžàŽ¿ àŽ«àŽ¯àŽ²àŽ¿àŽ²àµ àŽªàµàŽ°àµàŽžàŽšàŽ àŽàŽŸàŽ°àŽ£àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽ , àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµ àŽàŽ°àµ àŽ¬àŽàµ àŽàŽŸàŽ°àŽ£àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽàŽ€àµàŽ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽžàŽ¿àŽžàµàŽ±àµàŽ±àŽ€àµàŽ€àŽ¿àŽ²àµ àŽàŽ€àµàŽàµàŽàŽ¿àŽ²àµàŽ àŽàŽ°àµ àŽàŽªàµàŽ²àŽ¿àŽàµàŽàµàŽ·àµ» àŽ®àµàŽàŽŸàŽšàµàŽ€àŽ°àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ€àµàŽ±àµàŽ±àŽŸàŽ¯ àŽàŽ°àµ àŽ¹àŽŸàµŒàŽ¡àµâàŽµàµàŽ¯àµŒ àŽàŽŸàŽ°àŽ£àŽµàµàŽ.àŽšàŽ¿àŽàµàŽàµŸ àŽ àŽªàµàŽ°àµàŽžàŽšàŽ àŽªàŽ°àŽ¿àŽ¹àŽ°àŽ¿àŽàµàŽàµ àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµ àŽ€àµàŽàŽàµàŽàŽŸàŽ€àµ àŽàµàµŒ àŽ¬àµàŽ°àµàŽžàµŒ àŽ€àµàŽàŽàµàŽàµàŽàŽ¯àŽ¿àŽ²àµàŽ² . +torlauncher.tor_exited=àŽàµàµŒ àŽªàµàŽ°àµàŽ€àµàŽàµàŽ·àŽ¿àŽàµàŽàŽŸàŽ€àµ àŽªàµàŽ±àŽ€àµàŽ€àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàµ . àŽàŽ€àµ àŽ®àŽ¿àŽàµàŽàŽµàŽŸàŽ±àµàŽ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµ àŽàŽ°àµ àŽ¬àŽàµ àŽàŽŸàŽ°àŽ£àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽàŽ€àµàŽ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽžàŽ¿àŽžàµàŽ±àµàŽ±àŽ€àµàŽ€àŽ¿àŽ²àµ àŽàŽ€àµàŽàµàŽàŽ¿àŽ²àµàŽ àŽàŽ°àµ àŽàŽªàµàŽ²àŽ¿àŽàµàŽàµàŽ·àµ» àŽ®àµàŽàŽŸàŽšàµàŽ€àŽ°àŽ àŽàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽŸàŽ , àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ€àµàŽ±àµàŽ±àŽŸàŽ¯ àŽàŽ°àµ àŽ¹àŽŸàµŒàŽ¡àµâàŽµàµàŽ¯àµŒ àŽàŽŸàŽ°àŽ£àŽµàµàŽ.àŽšàŽ¿àŽàµàŽàµŸ àŽ àŽªàµàŽ°àµàŽžàŽšàŽ àŽªàŽ°àŽ¿àŽ¹àŽ°àŽ¿àŽàµàŽàµ àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµ àŽ€àµàŽàŽàµàŽàŽŸàŽ€àµ àŽšàŽ¿àŽàµàŽàµŸàŽàµàŽàµ àŽµàµàŽ¬àµàŽžàµàŽ±àµàŽ±àµàŽàŽ³àŽ¿àµœ àŽàŽ€àŽŸàŽ£àµ àŽªàŽ±àµàŽ±àŽ¿àŽ²àµàŽ² . àŽªàµàŽ°àµàŽžàŽšàŽ àŽªàŽ¿àŽšàµàŽšàµàŽ¯àµàŽ àŽàŽŸàŽ£àµàŽàŽ¯àŽŸàŽ£àµàŽàµàŽàŽ¿àµœ , àŽŠàŽ¯àŽµàŽ ŸàŽ¯àŽ¿ àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽàµàŽ±àŽ¿àŽšàµàŽ±àµ àŽàŽ°àµ àŽµàŽ¿àŽµàŽ° àŽªàŽàµàŽàŽ¿àŽ àŽàŽàµàŽàŽ³àµàŽàµ àŽžàŽ¹àŽŸàŽ¯àŽ¿àŽàµàŽàµàŽšàµàŽš àŽžàŽàŽàŽ€àµàŽ€àŽ¿àŽšàµ àŽàŽ¯àŽàµàŽàµ àŽ€àŽ°àŽ¿àŽ torlauncher.tor_exited2=àŽàµàµŒ àŽªàµàŽšàŽàŽ°àŽŸàŽ°àŽàŽàŽ¿àŽàµàŽàµàŽ®àµàŽªàµàµŸ àŽ¬àµàŽ°àµàŽžàµŒ àŽàŽŸàŽ¬àµàŽàµŸ àŽàŽµàŽžàŽŸàŽšàŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² . -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_controlconn_failed=àŽàµàµŒ àŽàŽ£àµàŽàµàŽ°àµàµŸ àŽªàµàŽ°àµàŽàŽ¿àŽ²àµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽŸàµ» àŽžàŽŸàŽ§àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² +torlauncher.tor_failed_to_start=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ +torlauncher.tor_control_failed=àŽàµàµŒ àŽšàŽ¿àŽ¯àŽšàµàŽ€àµàŽ°àŽ£àŽ àŽàŽàµàŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ +torlauncher.tor_bootstrap_failed=àŽàµàµŒ àŽàŽ°àµ àŽàµàµŒ àŽ¶àµàŽàŽàŽ² àŽ°àµàŽªàµàŽàŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ +torlauncher.tor_bootstrap_failed_details=%1$S àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. +torlauncher.unable_to_start_tor=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽŸàµ» àŽžàŽŸàŽ§àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² \n\n%S +torlauncher.tor_missing=àŽàµàµŒ àŽ€àµàŽàŽàµàŽàŽŸàŽšàµàŽ³àµàŽ³ àŽàŽàµàŽžàŽ¿àŽàµàŽ¯àµàŽàµàŽàŽ¬àŽ¿àµŸ àŽàŽŸàŽ£àŽŸàŽšàŽ¿àŽ²àµàŽ² torlauncher.torrc_missing="àŽàµàµŒ àŽàµŒàŽžàŽ¿" àŽ«àŽ¯àµœ àŽàŽŸàŽ£àµàŽšàµàŽšàŽ¿àŽ²àµàŽ² àŽàŽªàµàŽªàŽ àŽàŽ€àŽ¿àŽšàµàŽ±àµ àŽšàŽ¿àµŒàŽ®àŽŸàŽ£àŽµàµàŽ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ . -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.datadir_missing=àŽàµàµŒ àŽ¡àŽŸàŽ±àµàŽ± àŽ¡àŽ¿àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽšàŽ¿àŽ² àŽšàŽ¿àµœàŽàµàŽàµàŽšàµàŽšàŽ¿àŽ²àµàŽ² àŽàŽªàµàŽªàŽ àŽàŽ€àµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàŽŸàŽšàµàŽ àŽžàŽŸàŽ§àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² +torlauncher.password_hash_missing=àŽ¹àŽŸàŽ·àµàŽ¡àµ àŽªàŽŸàŽžàµâàŽµàµàŽ¡àµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àµœ àŽªàŽ°àŽŸàŽàŽ¯àŽªàµàŽªàµàŽàµàŽàµ -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=àŽàµàµŒ àŽžàµàŽ±àµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àµ àŽžàŽŸàŽ§àµàŽ¯àŽ®àŽŸàŽ¯àŽ¿àŽ²àµàŽ² +torlauncher.failed_to_save_settings=àŽàµàµŒ àŽžàµàŽ±àµàŽ±àŽ¿àŽàŽàµàŽžàµ àŽžàµàŽàµàŽ·àŽ¿àŽàµàŽàŽŸàµ» àŽžàŽŸàŽ§àµàŽ¯àŽ®àŽŸàŽ¯àŽ¿àŽ²àµàŽ² +torlauncher.ensure_tor_is_running=àŽàµàµŒ àŽ±àµº àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµàŽ£àµàŽàµàŽšàµàŽšàµ àŽàŽ±àŽªàµàŽªàµ àŽµàŽ°àµàŽ€àµàŽ€àµàŽ -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽ àŽªàŽ¿ àŽàŽ¡àµàŽ°àŽžàµ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ¹àµàŽžàµàŽ±àµàŽ±àµ àŽšàµàŽ¯àŽ¿àŽ®àµàŽ àŽªàµàµŒàŽàµàŽàµ àŽšàŽ®àµàŽªàŽ±àµàŽ àŽµàŽ¿àŽ¶àŽŠàŽ®àŽŸàŽàµàŽàµàŽ , àŽàŽšàµàŽšàŽŸàµœ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽ±àµàŽ±àµàŽ±àŽ¿àŽšàµ àŽàŽšàµàŽ±àµŒàŽšàµàŽ±àµàŽ±àŽ¿àŽšàµ àŽàŽàµàŽžàŽžàµàŽžàµ àŽàµàŽ¯àµàŽ¯àŽŸàµ» àŽžàŽŸàŽ§àŽ¿àŽàµàŽàµàŽàŽ¯àµàŽ³àµàŽ³àµ +torlauncher.error_proxy_type_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽàŽ°àµ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàµàŽªàµàŽªàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ +torlauncher.error_bridges_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽàŽšàµàŽšàµ àŽàŽšàµàŽšàŽ¿àµœ àŽàµàŽàµàŽ€àŽ²àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽµàŽ¿àŽ¶àŽŠàµàŽàŽ°àŽ¿àŽàµàŽàµàŽ +torlauncher.error_default_bridges_type_missing=àŽšàŽ¿àŽàµàŽàµŸ àŽ€àµàµŒàŽàµàŽàŽ¯àŽŸàŽ¯àµàŽ àŽµàŽ¿àŽ¶àŽŠàµàŽàŽ°àŽ¿àŽàµàŽ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàŽ³àµàŽàµ àŽàŽ°àµ àŽàµàŽ°àŽŸàµ»àŽžàµâàŽªàµàµŒàŽàµ àŽàµàŽªàµàŽªàµ àŽ€àŽ¿àŽ°àŽàµàŽàµàŽàµàŽàµàŽàµàŽ +torlauncher.error_bridgedb_bridges_missing=àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ +torlauncher.error_bridge_bad_default_type=àŽšàŽ¿àŽàµàŽàµŸ àŽªàŽ±àŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽš àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàŽ³àµàŽàµ àŽàµàŽ°àŽŸàµ»àŽžàµâàŽªàµàµŒàŽàµ àŽàµàŽªàµàŽªàµàŽàµŸ àŽ²àŽàµàŽ¯àŽ®àŽ²àµàŽ² . àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽžàµàŽ±àµàŽ±àŽ¿àŽàµàŽàµàŽžàµàŽàµŸ àŽ€àŽ¿àŽ°àŽ¿àŽ€àµàŽ€àµàŽ -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(àŽàµàŽšàŽ¯àŽ¿àµœ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµ ) +torlauncher.bridge_suffix.meek-azure=(àŽàµàŽšàŽ¯àŽ¿àµœ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµ ) -torlauncher.request_a_bridge=Request a BridgeâŠ -torlauncher.request_a_new_bridge=Request a New BridgeâŠ -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ +torlauncher.request_a_new_bridge=àŽàŽ°àµ àŽªàµàŽ€àŽ¿àŽ¯ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽ ... +torlauncher.contacting_bridgedb=àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ¡àŽ¿ àŽ¬àŽ¿àŽ¯àµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàµ , àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽàŽŸàŽ€àµàŽ€àŽ¿àŽ°àŽ¿àŽàµàŽàµàŽ +torlauncher.captcha_prompt=àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽšàµ àŽàŽ¿àŽàµàŽàŽŸàµ» àŽ€àŽšàµàŽšàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽš àŽàŽŸàŽªàµàŽ àŽªàŽ°àŽ¿àŽ¹àŽ°àŽ¿àŽàµàŽàµàŽ +torlauncher.bad_captcha_solution=àŽªàŽ°àŽ¿àŽ¹àŽŸàŽ°àŽ àŽ¶àµàŽ°àŽ¿àŽ¯àŽ²àµàŽ² . àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽàŽšàµàŽšàµàŽàµàŽàµ àŽ¶àµàŽ°àµàŽ®àŽ¿àŽàµàŽàµàŽ +torlauncher.unable_to_get_bridge=àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽàŽ¿àŽ¬àŽ¿àŽ¯àŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽžàŽŸàŽ§àµàŽ¯àŽ®àŽ²àµàŽ² +torlauncher.no_meek=àŽ àŽ¬àµàŽ°àµàŽžàµŒ àŽ®àµàŽàµ àŽàŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽµàµàŽ£àµàŽàŽ¿ àŽžàµàŽ°àŽ¿àŽ¯àŽŸàŽ¯ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àµœ àŽàµàµºàŽ«àŽ¿àŽàµàŽ°àµ àŽàµàŽ¯àµàŽ€àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² , àŽàŽ€àµ àŽàµàŽ¯àµâàŽ€àŽŸàµœ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽàŽ¿àŽàµàŽàµàŽàŽ¯àµàŽ³àµàŽ³àµ +torlauncher.no_bridges_available=àŽ àŽžàŽ®àŽ¯àŽ€àµàŽ€àµ àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàŽ³àµàŽ àŽàŽ¿àŽàµàŽàµàŽàŽ¯àŽ¿àŽ²àµàŽ² , àŽàµàŽ·àµàŽ®àŽ¿àŽàµàŽàµàŽ -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.connect=àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽ +torlauncher.restart_tor=àŽàµàµŒ àŽàŽšàµàŽšàµàŽàµàŽàµ àŽ€àµàŽàŽàµàŽàµàŽ +torlauncher.quit=àŽªàµàŽ±àŽ€àµàŽ€àµàŽªàµàŽàµàŽ +torlauncher.quit_win=àŽªàµàŽ±àŽ€àµàŽ€àµàŽªàµàŽàµàŽ torlauncher.done=àŽàŽŽàŽ¿àŽàµàŽàµ -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=àŽžàŽ¹àŽŸàŽ¯àŽ€àµàŽ€àŽ¿àŽšàŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ , %S +torlauncher.forAssistance2=àŽžàŽ¹àŽŸàŽ¯àŽ€àµàŽ€àŽ¿àŽšàŽŸàŽ¯àŽ¿ àŽžàŽšàµàŽŠàµŒàŽ¶àŽ¿àŽàµàŽàµàŽ , %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=àŽàµàŽªàµàŽªàŽ¿ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿ , àŽàµàµŒ àŽµàŽ¿àŽµàŽ°àŽªàŽàµàŽàŽ¿àŽ àŽžàŽšàµàŽŠàµàŽ¶àŽàµàŽàµŸ àŽàŽ°àµ àŽàµàŽàµàŽžàµàŽ±àµàŽ±àµ àŽàŽ¡àŽ¿àŽ±àµàŽ±àŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽªàµàŽžàµàŽ±àµàŽ±àµ àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽ®àµàŽ¯àŽ¿àµœ àŽàŽ¯àŽàµàŽàµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽ€àŽ¯àµàŽ¯àŽŸàŽ±àŽŸàŽ£àµ -torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.starting=àŽ€àµàŽàŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.conn_pt=àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.conn_done_pt=àŽ¬àµàŽ°àŽ¿àŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.conn_proxy=àŽªàµàŽ°àµàŽàµàŽžàŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.conn_done_proxy=àŽªàµàŽ°àµàŽàµàŽžàŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.conn=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.conn_done=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.handshake=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.handshake_done=àŽàŽ°àµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàŽ€àµ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿ +torlauncher.bootstrapStatus.onehop_create=àŽàµ»àŽàµàŽ°àŽ¿àŽªàµàŽ±àµàŽ±àŽ¡àµ àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽ¬àŽšàµàŽ§àŽ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàµàŽàµàŽ£àµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.requesting_status=àŽ¶àµàŽàŽàŽ²àŽŸ àŽàŽµàŽžàµàŽ¥ àŽàŽ¿àŽàµàŽàŽ¿àŽàµàŽàµàŽ£àµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.loading_status=àŽ¶àµàŽàŽàŽ²àŽŸ àŽàŽµàŽžàµàŽ¥ àŽàŽ¯àŽ±àµàŽ±àµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.loading_keys=àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ àŽàŽ§àŽ¿àŽàŽŸàŽ° àŽžàµàµŒàŽàµàŽàŽ¿àŽ«àŽ¿àŽàµàŽàŽ±àµàŽ±àµàŽàµŸ àŽàŽ¯àŽ±àµàŽ±àµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.requesting_descriptors=àŽ±àŽ¿àŽ²àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàµàŽŠàŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.loading_descriptors=àŽ±àŽ¿àŽ²àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàŽ¯àŽ±àµàŽ±àµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.enough_dirinfo=àŽ±àŽ¿àŽ²àµ àŽµàŽ¿àŽµàŽ°àŽàµàŽàµŸ àŽàŽ¯àŽ±àµàŽ±àµàŽšàµàŽšàŽ€àµ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿ +torlauncher.bootstrapStatus.ap_conn_pt=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.ap_conn_done_pt=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.ap_conn_proxy=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ: àŽªàµàŽ°àµàŽàµàŽžàŽ¿àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.ap_conn_done_proxy=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽªàµàŽ°àµàŽàµàŽžàŽ¿àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.ap_conn=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.ap_conn_done=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽàŽ¿àŽ°àŽ¿àŽàµàŽàµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.ap_handshake=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ : àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ +torlauncher.bootstrapStatus.ap_handshake_done=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ àŽàµàµŒ àŽ±àµàŽ²àŽ¯àµàŽ®àŽŸàŽ¯àŽ¿ àŽàµŒàŽàµàŽ àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàŽ€àµ àŽªàµàµŒàŽ€àµàŽ€àŽ¿àŽ¯àŽŸàŽ¯àŽ¿ +torlauncher.bootstrapStatus.circuit_create=àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽšàŽ¿àµŒàŽ®àŽ¿àŽàµàŽàµàŽšàµàŽšàµ: àŽàµàµŒ àŽžàµŒàŽàµàŽ¯àµàŽàµàŽàµ àŽžàµàŽ¥àŽŸàŽªàŽ¿àŽàµàŽàµàŽšàµàŽšàµÂ +torlauncher.bootstrapStatus.done=àŽàµàµŒ àŽšàµàŽ±àµàŽ±àµâàŽµàµŒàŽàµàŽàŽàµœ àŽàµàµŒàŽàµàŽàŽªàµàŽªàµàŽàµàŽàµ -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.done=àŽàŽŽàŽ¿àŽàµàŽàµ +torlauncher.bootstrapWarning.connectrefused=àŽàŽ£àŽàµàŽ·àµ» àŽšàŽ¿àŽ°àŽžàŽ¿àŽàµàŽàµ +torlauncher.bootstrapWarning.misc=àŽàŽàŽàŽ²àµŒàŽšàµàŽš +torlauncher.bootstrapWarning.resourcelimit=àŽàµàŽ±àŽàµàŽ àŽàŽªàŽŸàŽ§àŽ¿àŽàµŸ +torlauncher.bootstrapWarning.identity=àŽµàµàŽ¯àŽàµàŽ€àŽ¿àŽ€àµàŽµàŽ àŽªàµàŽ°àµàŽ€àµàŽ€àŽªàµàŽªàµàŽàµàŽšàµàŽšàŽ¿àŽ²àµàŽ² +torlauncher.bootstrapWarning.timeout=àŽàŽ£àŽàµàŽ·àµ» àŽžàŽ®àŽ¯àŽ àŽàŽŽàŽ¿àŽàµàŽàµ +torlauncher.bootstrapWarning.noroute=àŽ¹àµàŽžàµàŽ±àµàŽ±àµ àŽàµàŽ¯àµàŽ¯àŽŸàµ» àŽàŽ°àµ àŽ±àµàŽàµàŽàµàŽ àŽàŽ²àµàŽ² +torlauncher.bootstrapWarning.ioerror=àŽ±àµàŽ¡àµ àŽµàŽ±àµàŽ±àµàŽ±àµ àŽ€àµàŽ±àµàŽ±àµ +torlauncher.bootstrapWarning.pt_missing=àŽªàµàŽ²àµàŽàµâàŽàŽ¬àŽ¿àµœ àŽàµàŽ°àŽŸàµ»àŽžàµâàŽªàµàµŒàŽàµ àŽàŽŸàŽ£àŽŸàŽšàŽ¿àŽ²àµàŽ² -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=àŽžàµŒàŽµàŽ°àµàŽ àŽàŽ¯àŽ¿àŽàµàŽàµàŽ³àµàŽ³ àŽ¬àŽšàµàŽ§àŽ àŽšàŽ·àµàŽàŽªàµàŽªàµàŽàµàŽàµ +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=àŽžàµŒàŽµàŽ±àµàŽ®àŽŸàŽ¯àŽ¿ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàŽŸàµ» àŽàŽŽàŽ¿àŽ¯àµàŽšàµàŽšàŽ¿àŽ²àµàŽ² +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=àŽªàµàŽ°àµàŽàµàŽžàŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àŽŸàµ» àŽàŽŽàŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index db8b132..35bb8fe 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -72,11 +72,11 @@ torlauncher.bootstrapStatus.ap_conn_pt=Bygger kretser: Kobler til bro torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kretser: Koblet til bro torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretser: Kobler til proxy torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kretser: Koblet til proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.ap_conn=Bygger kretser: Kobler til et Tor-relÃ© +torlauncher.bootstrapStatus.ap_conn_done=Bygger kretser: Koblet til et Tor-relÃ© +torlauncher.bootstrapStatus.ap_handshake=Bygger kretser: Forhandler med et Tor-relÃ© +torlauncher.bootstrapStatus.ap_handshake_done=Bygger kretser: Ferdig med Ã¥ forhandle med et Tor-relÃ© +torlauncher.bootstrapStatus.circuit_create=Bygger kretser: Etablering av en Tor-krets torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket! torlauncher.bootstrapWarning.done=ferdig diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 1b63518..f39a8f9 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -55,7 +55,7 @@ <!ENTITY torsettings.proxyHelp1 "Een lokale proxy kan nodig zijn als u verbinding maakt via het netwerk van een bedrijf, school of universiteit. Als u niet zeker weet of een proxy nodig is, bekijk dan de internetinstellingen in een andere browser, of bekijk de netwerkinstellingen van uw systeem."> <!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp"> -<!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet-vermelde relays die het moeilijk maken om verbindingen met het Tor-netwerk te blokkeren.  Elk van deze bridges gebruikt een andere methode om censuur te vermijden.  Degene die obfs gebruiken, laten uw verkeer eruitzien als willekeurige ruis, en degene die meek gebruiken, laten uw netwerk verkeer eruitzien alsof u met een andere service dan Tor verbinding maakt."> +<!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet-vermelde relays die het moeilijker maken om verbindingen met het Tor-netwerk te blokkeren.  Elk type bridge gebruikt een andere methode om censuur te vermijden.  Bridges die obfs gebruiken, laten uw verkeer eruitzien als willekeurige ruis, en bridges die meek gebruiken, laten uw netwerkverkeer eruitzien alsof u met een andere service dan Tor verbinding maakt."> <!ENTITY torsettings.bridgeHelp2 "Vanwege de manier waarop bepaalde landen Tor proberen te blokkeren, werken sommige bridges in bepaalde landen wel, maar niet in andere.  Als u niet zeker weet welke bridges in uw land werken, bezoek dan torproject.org/about/contact.html#support">  diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 56d6363..6edbe32 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -3,31 +3,31 @@ torlauncher.error_title=Tor Starter -torlauncher.tor_exited_during_startup=Tor is onverwachts afgesloten tijdens het opstarten. Dit kan veroorzaakt zijn door een fout in uw torrc bestand, een bug in Tor zelf, slecht werkende hardware of door een ander op je systeem geÃ¯nstalleerd programma. Totdat dit probleem is opgelost en u Tor opnieuw opgestart heeft, zal de Tor Browser niet opstarten. -torlauncher.tor_exited=Tor is onverwachts afgesloten. Dit kan veroorzaakt zijn door een fout in Tor zelf, een ander op je systeem geÃ¯nstalleerd programma of door slecht functionerende hardware. Totdat je tor opnieuw hebt opgestart zal de Tor Browser niet in staat zijn een website te bereiken. Stuur een kopie van je Tor Log naar het support team als het probleem zich voor blijft doen. -torlauncher.tor_exited2=Tor herstarten zal niet uw browser tabbladen sluiten. -torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort. -torlauncher.tor_failed_to_start=Tor kon niet starten. +torlauncher.tor_exited_during_startup=Tor is afgesloten tijdens het opstarten. Dit kan komen door een fout in uw torrc-bestand, een bug in Tor of ander programma op uw systeem, of defecte hardware. Totdat u het onderliggende probleem oplost en Tor opnieuw start, zal Tor Browser niet opstarten. +torlauncher.tor_exited=Tor is onverwachts afgesloten. Dit kan komen door een fout in Tor zelf, een ander programma op uw systeem, of defecte hardware. Totdat u Tor opnieuw start, zal Tor Browser geen websites kunnen bereiken. Stuur een kopie van uw Tor-logboek naar het ondersteuningsteam als het probleem zich blijft voordoen. +torlauncher.tor_exited2=Tor herstarten zal niet uw browsertabbladen sluiten. +torlauncher.tor_controlconn_failed=Kon geen verbinding maken met Tor-controlepoort. +torlauncher.tor_failed_to_start=Tor kon niet worden gestart. torlauncher.tor_control_failed=Controle over Tor mislukt. -torlauncher.tor_bootstrap_failed=Tor kon geen Tor netwerkverbinding maken -torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S). +torlauncher.tor_bootstrap_failed=Tor kon geen Tor-netwerkverbinding maken. +torlauncher.tor_bootstrap_failed_details=%1$S mislukt (%2$S). torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S -torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt. -torlauncher.torrc_missing=Het torrc bestand is missend en kon niet worden aangemaakt. -torlauncher.datadir_missing=De Tor data directory bestaat niet en kon niet worden aangemaakt. -torlauncher.password_hash_missing=Ophalen van een gehashed wachtwoord is mislukt. +torlauncher.tor_missing=Het uitvoerbare Tor-bestand ontbreekt. +torlauncher.torrc_missing=Het torrc-bestand ontbreekt en kon niet worden aangemaakt. +torlauncher.datadir_missing=De Tor-gegevensmap bestaat niet en kon niet worden aangemaakt. +torlauncher.password_hash_missing=Ophalen van gehasht wachtwoord is mislukt. -torlauncher.failed_to_get_settings=Kon Tor instellingen niet ophalen.\n\n%S -torlauncher.failed_to_save_settings=Kon Tor instellingen niet opslaan.\n\n%S -torlauncher.ensure_tor_is_running=Controleer dat Tor actief is alstublieft. +torlauncher.failed_to_get_settings=Kon Tor-instellingen niet ophalen.\n\n%S +torlauncher.failed_to_save_settings=Kon Tor-instellingen niet opslaan.\n\n%S +torlauncher.ensure_tor_is_running=Zorg ervoor dat Tor actief is. -torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en een poortnummer invoeren om Tor te configureren om een ââproxy te gebruiken om toegang te krijgen tot het internet. -torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen. -torlauncher.error_bridges_missing=Je moet Ã©Ã©n of meerdere bridges opgeven. -torlauncher.error_default_bridges_type_missing=Je moet een transport-type selecteren voor de verstrekte bridges. +torlauncher.error_proxy_addr_missing=U moet zowel een IP-adres of hostnaam en een poortnummer opgeven om Tor te configureren voor het gebruik van een ââproxy om toegang te krijgen tot het internet. +torlauncher.error_proxy_type_missing=U moet het proxytype selecteren. +torlauncher.error_bridges_missing=U moet een of meer bridges opgeven. +torlauncher.error_default_bridges_type_missing=U moet een transporttype selecteren voor de verstrekte bridges. torlauncher.error_bridgedb_bridges_missing=Vraag een bridge aan. -torlauncher.error_bridge_bad_default_type=GÃ©Ã©n van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub je instellingen aan. +torlauncher.error_bridge_bad_default_type=Er zijn geen verstrekte bridges met het transporttype %S beschikbaar. Pas uw instellingen aan. torlauncher.bridge_suffix.meek-amazon=(Werkt in China) torlauncher.bridge_suffix.meek-azure=(werkt in China) @@ -36,59 +36,59 @@ torlauncher.request_a_bridge=Een bridge aanvragenâŠ torlauncher.request_a_new_bridge=Een nieuwe bridge aanvragenâŠ torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. torlauncher.captcha_prompt=Los de CAPTCHA op om een bridge aan te vragen. -torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. +torlauncher.bad_captcha_solution=De oplossing is niet juist. Probeer het opnieuw. torlauncher.unable_to_get_bridge=Kan geen bridge verkrijgen van BridgeDB.\n\n%S torlauncher.no_meek=Deze browser is niet geconfigureerd voor meek, wat nodig is om bridges te verkrijgen. torlauncher.no_bridges_available=Er zijn op dit moment geen bridges beschikbaar. -torlauncher.connect=Verbind -torlauncher.restart_tor=Herstart Tor -torlauncher.quit=Stop -torlauncher.quit_win=Sluit af -torlauncher.done=OK +torlauncher.connect=Verbinden +torlauncher.restart_tor=Tor herstarten +torlauncher.quit=Stoppen +torlauncher.quit_win=Afsluiten +torlauncher.done=Gereed -torlauncher.forAssistance=Voor hulp, contacteer %S -torlauncher.forAssistance2=Voor bijstand, bezoek %S +torlauncher.forAssistance=Neem contact op met %S voor hulp +torlauncher.forAssistance2=Bezoek %S voor hulp -torlauncher.copiedNLogMessages=KopiÃ«ren klaar. %S Tor logberichten zijn klaar om in een teksteditor of een e-mailbericht te worden geplakt. +torlauncher.copiedNLogMessages=KopiÃ«ren voltooid. %S Tor-logberichten kunnen in een teksteditor of een e-mailbericht worden geplakt. torlauncher.bootstrapStatus.starting=Starten -torlauncher.bootstrapStatus.conn_pt=Verbinden met brug -torlauncher.bootstrapStatus.conn_done_pt=Verbonden met brug +torlauncher.bootstrapStatus.conn_pt=Verbinden met bridge +torlauncher.bootstrapStatus.conn_done_pt=Verbonden met bridge torlauncher.bootstrapStatus.conn_proxy=Verbinden met proxy torlauncher.bootstrapStatus.conn_done_proxy=Verbonden met proxy torlauncher.bootstrapStatus.conn=Verbinden met een Tor-relay torlauncher.bootstrapStatus.conn_done=Verbonden met een Tor-relay torlauncher.bootstrapStatus.handshake=Onderhandelen met een Tor-relay torlauncher.bootstrapStatus.handshake_done=Onderhandelen met een Tor-relay voltooid -torlauncher.bootstrapStatus.onehop_create=Maken van een versleutelde verbinding met de lijst -torlauncher.bootstrapStatus.requesting_status=Ontvangen van de netwerkstatus -torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus -torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten -torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie -torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie +torlauncher.bootstrapStatus.onehop_create=Een versleutelde adreslijstverbinding maken +torlauncher.bootstrapStatus.requesting_status=Netwerkstatus ophalen +torlauncher.bootstrapStatus.loading_status=Netwerkstatus laden +torlauncher.bootstrapStatus.loading_keys=Autoriteitscertificaten laden +torlauncher.bootstrapStatus.requesting_descriptors=Relay-informatie opvragen +torlauncher.bootstrapStatus.loading_descriptors=Relay-informatie laden torlauncher.bootstrapStatus.enough_dirinfo=Laden van relay-informatie voltooid -torlauncher.bootstrapStatus.ap_conn_pt=Circuit maken: verbinden met brug -torlauncher.bootstrapStatus.ap_conn_done_pt=Circuits bouwen: verbonden met bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Circuits bouwen: verbinden met proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Circuits bouwen: verbonden met proxy -torlauncher.bootstrapStatus.ap_conn=Circuits bouwen: verbinden met een Tor-relay -torlauncher.bootstrapStatus.ap_conn_done=Circuit opbouwen: Verbonden met een Tor relay -torlauncher.bootstrapStatus.ap_handshake=Circuits opzetten: onderhandelen met een Tor-relay -torlauncher.bootstrapStatus.ap_handshake_done=Circuits opzetten: onderhandelen met een Tor-relay voltooid -torlauncher.bootstrapStatus.circuit_create=Circuits opzetten: Tor-circuit tot stand brengen +torlauncher.bootstrapStatus.ap_conn_pt=Circuits opbouwen: verbinden met bridge +torlauncher.bootstrapStatus.ap_conn_done_pt=Circuits opbouwen: verbonden met bridge +torlauncher.bootstrapStatus.ap_conn_proxy=Circuits opbouwen: verbinden met proxy +torlauncher.bootstrapStatus.ap_conn_done_proxy=Circuits opbouwen: verbonden met proxy +torlauncher.bootstrapStatus.ap_conn=Circuits opbouwen: verbinden met een Tor-relay +torlauncher.bootstrapStatus.ap_conn_done=Circuits opbouwen: verbonden met een Tor-relay +torlauncher.bootstrapStatus.ap_handshake=Circuits opbouwen: onderhandelen met een Tor-relay +torlauncher.bootstrapStatus.ap_handshake_done=Circuits opbouwen: onderhandelen met een Tor-relay voltooid +torlauncher.bootstrapStatus.circuit_create=Circuits opbouwen: Tor-circuit tot stand brengen torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk! -torlauncher.bootstrapWarning.done=uitgevoerd +torlauncher.bootstrapWarning.done=gereed torlauncher.bootstrapWarning.connectrefused=verbinding geweigerd -torlauncher.bootstrapWarning.misc=willekeurig -torlauncher.bootstrapWarning.resourcelimit=onvoldoende resources +torlauncher.bootstrapWarning.misc=overig +torlauncher.bootstrapWarning.resourcelimit=onvoldoende bronnen torlauncher.bootstrapWarning.identity=identiteitsfout -torlauncher.bootstrapWarning.timeout=verbindingstimeout -torlauncher.bootstrapWarning.noroute=geen route naar de server -torlauncher.bootstrapWarning.ioerror=lees/schrijffout -torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer +torlauncher.bootstrapWarning.timeout=verbindingstime-out +torlauncher.bootstrapWarning.noroute=geen route naar host +torlauncher.bootstrapWarning.ioerror=lees-/schrijffout +torlauncher.bootstrapWarning.pt_missing=pluggable transport ontbreekt torlauncher.nsresult.NS_ERROR_NET_RESET=De verbinding met de server is verbroken. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon niet verbinden met de server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon niet verbinden met de proxy. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon geen verbinding maken met de server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon geen verbinding maken met de proxy. diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties index 5eb4dfa..548e598 100644 --- a/src/chrome/locale/sk/torlauncher.properties +++ b/src/chrome/locale/sk/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=SpÃºÅ¡Å¥aÄ Tor torlauncher.tor_exited_during_startup=Tor bol ukonÄenÃœ poÄas spÃºÅ¡Å¥ania. Mohla to spÃŽsibiÅ¥ chyba vo VaÅ¡om torrc sÃºbore, chyba v Tor alebo inom programe vo VaÅ¡om systÃ©me, alebo chybnÃœ hardvÃ©r. KÃœm nevyrieÅ¡ite tento problÃ©m a nereÅ¡tartujete Tor, nebude moÅŸnÃ© spustiÅ¥ prehliadaÄ Tor. -torlauncher.tor_exited=Tor bol neoÄakÃ¡vane ukonÄenÃœ. Mohlo to byÅ¥ spÃŽsobenÃ© chybou v Tor samotnom, inÃœm programom vo vaÅ¡om systÃ©me, alebo chybnÃœm hardvÃ©rom. KÃœm nereÅ¡tartujete Tor, Tor Browser nebude schopnÃœ otvoriÅ¥ akÃ©koÄŸvek webovÃ© strÃ¡nky. Ak problÃ©m pretrvÃ¡va, prosÃm poÅ¡lite kÃ³piu Tor logu tÃmu podpory. +torlauncher.tor_exited=Tor bol neoÄakÃ¡vane ukonÄenÃœ. Mohlo to byÅ¥ spÃŽsobenÃ© chybou v Tor samotnom, inÃœm programom vo vaÅ¡om systÃ©me, alebo chybnÃœm hardvÃ©rom. KÃœm nereÅ¡tartujete Tor, PrehliadaÄ Tor nebude schopnÃœ otvoriÅ¥ akÃ©koÄŸvek webovÃ© strÃ¡nky. Ak problÃ©m pretrvÃ¡va, prosÃm poÅ¡lite kÃ³piu Tor logu tÃmu podpory. torlauncher.tor_exited2=ReÅ¡tartovanie Tor nezatvorÃ VaÅ¡e zÃ¡loÅŸky prehliadaÄa. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiÅ¥ ku kontrolnÃ©mu portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiÅ¥. diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index 436f2c1..a66e6eb 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -41,10 +41,10 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. -torlauncher.connect=Connect +torlauncher.connect=Ø±Ø§ØšØ·Û Ú©Ø±ÛÚº torlauncher.restart_tor=Restart Tor torlauncher.quit=ÚÚŸÙÚØ¯ÛØ¬ÛÛ (Quit) -torlauncher.quit_win=Exit +torlauncher.quit_win=Ø®Ø§Ø±Ø¬ Ú©Ø±ÙØ§ torlauncher.done=ÙÚ©ÙÙ ÛÙÚ¯ÛØ§ torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 464c60a..3fff34e 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -1,5 +1,5 @@ <!ENTITY torsettings.dialog.title "æŽè¥è·¯ç±ç¶²è·¯èšå®"> -<!ENTITY torsettings.wizard.title.default "é£çµ Tor"> +<!ENTITY torsettings.wizard.title.default "é£ç·å° Tor"> <!ENTITY torsettings.wizard.title.configure "Tor ç¶²è·¯èšå®"> <!ENTITY torsettings.wizard.title.connecting "å»ºç« Tor é£ç·"> @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "é»æ"é£æ¥"äŸé£äž Tor "> -<!ENTITY torSettings.configurePrompt "åŠææšèæŒæç£èŠtorç¶²çµ¡çåå®¶ïŒäŸåŠååïŒäžåïŒåè³å¶ïŒæèæšäœæŒç§äººç¶²è·¯äžïŒéèŠä»£çèšªåäºè¯ç¶²ãè«é»æïŒãèšå®ãæŽæ¹ç¶²è·¯èšçœ®ã"> +<!ENTITY torSettings.configurePrompt "åŠææšèæŒæç£èŠ tor ç¶²è·¯çåå®¶ïŒäŸåŠååãäžåãåè³å¶ïŒæèæšäœæŒéèŠä»£çäŒºæåšçç§äººç¶²è·¯äžïŒè«é»æãèšå®ãäŸèª¿æŽç¶²è·¯èšå®ã"> <!ENTITY torSettings.configure "èšå®"> <!ENTITY torSettings.connect "é£æ¥"> @@ -36,12 +36,12 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "éå°é»èŠééæååªåèš±é£æ¥è³ç¹å®é£ç·å çé²ç«ç"> +<!ENTITY torsettings.firewall.checkbox "éå°é»èŠééæååªåèš±é£æ¥è³ç¹å®é£æ¥å çé²ç«ç"> <!ENTITY torsettings.firewall.allowedPorts "åèš±çé£æ¥å ïŒ"> <!ENTITY torsettings.useBridges.checkbox "æçåå®¶äž Tor åå°å¯©æ¥"> <!ENTITY torsettings.useBridges.default "éžæå§å»ºçæ©æ¥"> -<!ENTITY torsettings.useBridges.default.placeholder "éžæç¶²æ©"> -<!ENTITY torsettings.useBridges.bridgeDB "åŸ torproject.org è«æ±ç¶²æ©"> +<!ENTITY torsettings.useBridges.default.placeholder "éžææ©æ¥"> +<!ENTITY torsettings.useBridges.bridgeDB "åŸ torproject.org è«æ±æ©æ¥"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "èŒžå¥åçäžçæå"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "ç²åŸæ°çææ°"> <!ENTITY torsettings.useBridges.captchaSubmit "æäº€"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "ç¶æšééå¬åžãåžæ ¡æèå€§åžç¶²è·¯é²è¡é£ç·æïŒæšå¯èœéèŠäžåæ¬å°ä»£çäŒºæåšãåŠææšäžç¢ºå®æ¯åŠéèŠä»£çäŒºæåšïŒè«åèå¶ä»çèŠœåšçç¶²è·¯èšå®æèç³»çµ±ç¶²è·¯èšå®ã"> <!ENTITY torsettings.bridgeHelpTitle "æ©æ¥äžç¹Œåšä¹èªªæ"> -<!ENTITY torsettings.bridgeHelp1 "ç¶²æ©æ¯æªäœæŒåè¡šçäžç¹ŒïŒå¯ä»¥äœ¿åŸtorç¶²çµ¡æŽé£è¢«å±èœã äžåé¡å¥çç¶²æ©äœ¿çšäžåæ¹æ³èŠé¿å¯©æ¥ã. Â obfsäœ¿æšçéèšé¡äŒŒéšæ©çŒåºçéé³ïŒmeekäœ¿æšçéèšçèµ·äŸæ¯èšªåä»åçæåèäžæ¯torã"> -<!ENTITY torsettings.bridgeHelp2 "å çºæäºåå®¶åè©Šå±èœtorïŒäžäºç¹å®çç¶²æ©åªèœåšç¹å®çåå®¶çæåšå¶ä»å°ååæå€±æŽ»ã åŠææšäžç¢ºå®åªäºç¶²æ©åšæšçåå®¶çæïŒè«èšªåtorproject.org/about/contact.html#supportã"> +<!ENTITY torsettings.bridgeHelp1 "æ©æ¥æ¯æªååºçäžç¹ŒïŒå¯ä»¥äœ¿åŸ Tor ç¶²è·¯æŽé£è¢«å°éã  äžåé¡åçæ©æ¥äœ¿çšäžåæ¹æ³èŠé¿å¯©æ¥ã  obfs äœ¿æšçéèšé¡äŒŒéšæ©çŒåºçéé³ïŒmeek äœ¿æšçéèšçèµ·äŸæ¯èšªåä»åçæåèäžæ¯ Torã"> +<!ENTITY torsettings.bridgeHelp2 "å çºæäºåå®¶åè©Šå°é TorïŒäžäºç¹å®çæ©æ¥åªèœåšç¹å®çåå®¶ææïŒåšå¶ä»å°ååæå€±æã  åŠææšäžç¢ºå®åªäºæ©æ¥åšæšçåå®¶ææïŒè«èšªå torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "è«èå¿çåïŒæåæ£åšå»ºç«torç¶²çµ¡ã éåéçšå°æéèŠå¹Ÿåéçæéã"> +<!ENTITY torprogress.pleaseWait "è«èå¿çåïŒæåæ£åšå»ºç« Tor ç¶²è·¯é£ç·ã  éåéçšå¯èœéèŠå¹Ÿåéçæéã"> diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 12f03d9..47124e5 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -15,7 +15,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S å€±æ (%2$S)ã torlauncher.unable_to_start_tor=ç¡æ³ååæŽè¥è·¯ç±ã\n\n%S torlauncher.tor_missing=æŽè¥è·¯ç±å¯å·è¡æªéºå€±ã torlauncher.torrc_missing=æŽè¥è·¯ç±çéçœ®æä»¶éºå€±èäžç¡æ³åµå»ºã -torlauncher.datadir_missing=æŽè¥è·¯ç±çè³æè·¯åŸäžŠäžååšïŒäžç¡æ³è¢«åµå»ºã +torlauncher.datadir_missing=æŽè¥è·¯ç±çè³æå€ŸäžååšïŒäžç¡æ³è¢«åµå»ºã torlauncher.password_hash_missing=ç¡æ³ååŸéæ¹éçå¯ç¢Œã torlauncher.failed_to_get_settings=ç¡æ³æ·åæŽè¥è·¯ç±èšå®ã\n\n%S @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=æšå¿é æå®äžå IP äœåæäž»æ©å torlauncher.error_proxy_type_missing=æšå¿é éžæä»£çäŒºæåšé¡åã torlauncher.error_bridges_missing=æšå¿é æå®äžåæå€åæ©æ¥ã torlauncher.error_default_bridges_type_missing=æšå¿é çºè©²æ©æ¥åšéžæäžçš®å³èŒžé¡åã -torlauncher.error_bridgedb_bridges_missing=è«è«æ±äžåbridge +torlauncher.error_bridgedb_bridges_missing=è«è«æ±äžåæ©æ¥ torlauncher.error_bridge_bad_default_type=æ²ææäŸå³èŒžé¡åçº %S çæ©æ¥åšãè«èª¿æŽæšçèšå®ã torlauncher.bridge_suffix.meek-amazon=ïŒèœåšäžåäœ¿çšïŒ torlauncher.bridge_suffix.meek-azure=ïŒèœåšäžåäœ¿çšïŒ -torlauncher.request_a_bridge=è«æ±äžåbridge... -torlauncher.request_a_new_bridge=è«æ±äžåæ°çbridge... -torlauncher.contacting_bridgedb=é£æ¥å°BridgeDBïŒ è«çåŸã +torlauncher.request_a_bridge=è«æ±äžåæ©æ¥... +torlauncher.request_a_new_bridge=è«æ±äžåæ°çæ©æ¥... +torlauncher.contacting_bridgedb=æ£åšé£æ¥å° BridgeDBïŒè«çšçã torlauncher.captcha_prompt=è§£æ±ºé©èç¢ŒäŸè«æ±æ©æ¥ torlauncher.bad_captcha_solution=è§£çäžæ£ç¢ºãè«åè©Šäžæ¬¡ã torlauncher.unable_to_get_bridge=ç¡æ³åŸ BridgeDB ç²åŸæ©æ¥ã\n\n%S torlauncher.no_meek=æ€çèŠœåšæ²æèšå®å¥œ meekïŒç²åŸæ©æ¥éèŠäœ¿çšå®ã -torlauncher.no_bridges_available=æ±æïŒçŸåšæ²æå¯ä»¥äœ¿çšçbridge +torlauncher.no_bridges_available=æ±æïŒçŸåšæ²æå¯ä»¥äœ¿çšçæ©æ¥ã torlauncher.connect=é£ç· torlauncher.restart_tor=éæ°ååæŽè¥è·¯ç±

1 0

[tor-browser-build/master] Update testsuite_git_commit: Add android-x86_64 to nightly builds
by boklm＠torproject.org 27 Sep '19

27 Sep '19

commit 3648313adf9f11f692055ef449be013ee36b4661 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 27 13:51:45 2019 +0200 Update testsuite_git_commit: Add android-x86_64 to nightly builds --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index acc88f9..34d3929 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: 6a2c39273bfd729446ef787e4f7d1bf3138cfc4a +testsuite_git_commit: d5e23151bf4ff48146c0c33355fe70def5e4d3f2 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser-bundle-testsuite/master] Add android-x86_64 to nightly builds
by boklm＠torproject.org 27 Sep '19

27 Sep '19

commit d5e23151bf4ff48146c0c33355fe70def5e4d3f2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 27 13:47:54 2019 +0200 Add android-x86_64 to nightly builds --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index a6def45..1389092 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -104,6 +104,18 @@ sub set_tests { publish_dir => 'nightly-android-x86', }, { + name => 'nightly-android-x86_64', + descr => 'build tor-browser nightly android-x86_64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'torbrowser-android-x86_64', + ], + publish_dir => 'nightly-android-x86_64', + }, + { name => 'nightly-android-aarch64', descr => 'build tor-browser nightly android-aarch64', type => 'rbm_build',

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 1MB. r=jrmuizel
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit e179405cb2f2e8fbbde1ce75b7d7dd9eadc2d4a0 Author: Lee Salzman <lsalzman(a)mozilla.com> Date: Mon Sep 23 20:02:17 2019 +0000 Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 1MB. r=jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D46834 --HG-- extra : moz-landing-system : lando --- gfx/layers/PaintThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp index c35bf472d682..400e2d342b2f 100644 --- a/gfx/layers/PaintThread.cpp +++ b/gfx/layers/PaintThread.cpp @@ -79,7 +79,7 @@ static uint32_t GetPaintThreadStackSize() { #else // Workaround bug 1578075 by increasing the stack size of paint threads if (nsCocoaFeatures::OnCatalinaOrLater()) { - static const uint32_t kCatalinaPaintThreadStackSize = 512 * 1024; + static const uint32_t kCatalinaPaintThreadStackSize = 1024 * 1024; static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE, "update default stack size of paint " "workers");

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1578075 - Increase stack size of paint thread/workers on OSX Catalina or higher to workaround crash from recursion in CoreText. r=jrmuizel, a=RyanVM
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit 632458daf11b954319219ea62e259f50b4fd9ed3 Author: Ryan Hunt <rhunt(a)eqrion.net> Date: Tue Sep 10 15:20:34 2019 +0000 Bug 1578075 - Increase stack size of paint thread/workers on OSX Catalina or higher to workaround crash from recursion in CoreText. r=jrmuizel, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D45370 --HG-- extra : source : cd0ea6dafa051426035949cfbbfdeb04c1c05661 extra : intermediate-source : ffefc518e569164c2c2e62258504bdc69d111bb3 --- gfx/layers/PaintThread.cpp | 24 +++++++++++++++++++++++- widget/cocoa/nsCocoaFeatures.h | 1 + widget/cocoa/nsCocoaFeatures.mm | 5 +++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp index 3ee7c86760ea..c35bf472d682 100644 --- a/gfx/layers/PaintThread.cpp +++ b/gfx/layers/PaintThread.cpp @@ -19,7 +19,11 @@ #include "mozilla/Preferences.h" #include "mozilla/SharedThreadPool.h" #include "mozilla/SyncRunnable.h" +#ifdef XP_MACOSX +#include "nsCocoaFeatures.h" +#endif #include "nsIPropertyBag2.h" +#include "nsIThreadManager.h" #include "nsServiceManagerUtils.h" #include "prsystem.h" @@ -69,11 +73,28 @@ void PaintThread::Start() { } } +static uint32_t GetPaintThreadStackSize() { +#ifndef XP_MACOSX + return nsIThreadManager::DEFAULT_STACK_SIZE; +#else + // Workaround bug 1578075 by increasing the stack size of paint threads + if (nsCocoaFeatures::OnCatalinaOrLater()) { + static const uint32_t kCatalinaPaintThreadStackSize = 512 * 1024; + static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE, + "update default stack size of paint " + "workers"); + return kCatalinaPaintThreadStackSize; + } + return nsIThreadManager::DEFAULT_STACK_SIZE; +#endif +} + bool PaintThread::Init() { MOZ_ASSERT(NS_IsMainThread()); RefPtr<nsIThread> thread; - nsresult rv = NS_NewNamedThread("PaintThread", getter_AddRefs(thread)); + nsresult rv = NS_NewNamedThread("PaintThread", getter_AddRefs(thread), + nullptr, GetPaintThreadStackSize()); if (NS_FAILED(rv)) { return false; } @@ -102,6 +123,7 @@ void PaintThread::InitPaintWorkers() { if (count != 1) { mPaintWorkers = SharedThreadPool::Get(NS_LITERAL_CSTRING("PaintWorker"), count); + mPaintWorkers->SetThreadStackSize(GetPaintThreadStackSize()); } } diff --git a/widget/cocoa/nsCocoaFeatures.h b/widget/cocoa/nsCocoaFeatures.h index a4581c4d3195..0cc5a2d5c165 100644 --- a/widget/cocoa/nsCocoaFeatures.h +++ b/widget/cocoa/nsCocoaFeatures.h @@ -24,6 +24,7 @@ class nsCocoaFeatures { static bool OnSierraOrLater(); static bool OnHighSierraOrLater(); static bool OnMojaveOrLater(); + static bool OnCatalinaOrLater(); static bool IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix = 0); diff --git a/widget/cocoa/nsCocoaFeatures.mm b/widget/cocoa/nsCocoaFeatures.mm index 77bd3507e35f..41ca60e3b721 100644 --- a/widget/cocoa/nsCocoaFeatures.mm +++ b/widget/cocoa/nsCocoaFeatures.mm @@ -21,6 +21,7 @@ #define MAC_OS_X_VERSION_10_12_HEX 0x000010C0 #define MAC_OS_X_VERSION_10_13_HEX 0x000010D0 #define MAC_OS_X_VERSION_10_14_HEX 0x000010E0 +#define MAC_OS_X_VERSION_10_15_HEX 0x000010F0 #include "nsCocoaFeatures.h" #include "nsCocoaUtils.h" @@ -165,6 +166,10 @@ bool Gecko_OnHighSierraOrLater() { return nsCocoaFeatures::OnHighSierraOrLater() return (OSXVersion() >= MAC_OS_X_VERSION_10_14_HEX); } +/* static */ bool nsCocoaFeatures::OnCatalinaOrLater() { + return (OSXVersion() >= MAC_OS_X_VERSION_10_15_HEX); +} + /* static */ bool nsCocoaFeatures::IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix) { return OSXVersion() >= GetVersion(aMajor, aMinor, aBugFix);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 2MB. r=jrmuizel
by gk＠torproject.org 27 Sep '19

27 Sep '19

commit 7813cebd9f79de65d16e262ce79b675e7ec132c3 Author: Lee Salzman <lsalzman(a)mozilla.com> Date: Thu Sep 26 02:31:15 2019 +0000 Bug 1578075 - Increase stack size of paint threads on macOS Catalina to 2MB. r=jrmuizel Still getting some crash reports on nightly with a 1MB stack. Let's try one more time with 2MB just to see if we can eliminate those. If this fails, then we may need to consider more drastic approaches like disabling OMTP in this case. Differential Revision: https://phabricator.services.mozilla.com/D47080 --HG-- extra : moz-landing-system : lando --- gfx/layers/PaintThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp index 400e2d342b2f..40ba4d3954b1 100644 --- a/gfx/layers/PaintThread.cpp +++ b/gfx/layers/PaintThread.cpp @@ -79,7 +79,7 @@ static uint32_t GetPaintThreadStackSize() { #else // Workaround bug 1578075 by increasing the stack size of paint threads if (nsCocoaFeatures::OnCatalinaOrLater()) { - static const uint32_t kCatalinaPaintThreadStackSize = 1024 * 1024; + static const uint32_t kCatalinaPaintThreadStackSize = 2 * 1024 * 1024; static_assert(kCatalinaPaintThreadStackSize >= nsIThreadManager::DEFAULT_STACK_SIZE, "update default stack size of paint " "workers");

1 0

[tor-browser-build/master] Bug 27493: Clean up mozconfig options
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit e361790e2540af786386b6a13ac9477d82267db7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 3 11:38:14 2019 +0000 Bug 27493: Clean up mozconfig options --- projects/firefox/mozconfig-android-aarch64 | 1 + projects/firefox/mozconfig-android-armv7 | 1 + projects/firefox/mozconfig-android-x86 | 1 + projects/firefox/mozconfig-linux-i686 | 4 ---- projects/firefox/mozconfig-linux-x86_64 | 4 ---- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/firefox/mozconfig-windows-i686 | 2 -- projects/firefox/mozconfig-windows-x86_64 | 2 -- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 index f5c1474..368ba6f 100644 --- a/projects/firefox/mozconfig-android-aarch64 +++ b/projects/firefox/mozconfig-android-aarch64 @@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --without-google-play-services +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 75e1d78..35eac27 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --without-google-play-services +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index be1efd6..8447347 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --without-google-play-services +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index c8f19a4..da6cddf 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -2,9 +2,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 # We want to build with clang now and point to the GCC toolchain until #29041 is # fixed. We explicitly need to define the host compiler as well as for some @@ -22,7 +20,6 @@ ac_add_options --target=i686-linux-gnu ac_add_options --enable-linker=bfd ac_add_options --enable-optimize -#ac_add_options --disable-optimize ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 @@ -41,4 +38,3 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection -#ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 12f1b28..e0a764f 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -2,9 +2,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 # We want to build with clang now and point to the GCC toolchain until #29041 is # fixed. We explicitly need to define the host compiler as well as for some @@ -17,7 +15,6 @@ HOST_CXX=$CXX export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --enable-optimize -#ac_add_options --disable-optimize ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 @@ -36,4 +33,3 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection -#ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 07dd023..29e6617 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -27,9 +27,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-application=browser ac_add_options --enable-strip @@ -48,4 +46,3 @@ ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection -# ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 5538bc1..86e86e7 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -19,9 +19,7 @@ ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug # Until we build on a 64bit host we need to hack around linker errors due to diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index c95525b..2a128ae 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -19,9 +19,7 @@ ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize

1 0

[tor-browser-build/master] Merge branch 'bug_27493'
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit ec79824470dcd6815ffd903c8c9974808859f9e5 Merge: 74f1468 e361790 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 26 19:38:08 2019 +0000 Merge branch 'bug_27493' projects/firefox/mozconfig-android-aarch64 | 1 + projects/firefox/mozconfig-android-armv7 | 1 + projects/firefox/mozconfig-android-x86 | 1 + projects/firefox/mozconfig-linux-i686 | 4 ---- projects/firefox/mozconfig-linux-x86_64 | 4 ---- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/firefox/mozconfig-windows-i686 | 2 -- projects/firefox/mozconfig-windows-x86_64 | 2 -- 8 files changed, 3 insertions(+), 15 deletions(-) diff --cc projects/firefox/mozconfig-linux-i686 index 0a05864,da6cddf..95d14c1 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@@ -18,8 -16,10 +16,7 @@@ export BINDGEN_CFLAGS='--gcc-toolchain= ac_add_options --target=i686-linux-gnu -# XXX: gold and lld break when linking libxul, resort to bfd -ac_add_options --enable-linker=bfd - ac_add_options --enable-optimize - #ac_add_options --disable-optimize ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 @@@ -36,7 -38,3 +33,6 @@@ ac_add_options --disable-webrt # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection - #ac_add_options --disable-ctypes + +# Bug 31448: ld.gold fails if we don't disable debug-symbols +ac_add_options --disable-debug-symbols diff --cc projects/firefox/mozconfig-windows-i686 index eaa704f,86e86e7..60cf1c1 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@@ -19,11 -19,12 +19,9 @@@ ac_add_options --with-toolchain-prefix= ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" - mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug -# Until we build on a 64bit host we need to hack around linker errors due to -# memory constraints -ac_add_options --disable-debug-symbols ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --enable-official-branding

1 0

[tor-browser-build/master] Bug 31844: Fix unquoted paths in OpenSSL Windows build
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 7bab743e199ea3d3ba8ca3f5ba5289609035f37c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 25 14:10:12 2019 +0200 Bug 31844: Fix unquoted paths in OpenSSL Windows build The default OPENSSLDIR on Windows builds contain spaces and parenthesis, which break the build as the unquoted path is used in several places. We fix this by escaping the spaces and parenthesis. This is fixing part of the issues mentioned in: https://github.com/openssl/openssl/issues/9520 --- projects/openssl/build | 3 +++ projects/openssl/config | 2 ++ projects/openssl/escape-openssldir.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/projects/openssl/build b/projects/openssl/build index d53185e..3ee3571 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -13,6 +13,9 @@ export CC='gcc -m32' ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] +[% IF c("var/windows") -%] + patch -p1 < $rootdir/escape-openssldir.patch +[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] make diff --git a/projects/openssl/config b/projects/openssl/config index f648598..2fc46ea 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -29,3 +29,5 @@ input_files: project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' sha256sum: 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 + - filename: escape-openssldir.patch + enable: '[% c("var/windows") %]' diff --git a/projects/openssl/escape-openssldir.patch b/projects/openssl/escape-openssldir.patch new file mode 100644 index 0000000..684a179 --- /dev/null +++ b/projects/openssl/escape-openssldir.patch @@ -0,0 +1,28 @@ +diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl +index 7db7578a4b..e5ba20b589 100644 +--- a/Configurations/unix-Makefile.tmpl ++++ b/Configurations/unix-Makefile.tmpl +@@ -215,6 +215,7 @@ INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet + $prefix_dev -} + INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir); + $x =~ s|\\|/|g; ++ $x =~ s/([ ])/\\$1/g; + $x -} + OPENSSLDIR_dev={- # + # The logic here is that if no --openssldir was given, +@@ -239,6 +240,7 @@ OPENSSLDIR_dev={- # + $openssldir_dev -} + OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir); + $x =~ s|\\|/|g; ++ $x =~ s/([ ])/\\$1/g; + $x -} + LIBDIR={- our $libdir = $config{libdir} || "lib"; + File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -} +@@ -253,6 +255,7 @@ ENGINESDIR_dev={- use File::Spec::Win32; + $enginesdir_dev -} + ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir); + $x =~ s|\\|/|g; ++ $x =~ s/([ ])/\\$1/g; + $x -} + # In a Windows environment, $(DESTDIR) is harder to contatenate with other + # directory variables, because both may contain devices. What we do here is

1 0

[tor-browser-build/master] Bug 31844: Update openssl linux Configure targets
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 74f146865135f2a655c936164ffa2f5c25a4d05e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 26 20:35:07 2019 +0200 Bug 31844: Update openssl linux Configure targets With the linux-generic64 target the build is broken if we don't add the no-asm option: https://github.com/openssl/openssl/issues/9839 We fix that by switching to the linux-x86_64 target. At the same time we also switch the linux-generic32 target to linux-x86. --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 2fc46ea..0a60c24 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -10,10 +10,10 @@ var: targets: linux-x86_64: var: - configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-generic64 + configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-x86_64 linux-i686: var: - configure_opts: -shared linux-generic32 + configure_opts: -shared linux-x86 windows: var: flag_mwindows: ''

1 0

[tor-browser-build/master] Bug 31844: Use DESTDIR instead of --prefix when building OpenSSL
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit abdfbfdb3f4122300c3f3f5e745af1c74a559102 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 25 12:54:00 2019 +0200 Bug 31844: Use DESTDIR instead of --prefix when building OpenSSL This is fixing CVE-2019-1552: http://cve.circl.lu/cve/CVE-2019-1552 In oder to avoid changing the OPENSSLDIR to a directory that might be writable on the user system, we don't set the --prefix/--openssldir option anymore and use DESTDIR to select the packaging installation directory. --- projects/openssl/build | 5 +++-- projects/openssl/config | 2 ++ projects/tor/build | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 40dc526..d53185e 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -14,10 +14,11 @@ export CC='gcc -m32' export CC="cc [% c("var/FLAGS") %]" [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' -./Configure --prefix=$distdir [% c('var/configure_opts') %] +./Configure [% c('var/configure_opts') %] make -make install +make DESTDIR="$distdir" install cd /var/tmp/dist +ln -s '[% c("var/openssldir") %]' openssl/openssl [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/openssl/config b/projects/openssl/config index 27b9526..f648598 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -3,6 +3,7 @@ version: 1.1.1d filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: + openssldir: 'usr/local' container: use_container: 1 @@ -17,6 +18,7 @@ targets: var: flag_mwindows: '' configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' + openssldir: 'Program Files[% IF c("var/windows-i686") %] (x86)[% END %]/OpenSSL' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/projects/tor/build b/projects/tor/build index 0705626..2d10fb3 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -30,7 +30,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz libeventdir=/var/tmp/dist/libevent -openssldir=/var/tmp/dist/openssl +openssldir=/var/tmp/dist/openssl/openssl [% IF c("var/windows") %] [% IF c("var/nightly") %]

1 0

[tor-browser-build/master] Bug 31192 - Follow Mozilla for Android SDK config
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit cb97c6e9fd52e4a3871c8a1c2f77a00911f7d0ac Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 26 17:07:06 2019 +0000 Bug 31192 - Follow Mozilla for Android SDK config --- projects/firefox/mozconfig-android-aarch64 | 3 ++- projects/firefox/mozconfig-android-armv7 | 3 ++- projects/firefox/mozconfig-android-x86 | 3 ++- projects/firefox/mozconfig-android-x86_64 | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 index f5c1474..3d997bc 100644 --- a/projects/firefox/mozconfig-android-aarch64 +++ b/projects/firefox/mozconfig-android-aarch64 @@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++" +ac_add_options --with-android-min-sdk=21 + ac_add_options --enable-optimize ac_add_options --enable-official-branding @@ -12,7 +14,6 @@ ac_add_options --target=aarch64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=21 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 75e1d78..2ef6138 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++" +ac_add_options --with-android-min-sdk=16 + ac_add_options --enable-optimize ac_add_options --enable-official-branding @@ -12,7 +14,6 @@ ac_add_options --target=arm-linux-androideabi ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=16 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index be1efd6..966ef3f 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++" +ac_add_options --with-android-min-sdk=16 + ac_add_options --enable-optimize ac_add_options --enable-official-branding @@ -12,7 +14,6 @@ ac_add_options --target=i686-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=16 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 index 55bc883..17c3906 100644 --- a/projects/firefox/mozconfig-android-x86_64 +++ b/projects/firefox/mozconfig-android-x86_64 @@ -14,7 +14,6 @@ ac_add_options --target=x86_64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle -ac_add_options --with-android-version=21 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser ac_add_options --with-l10n-base=/var/tmp/dist/locales

1 0

[tor-browser-build/master] Bug 31192 - Pick up new tor-android-service commit
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 2d3807e3a2b072f7d3d9bb24419e0b0e6688b26a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 24 16:58:59 2019 +0000 Bug 31192 - Pick up new tor-android-service commit --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 762a813..db8f5ac 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 8d307a63a95a31d3578715ca407066062f9d7f5e +git_hash: 50d01b1fbc6e776d0b39f42f644137dd25a92c7a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 30380 - Add patch for canceling Dormant by startup
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit e30f06ac6c40a32354fe01a2613fb3c2a63e630c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 26 00:52:18 2019 +0000 Bug 30380 - Add patch for canceling Dormant by startup --- projects/tor-onion-proxy-library/build | 1 + .../tor-onion-proxy-library/canceldormant.patch | 46 ++++++++++++++++++++++ projects/tor-onion-proxy-library/config | 1 + 3 files changed, 48 insertions(+) diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 605f017..41cc815 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -18,6 +18,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Patch projects cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch +patch -p1 < $rootdir/canceldormant.patch # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/canceldormant.patch b/projects/tor-onion-proxy-library/canceldormant.patch new file mode 100644 index 0000000..8d48af1 --- /dev/null +++ b/projects/tor-onion-proxy-library/canceldormant.patch @@ -0,0 +1,46 @@ +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java +index 5f5adac..da6747f 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java +@@ -187,4 +187,9 @@ public class DefaultSettings implements TorSettings { + public boolean useSocks5() { + return false; + } ++ ++ @Override ++ public boolean hasDormantCanceledByStartup() { ++ return false; ++ } + } +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index e324d9f..99e5693 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -503,6 +503,16 @@ public final class TorConfigBuilder { + return virtualAddressNetwork(settings.getVirtualAddressNetwork()); + } + ++ public TorConfigBuilder dormantCanceledByStartup() { ++ buffer.append("DormantCanceledByStartup 1").append('\n'); ++ return this; ++ } ++ ++ @SettingsConfig ++ public TorConfigBuilder domantCanceledByStartupFromSettings() { ++ return settings.hasDormantCanceledByStartup() ? dormantCanceledByStartup() : this; ++ } ++ + /** + * Adds bridges from a resource stream. This relies on the TorInstaller to know how to obtain this stream. + * These entries may be type-specified like: +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java +index 2d515d1..43f01ef 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java +@@ -77,4 +77,6 @@ public interface TorSettings { + String transPort(); + + boolean useSocks5(); ++ ++ boolean hasDormantCanceledByStartup(); + } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 02b69ac..c2bd1a4 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -29,3 +29,4 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch + - filename: canceldormant.patch

1 0

[tor-browser-build/master] Bug 31192 - Add Android x86_64 build support
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit f89da2a9b03b70e1ec2e99248b86a96f989d3bed Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 18 20:19:32 2019 +0000 Bug 31192 - Add Android x86_64 build support --- Makefile | 15 ++++++++++ README | 2 ++ README.HACKING | 18 ++++++++---- README.MAKEFILE | 8 +++--- projects/android-toolchain/build | 3 +- projects/firefox/mozconfig-android-x86_64 | 48 +++++++++++++++++++++++++++++++ projects/release/build | 3 ++ projects/release/config | 12 ++++++++ projects/rust/config | 4 +++ projects/tor-browser/build.android | 5 ++++ rbm.conf | 9 ++++++ 11 files changed, 116 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 94a26f6..9f61bfb 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ release-android-armv7: submodule-update release-android-x86: submodule-update $(rbm) build release --target release --target torbrowser-android-x86 +release-android-x86_64: submodule-update + $(rbm) build release --target release --target torbrowser-android-x86_64 + release-android-aarch64: submodule-update $(rbm) build release --target release --target torbrowser-android-aarch64 @@ -44,6 +47,9 @@ alpha-android-armv7: submodule-update alpha-android-x86: submodule-update $(rbm) build release --target alpha --target torbrowser-android-x86 +alpha-android-x86_64: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-x86_64 + alpha-android-aarch64: submodule-update $(rbm) build release --target alpha --target torbrowser-android-aarch64 @@ -77,6 +83,9 @@ nightly-android-armv7: submodule-update nightly-android-x86: submodule-update $(rbm) build release --target nightly --target torbrowser-android-x86 +nightly-android-x86_64: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-x86_64 + nightly-android-aarch64: submodule-update $(rbm) build release --target nightly --target torbrowser-android-aarch64 @@ -110,6 +119,9 @@ alpha_nightly-android-armv7: submodule-update alpha_nightly-android-x86: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 +alpha_nightly-android-x86_64: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-x86_64 + alpha_nightly-android-aarch64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-aarch64 @@ -140,6 +152,9 @@ testbuild-android-armv7: submodule-update testbuild-android-x86: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-x86 +testbuild-android-x86_64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-x86_64 + testbuild-android-aarch64: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-aarch64 diff --git a/README b/README index 2ea5630..481db2e 100644 --- a/README +++ b/README @@ -79,7 +79,9 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 $ make nightly-android-armv7 + $ make nightly-android-aarch64 $ make nightly-android-x86 + $ make nightly-android-x86_64 When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. diff --git a/README.HACKING b/README.HACKING index 081a3d5..0d3eeb8 100644 --- a/README.HACKING +++ b/README.HACKING @@ -45,16 +45,18 @@ The targets are usually used to select: - the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, - torbrowser-android-armv7, torbrowser-android-x86 + torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86, + torbrowser-android-x86_64 - the channel: release, nightly, alpha The targets torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, -torbrowser-android-armv7, and torbrowser-android-x86 are special cases. They do -not contain options directly, instead they contain a list of other targets. For -instance, the torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and -linux targets. You should define an option under the linux target if it applies -to Linux on both architectures, or under the linux-x86_64 if it only applies to +torbrowser-android-armv7, torbrowser-android-x86, torbrowser-android-aarch64, +torbrowser-android-x86_64 are special cases. They do not contain options +directly, instead they contain a list of other targets. For instance, the +torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux +targets. You should define an option under the linux target if it applies to +Linux on both architectures, or under the linux-x86_64 if it only applies to the x86_64 architecture. An option that is defined at the root of rbm.conf can be overridden by @@ -156,8 +158,12 @@ $platform should be one of the following: - torbrowser-android-armv7 + - torbrowser-android-aarch64 + - torbrowser-android-x86 + - torbrowser-android-x86_64 + For example, to see tor's build script for linux x86_64 on the alpha channel, you can use: diff --git a/README.MAKEFILE b/README.MAKEFILE index addff64..e106ca4 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -8,7 +8,7 @@ Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version. release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} ----------------------------------------------------------------------- Same as release, for the selected platform only. @@ -18,7 +18,7 @@ Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version. alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} --------------------------------------------------------------------- Same as alpha, for the selected platform only. @@ -32,7 +32,7 @@ components. The resulting build can be found in directory nightly/$date nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} ----------------------------------------------------------------------- Same as nightly, for the selected platform only. @@ -43,7 +43,7 @@ This is the same as 'make alpha', but the output directory is different. The resulting build can be found in directory alpha_nightly/$date alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86} + android-x86,android-x86_64,android-aarch64} ----------------------------------------------------------------------------- The same as alpha_nightly, for the selected platform only. diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 42e961c..f4defc5 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -20,8 +20,9 @@ rm -fR android-ndk-r17b # The architectures we support ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm -./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64 +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86_64") %] --arch x86_64 --install-dir=./x86_64 # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 new file mode 100644 index 0000000..55bc883 --- /dev/null +++ b/projects/firefox/mozconfig-android-x86_64 @@ -0,0 +1,48 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 +CC="clang" +CXX="clang++" + +ac_add_options --with-android-min-sdk=21 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=x86_64-linux-android +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle +ac_add_options --with-android-version=21 + +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales + +# We do not use Tor Launcher on Android: +ac_add_options --disable-tor-launcher + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +ac_add_options --enable-proxy-bypass-protection diff --git a/projects/release/build b/projects/release/build index 347d9a8..c1badd6 100644 --- a/projects/release/build +++ b/projects/release/build @@ -10,6 +10,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-x86") -%] mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-x86_64") -%] + mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/ +[% END -%] [% IF c("var/torbrowser-android-aarch64") -%] mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/ [% END -%] diff --git a/projects/release/config b/projects/release/config index 524eadf..d1aee8c 100644 --- a/projects/release/config +++ b/projects/release/config @@ -17,6 +17,7 @@ targets: - torbrowser-osx-x86_64 - torbrowser-android-armv7 - torbrowser-android-x86 + - torbrowser-android-x86_64 - torbrowser-android-aarch64 - torbrowser-src torbrowser-android-armv7: @@ -25,6 +26,9 @@ targets: torbrowser-android-x86: var: torbrowser-android-x86: 1 + torbrowser-android-x86_64: + var: + torbrowser-android-x86_64: 1 torbrowser-android-aarch64: var: torbrowser-android-aarch64: 1 @@ -121,6 +125,14 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-x86 + - name: android-x86_64 + project: tor-browser + enable: '[% c("var/torbrowser-android-x86_64") %]' + target: + - '[% c("var/containers_target") %]' + - '[% c("var/build_target") %]' + - torbrowser-android-x86_64 + - name: android-aarch64 project: tor-browser enable: '[% c("var/torbrowser-android-aarch64") %]' diff --git a/projects/rust/config b/projects/rust/config index dbde815..03d7be0 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -22,6 +22,10 @@ targets: var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc + android-x86_64: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-linux-android --set=target.x86_64-linux-android.cc=$ANDROID_NDK_HOME/x86_64/bin/x86_64-linux-android-gcc + android-aarch64: var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=aarch64-linux-android --set=target.aarch64-linux-android.cc=$ANDROID_NDK_HOME/arm64/bin/aarch64-linux-android-gcc diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index b90c8b9..9f255da 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -24,6 +24,11 @@ zip -d $apk lib/\* zip_src => [ 'lib/x86/*' ], zip_args => '$apk', }) %] +[% ELSIF c("var/android-x86_64") %] + [% c('zip', { + zip_src => [ 'lib/x86_64/*' ], + zip_args => '$apk', + }) %] [% ELSIF c("var/android-armv7") %] [% c('zip', { zip_src => [ 'lib/armeabi-v7a/*' ], diff --git a/rbm.conf b/rbm.conf index e6379f8..008fab7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -191,6 +191,14 @@ targets: var: android-x86: 1 osname: android-x86 + torbrowser-android-x86_64: + - android-x86_64 + - android + android-x86_64: + arch: x86_64 + var: + android-x86_64: 1 + osname: android-x86_64 torbrowser-android-aarch64: - android-aarch64 - android @@ -209,6 +217,7 @@ targets: android_min_api_aarch64: 21 android_min_api_armv7: 16 android_min_api_x86: 16 + android_min_api_x86_64: 21 snowflake: 0 container: suite: stretch

1 0

[tor-android-service/master] Update tor libraries to 0.4.1.5 (from tor-android: commit-95432556b84df208fd36175fda0c495ffc421ecf)
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit dc4ae061fab5d0f35e93b296a3f618baf6af8f36 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Sep 22 12:12:12 2019 -0700 Update tor libraries to 0.4.1.5 (from tor-android: commit-95432556b84df208fd36175fda0c495ffc421ecf) --- service/src/main/jniLibs/arm64-v8a/libTor.so | Bin 7774616 -> 8610184 bytes service/src/main/jniLibs/armeabi-v7a/libTor.so | Bin 7774616 -> 8129728 bytes service/src/main/jniLibs/armeabi/libTor.so | Bin 7774616 -> 0 bytes service/src/main/jniLibs/x86/libTor.so | Bin 7791604 -> 9020648 bytes service/src/main/jniLibs/x86_64/libTor.so | Bin 7791604 -> 8254824 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/service/src/main/jniLibs/arm64-v8a/libTor.so b/service/src/main/jniLibs/arm64-v8a/libTor.so index 9ff0e9d..5fc7361 100755 Binary files a/service/src/main/jniLibs/arm64-v8a/libTor.so and b/service/src/main/jniLibs/arm64-v8a/libTor.so differ diff --git a/service/src/main/jniLibs/armeabi-v7a/libTor.so b/service/src/main/jniLibs/armeabi-v7a/libTor.so index 9ff0e9d..b001906 100755 Binary files a/service/src/main/jniLibs/armeabi-v7a/libTor.so and b/service/src/main/jniLibs/armeabi-v7a/libTor.so differ diff --git a/service/src/main/jniLibs/armeabi/libTor.so b/service/src/main/jniLibs/armeabi/libTor.so deleted file mode 100755 index 9ff0e9d..0000000 Binary files a/service/src/main/jniLibs/armeabi/libTor.so and /dev/null differ diff --git a/service/src/main/jniLibs/x86/libTor.so b/service/src/main/jniLibs/x86/libTor.so index 6f93a98..dabda5c 100755 Binary files a/service/src/main/jniLibs/x86/libTor.so and b/service/src/main/jniLibs/x86/libTor.so differ diff --git a/service/src/main/jniLibs/x86_64/libTor.so b/service/src/main/jniLibs/x86_64/libTor.so index 6f93a98..55be241 100755 Binary files a/service/src/main/jniLibs/x86_64/libTor.so and b/service/src/main/jniLibs/x86_64/libTor.so differ

1 0

[tor-android-service/master] Bug 30380 - Support DormantCanceledByStartup
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 5bc203890cd66a10110f94b3dcd921fc5a6c90b9 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 26 00:54:12 2019 +0000 Bug 30380 - Support DormantCanceledByStartup --- .../main/java/org/torproject/android/service/AndroidTorSettings.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java b/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java index a875857..4759376 100644 --- a/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java +++ b/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java @@ -218,4 +218,9 @@ public class AndroidTorSettings implements TorSettings { public boolean useSocks5() { return Prefs.useVpn() && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP; } + + @Override + public boolean hasDormantCanceledByStartup() { + return true; + } }

1 0

[tor-android-service/master] Bug 31192 - Bump Tor version number string
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit ccaf68ccb3ae3de23990f65d0504a2e19bf01897 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 26 14:41:35 2019 +0000 Bug 31192 - Bump Tor version number string --- service/src/main/java/org/torproject/android/service/TorService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index dea4bd2..16d2537 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -31,7 +31,7 @@ import java.util.concurrent.Executors; public final class TorService extends Service implements TorServiceConstants, OrbotConstants { - public final static String TOR_VERSION = "0.3.5.8-rc-openssl1.0.2p"; + public final static String TOR_VERSION = "0.4.1.5-rc-openssl1.0.2p"; private static final int NOTIFY_ID = 1; private static final int ERROR_NOTIFY_ID = 3; private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1"; @@ -454,4 +454,4 @@ public final class TorService extends Service implements TorServiceConstants, Or builder.torExecutable(exe); return builder.build(); } -} \ No newline at end of file +}

1 0

[tor-android-service/master] Merge remote-tracking branch 'sysrqb/bug31192_00'
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 50d01b1fbc6e776d0b39f42f644137dd25a92c7a Merge: 8d307a6 ccaf68c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 26 14:58:05 2019 +0000 Merge remote-tracking branch 'sysrqb/bug31192_00' .../android/service/AndroidTorSettings.java | 5 +++++ .../org/torproject/android/service/TorService.java | 4 ++-- service/src/main/jniLibs/arm64-v8a/libTor.so | Bin 7774616 -> 8610184 bytes service/src/main/jniLibs/armeabi-v7a/libTor.so | Bin 7774616 -> 8129728 bytes service/src/main/jniLibs/armeabi/libTor.so | Bin 7774616 -> 0 bytes service/src/main/jniLibs/x86/libTor.so | Bin 7791604 -> 9020648 bytes service/src/main/jniLibs/x86_64/libTor.so | Bin 7791604 -> 8254824 bytes 7 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1573276 - Always allow localization in error pages r=johannh, peterv
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 9c1877056070c4de048b18e201fcb3dfcb1e1a02 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 25 10:39:45 2019 +0000 Bug 1573276 - Always allow localization in error pages r=johannh,peterv Differential Revision: https://phabricator.services.mozilla.com/D43216 --HG-- extra : moz-landing-system : lando --- .../content/test/about/browser_aboutCertError.js | 23 ++++++++++++++++++++ browser/base/content/test/about/head.js | 13 ++++++----- dom/base/Document.cpp | 8 ++++--- dom/base/nsContentUtils.cpp | 25 +++++++++++++++++++++- dom/base/nsContentUtils.h | 9 ++++---- dom/security/nsContentSecurityManager.cpp | 6 +++++- parser/htmlparser/nsExpatDriver.cpp | 22 +++++++++++-------- 7 files changed, 83 insertions(+), 23 deletions(-) diff --git a/browser/base/content/test/about/browser_aboutCertError.js b/browser/base/content/test/about/browser_aboutCertError.js index 1544bab15f99..3e9a13dd99f3 100644 --- a/browser/base/content/test/about/browser_aboutCertError.js +++ b/browser/base/content/test/about/browser_aboutCertError.js @@ -459,3 +459,26 @@ add_task(async function checkBadStsCertHeadline() { BrowserTestUtils.removeTab(gBrowser.selectedTab); } }); + +add_task(async function checkSandboxedIframe() { + info( + "Loading a bad sts cert error in a sandboxed iframe and check that the correct headline is shown" + ); + let useFrame = true; + let sandboxed = true; + let tab = await openErrorPage(BAD_CERT, useFrame, sandboxed); + let browser = tab.linkedBrowser; + + let titleContent = await ContentTask.spawn(browser, {}, async function() { + // Cannot test for error in the Advanced section since it's currently not present + // in a sandboxed iframe. + let doc = content.document.querySelector("iframe").contentDocument; + let titleText = doc.querySelector(".title-text"); + return titleText.textContent; + }); + ok( + titleContent.endsWith("Security Issue"), + "Did Not Connect: Potential Security Issue" + ); + BrowserTestUtils.removeTab(gBrowser.selectedTab); +}); diff --git a/browser/base/content/test/about/head.js b/browser/base/content/test/about/head.js index 82fa5dcd540d..74f961dcefae 100644 --- a/browser/base/content/test/about/head.js +++ b/browser/base/content/test/about/head.js @@ -44,17 +44,20 @@ function getPEMString(cert) { ); } -function injectErrorPageFrame(tab, src) { +function injectErrorPageFrame(tab, src, sandboxed) { return ContentTask.spawn( tab.linkedBrowser, - { frameSrc: src }, - async function({ frameSrc }) { + { frameSrc: src, frameSandboxed: sandboxed }, + async function({ frameSrc, frameSandboxed }) { let loaded = ContentTaskUtils.waitForEvent( content.wrappedJSObject, "DOMFrameContentLoaded" ); let iframe = content.document.createElement("iframe"); iframe.src = frameSrc; + if (frameSandboxed) { + iframe.setAttribute("sandbox", "allow-scripts"); + } content.document.body.appendChild(iframe); await loaded; // We will have race conditions when accessing the frame content after setting a src, @@ -67,7 +70,7 @@ function injectErrorPageFrame(tab, src) { ); } -async function openErrorPage(src, useFrame) { +async function openErrorPage(src, useFrame, sandboxed) { let dummyPage = getRootDirectory(gTestPath).replace( "chrome://mochitests/content", @@ -78,7 +81,7 @@ async function openErrorPage(src, useFrame) { if (useFrame) { info("Loading cert error page in an iframe"); tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, dummyPage); - await injectErrorPageFrame(tab, src); + await injectErrorPageFrame(tab, src, sandboxed); } else { let certErrorLoaded; tab = await BrowserTestUtils.openNewForegroundTab( diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index eebeada1c63c..cdeabc4dc7b9 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -3225,11 +3225,13 @@ DocumentL10n* Document::GetL10n() { return mDocumentL10n; } bool Document::DocumentSupportsL10n(JSContext* aCx, JSObject* aObject) { nsCOMPtr<nsIPrincipal> callerPrincipal = nsContentUtils::SubjectPrincipal(aCx); - return nsContentUtils::PrincipalAllowsL10n(callerPrincipal); + nsGlobalWindowInner* win = xpc::WindowOrNull(aObject); + return nsContentUtils::PrincipalAllowsL10n( + callerPrincipal, win ? win->GetDocumentURI() : nullptr); } void Document::LocalizationLinkAdded(Element* aLinkElement) { - if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal(), GetDocumentURI())) { return; } @@ -3260,7 +3262,7 @@ void Document::LocalizationLinkAdded(Element* aLinkElement) { } void Document::LocalizationLinkRemoved(Element* aLinkElement) { - if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal(), GetDocumentURI())) { return; } diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 66134cdb691f..cfae3ef224b3 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -250,6 +250,7 @@ #include "nsThreadManager.h" #include "nsIBidiKeyboard.h" #include "ReferrerInfo.h" +#include "nsAboutProtocolUtils.h" #if defined(XP_WIN) // Undefine LoadImage to prevent naming conflict with Windows. @@ -1676,8 +1677,30 @@ bool nsContentUtils::OfflineAppAllowed(nsIPrincipal* aPrincipal) { return NS_SUCCEEDED(rv) && allowed; } +static bool IsErrorPage(nsIURI* aURI) { + if (!aURI) { + return false; + } + + if (!aURI->SchemeIs("about")) { + return false; + } + + nsAutoCString name; + nsresult rv = NS_GetAboutModuleName(aURI, name); + NS_ENSURE_SUCCESS(rv, false); + + return name.EqualsLiteral("certerror") || name.EqualsLiteral("neterror") || + name.EqualsLiteral("blocked"); +} + /* static */ -bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal) { +bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal, + nsIURI* aDocumentURI) { + if (IsErrorPage(aDocumentURI)) { + return true; + } + // The system principal is always allowed. if (IsSystemPrincipal(aPrincipal)) { return true; diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 46818cc43a1b..2bf27250e68b 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1984,11 +1984,12 @@ class nsContentUtils { static bool OfflineAppAllowed(nsIPrincipal* aPrincipal); /** - * Determine whether the principal is allowed access to the localization - * system. We don't want the web to ever see this but all our UI including in - * content pages should pass this test. + * Determine whether the principal or document is allowed access to the + * localization system. We don't want the web to ever see this but all our UI + * including in content pages should pass this test. */ - static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal); + static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal, + nsIURI* aDocumentURI); /** * If offline-apps.allow_by_default is true, we set offline-app permission diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index e7a0a9d1a72b..10ee46858654 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -333,7 +333,11 @@ static nsresult DoCheckLoadURIChecks(nsIURI* aURI, nsILoadInfo* aLoadInfo) { // same principal check as Fluent. if (aLoadInfo->InternalContentPolicyType() == nsIContentPolicy::TYPE_INTERNAL_DTD) { - return nsContentUtils::PrincipalAllowsL10n(aLoadInfo->TriggeringPrincipal()) + RefPtr<Document> doc; + aLoadInfo->GetLoadingDocument(getter_AddRefs(doc)); + return nsContentUtils::PrincipalAllowsL10n( + aLoadInfo->TriggeringPrincipal(), + doc ? doc->GetDocumentURI() : nullptr) ? NS_OK : NS_ERROR_DOM_BAD_URI; } diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp index 9f2321cd2831..73a0e65328f0 100644 --- a/parser/htmlparser/nsExpatDriver.cpp +++ b/parser/htmlparser/nsExpatDriver.cpp @@ -628,33 +628,37 @@ nsresult nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, nsContentUtils::GetSystemPrincipal(), nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, nsIContentPolicy::TYPE_DTD); + NS_ENSURE_SUCCESS(rv, rv); } else { NS_ASSERTION( mSink == nsCOMPtr<nsIExpatSink>(do_QueryInterface(mOriginalSink)), "In nsExpatDriver::OpenInputStreamFromExternalDTD: " "mOriginalSink not the same object as mSink?"); nsContentPolicyType policyType = nsIContentPolicy::TYPE_INTERNAL_DTD; - nsCOMPtr<nsIPrincipal> loadingPrincipal; if (mOriginalSink) { nsCOMPtr<Document> doc; doc = do_QueryInterface(mOriginalSink->GetTarget()); if (doc) { - loadingPrincipal = doc->NodePrincipal(); if (doc->SkipDTDSecurityChecks()) { policyType = nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD; } + rv = NS_NewChannel(getter_AddRefs(channel), uri, doc, + nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | + nsILoadInfo::SEC_ALLOW_CHROME, + policyType); + NS_ENSURE_SUCCESS(rv, rv); } } - if (!loadingPrincipal) { - loadingPrincipal = + if (!channel) { + nsCOMPtr<nsIPrincipal> nullPrincipal = mozilla::NullPrincipal::CreateWithoutOriginAttributes(); + rv = NS_NewChannel(getter_AddRefs(channel), uri, nullPrincipal, + nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | + nsILoadInfo::SEC_ALLOW_CHROME, + policyType); + NS_ENSURE_SUCCESS(rv, rv); } - rv = NS_NewChannel(getter_AddRefs(channel), uri, loadingPrincipal, - nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | - nsILoadInfo::SEC_ALLOW_CHROME, - policyType); } - NS_ENSURE_SUCCESS(rv, rv); nsAutoCString absURL; rv = uri->GetSpec(absURL);

1 0