- tbb-commits - lists.torproject.org

[tor-launcher/master] Update translations.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit 7f6f1f6535d8c84d6dd3944ed54ff596fbc6c8b9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 18:28:39 2014 -0700 Update translations. --- src/chrome/locale/ar/network-settings.dtd | 32 +++++++-------- src/chrome/locale/ar/progress.dtd | 2 +- src/chrome/locale/ar/torlauncher.properties | 4 +- src/chrome/locale/eu/torlauncher.properties | 8 ++-- src/chrome/locale/it/network-settings.dtd | 9 +++-- src/chrome/locale/ko/network-settings.dtd | 22 +++++----- src/chrome/locale/ko/progress.dtd | 2 +- src/chrome/locale/ko/torlauncher.properties | 4 +- src/chrome/locale/pl/network-settings.dtd | 2 +- src/chrome/locale/pl/torlauncher.properties | 4 +- src/chrome/locale/pt/network-settings.dtd | 56 +++++++++++++------------- src/chrome/locale/sv/torlauncher.properties | 4 +- src/chrome/locale/tr/torlauncher.properties | 35 +++++++++++++++- src/chrome/locale/vi/network-settings.dtd | 8 ++-- src/chrome/locale/vi/progress.dtd | 6 +-- src/chrome/locale/vi/torlauncher.properties | 24 +++++------ src/chrome/locale/zh-CN/network-settings.dtd | 28 ++++++------- 17 files changed, 142 insertions(+), 108 deletions(-) diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index b3f0dca..a2cbdb6 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "عليك توفير معلومات حول اتصال هذا الحاسب بالإنترنت قبل أن تحاول الاتصال بشبكة Tor."> <!ENTITY torSettings.yes "نعم"> <!ENTITY torSettings.no "لا"> <!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> <!ENTITY torSettings.configurePrompt1 " اتصال الإنترنت لهذا الكمبيوتر مُراقب، أو مصفى، أو يعمل ببروكسي."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "علي تكوين إعدادات الجسر أو جدار الحماية أو الوكيل."> <!ENTITY torSettings.configure "تكوين"> <!ENTITY torSettings.connectPrompt2 "أود الاتصال مباشرة إلى شبكة تور."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "سيفيد هذا في معظم الحالات."> <!ENTITY torSettings.connect "اتصل"> <!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الجهاز إلي بروكسي حتي يصل إلي شبكة الإنترنت؟"> @@ -22,9 +22,9 @@ <!ENTITY torSettings.firewallQuestion "هل اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة؟"> <!ENTITY torSettings.firewallHelp "إذا لم تكن متأكدا من كيفية الإجابة على هذا السؤال، اختار لا. إذا واجهتك مشاكل في الاتصال بشبكة تور, غيير هذا الإعداد."> <!ENTITY torSettings.enterFirewall "إدخل قائمة مفصولة بفواصل من المنافذ التي يسمح بها جدار الحماية."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "هل يقوم مقدم خدمة الإنترنت (ISP) الذي تتعامل معه بحجب الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"> +<!ENTITY torSettings.bridgeHelp "إذا لم تكن متأكدا من إجابة هذا السؤال، قم باختيار لا. &#160; إذا قمت باختيار نعم، فسيطلب منك تكوين جسور Tor والتي هي منافذ ترحيل غير مدرجة تصعب عملية حظر الاتصالات بشبكة Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "يمكنك استخدام مجموعة الجسور المتوفرة أو الحصول على مجموعة مخصصة من الجسور.">  @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة"> <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> <!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "الاتصال بالجسور المتوفرة"> +<!ENTITY torsettings.useBridges.type "نوع النقل:"> +<!ENTITY torsettings.useBridges.custom "إدخال جسور مخصصة"> <!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "اكتب العنوان:المنفذ"> <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> <!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور. وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp1B "يمكنك استخدام مجموعة عناوين الجسور المتوفرة التي تم تكوينها مسبقا أو الحصول على مجموعة مخصصة من العناوين باستخدام إحدى هذه الطرق الثلاث:"> +<!ENTITY torsettings.bridgeHelp2Heading "من خلال الويب"> +<!ENTITY torsettings.bridgeHelp2 "استخدم متصفح ويب لزيارة https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "من خلال المستجيب التلقائي للبريد الإلكتروني"> <!ENTITY torsettings.bridgeHelp3 "ارسل بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد. و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "من خلال مكتب المساعدة"> +<!ENTITY torsettings.bridgeHelp4 "يمكنك طلب عناوين الجسر، كحل أخير، من خلال إرسال رسالة بريد إلكتروني مهذبة إلى help(a)rt.torproject.org.&#160; يرجى ملاحظة أنه يجب أن يرد شخص ما على كل طلب."> diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd index e12a12f..6f4907d 100644 --- a/src/chrome/locale/ar/progress.dtd +++ b/src/chrome/locale/ar/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "حالة تور"> <!ENTITY torprogress.openSettings "افتح الإعدادات"> <!ENTITY torprogress.heading "جاري الاتصال بشبكة تور"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "الرجاء الانتظار، يتم الان إنشاء اتصال بشبكة تور."> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 06171de..c7ee50d 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=الرجاء التأكد أن تور يعمل torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من عنوان الانترنت IP أو عنوان مستضيف واحد و منفذ وذلك لتهيئة تور لأستخدام بروكسي حتي يستطيع الوصول إلي شبكة الانترنت. torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. +torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. torlauncher.recommended_bridge=(موصى به) diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index a104c27..2d57a88 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor ustekabean irten da. torlauncher.please_restart_app=Mesedez aplikazio hau berrabiarazi ezazu. torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu. torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan. -# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Huts Toren kontrola hartzerakoan. torlauncher.tor_bootstrap_failed=Torek huts egin du Tor sare konexio bat ezartzerakoan. torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S). @@ -24,10 +24,10 @@ torlauncher.ensure_tor_is_running=Mesedez egiaztatu Tor exekutatzen ari dela. torlauncher.error_proxy_addr_missing=Torek proxy bat erabiliz Interneten sartzeko konfiguratu nahi baduzu edo IP helbidea edo ostalari-izena edo portu zenbakia zehaztu behar duzu. torlauncher.error_proxy_type_missing=Proxy mota hautatu behar duzu. torlauncher.error_bridges_missing=Zubi bat edo gehiago zehaztu behar duzu. -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Emandako zubietarako garraio mota bat hautatu behar duzu. +torlauncher.error_bridge_bad_default_type=Ez daude eskuragarri %S garraio mota duten emandako zubirik. Mesedez doitu zure ezarpenak. -# torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(gomendatuta) torlauncher.connect=Konektatu torlauncher.quit=Irten diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 54d07c3..c319724 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Prima di connetterti alla rete Tor, devi fornire le informazioni riguardo la connessione internet di questo computer."> <!ENTITY torSettings.yes "Sì"> <!ENTITY torSettings.no "No"> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "La connessione ad Internet di questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte?"> <!ENTITY torSettings.firewallHelp "Se non sei sicuro su come rispondere a questa domanda, seleziona No. Nel caso in cui si verifichino problemi di connessione alla rete Tor, cambia queste impostazioni."> <!ENTITY torSettings.enterFirewall "Inserisci una lista di porte consentite dal firewall, separate da una virgola."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -46,11 +46,12 @@ <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default " +"> <!ENTITY torsettings.useBridges.type "Tipo di trasporto:"> <!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati"> <!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)"> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "Tipo indirizzo:porta"> <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 0fc76e1..9b4465d 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor 네트워크에 연결을 시도하기 전에, 이 컴퓨터의 인터넷 연결에 대한 정보를 제공해야합니다."> <!ENTITY torSettings.yes "예"> <!ENTITY torSettings.no "아니오"> <!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되거나 필터링되거나 프록시를 사용하고 있습니다."> +<!ENTITY torSettings.configurePrompt2 "브릿지, 방화벽, 프록시 설정 구성을 해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "이 컴퓨터의 인터넷 연결은 방화벽을 통해서 특정 포트 접속만 허가합니까?"> <!ENTITY torSettings.firewallHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 아니오를 선택하세요. Tor 네트워크에 접속할 때 문제를 만났다면 이 설정을 변경해 주세요."> <!ENTITY torSettings.enterFirewall "방화벽에 따라 허가되고 있는 포트 목록 입력해 주세요. 포트 번호는 콤마로 구분됩니다."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 통과하는 방화벽을 지나 연결됩니다."> <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> <!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다."> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default "제공된 브릿지에 연결"> <!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.custom "이용자 브릿지 접속"> +<!ENTITY torsettings.useBridges.label "1개 이상의 브릿지 중계 서버를 입력해 주세요. (각 줄에 한 개씩)"> +<!ENTITY torsettings.useBridges.placeholder "주소 입력 : 포트 번호"> <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> <!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1 "Tor 네트워크에 접속할 수 없는 경우, 귀하의 인터넷 서비스 공급자(ISP)나 별도의 기관이 Tor를 차단하고 있을 가능성이 있습니다.&#160; 그럴 때는 숨겨진 중계 서버를 통해 Tor 브릿지를 사용함으로써 이 문제를 해결할 수도 있습니다."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.&#160; 단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 gmail.com 이나 yahoo.com 으로 보내주시면 감사하겠습니다."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd index dabaa61..bb931d0 100644 --- a/src/chrome/locale/ko/progress.dtd +++ b/src/chrome/locale/ko/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 상태"> <!ENTITY torprogress.openSettings "시작 설정"> <!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Tor네트워크로 확실히 연결할 때까지 기다리세요."> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 3e3771f..3629f23 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시 torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(권장함) diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 149647e..435536a 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "Czy połączenie internetowe Twojego komputera pozwala przejść przez zaporę sieciową w celu nawiązania połączenia z ustalonymi portami?"> <!ENTITY torSettings.firewallHelp "Jeśli nie jesteś pewien jak odpowiedzieć na to pytanie, wybierz Nie. W przypadku wystąpienia problemów z połączeniem, zmień tą opcję."> <!ENTITY torSettings.enterFirewall "Wprowadź listę portów dozwolonych przez zaporę (kolejne porty oddzielaj przecinkiem)."> -<!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub ocenzurowuje połączenia sieci Tor?"> +<!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia sieci Tor?"> <!ENTITY torSettings.bridgeHelp "Jeśli nie jesteś pewny odpowiedzi na to pytanie proszę wybrać odpowiedź Nie.&#160; Jeśli wybierzesz Tak, to będziesz poproszony o skonfigurowanie mostków Tora, które nie są publicznie wymienione, dzięki czemu będzie trudniej zablokować połączenia do sieci Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Możesz wybrać dostępny zestaw mostków, albo możesz uzyskać i wprowadzić niestandardowy zestaw mostów."> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 847d994..d982fb7 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -8,7 +8,7 @@ torlauncher.please_restart_app=Proszę zrestartuj tą aplikację. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em. -torlauncher.tor_bootstrap_failed=Błąd Tor, nie udało się nawiązać połączenia z siecią Tora. +torlauncher.tor_bootstrap_failed=Tor nie nawiązał połączenia z siecią Tora. torlauncher.tor_bootstrap_failed_details=%1$S błąd (%2$S). torlauncher.unable_to_start_tor=Nie można wystartować aplikacji Tor.\n\n%S @@ -40,7 +40,7 @@ torlauncher.bootstrapStatus.conn_dir=Podłączanie do katalogu węzłów torlauncher.bootstrapStatus.handshake_dir=Ustanawianie szyfrowanego połączenia z katalogiem torlauncher.bootstrapStatus.requesting_status=Odczytywanie stanu sieci torlauncher.bootstrapStatus.loading_status=Wczytywanie stanu sieci -torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów +torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów uwierzytelnienia torlauncher.bootstrapStatus.requesting_descriptors=Żądanie informacji o węźle torlauncher.bootstrapStatus.loading_descriptors=Wczytywanie informacji o węźle torlauncher.bootstrapStatus.conn_or=Łączenie z siecią Tor diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 9c5b2f1..57bd038 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -2,29 +2,29 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Antes de se ligar à rede Tor precisa de fornecer informações sobre a ligação deste computador à Internet."> <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situação?"> <!ENTITY torSettings.configurePrompt1 "A ligação à Internet deste computador está a ser censurada, filtrada ou utilizada através de um proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar o bridge, o firewall e as definições do proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente à rede Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Isto funciona na maior parte das situações."> <!ENTITY torSettings.connect "Ligar"> -<!ENTITY torSettings.proxyQuestion "Este computador precisa de usar um proxy para aceder a Internet?"> +<!ENTITY torSettings.proxyQuestion "Este computador precisa de usar uma proxy para aceder a Internet?">  <!ENTITY torSettings.proxyHelp "Se não tem a certeza de como responder esta questão, olhe para as definições de Internet noutro navegador para ver se está configurado para usar um proxy."> <!ENTITY torSettings.enterProxy "Introduza as definições de proxy."> -<!ENTITY torSettings.firewallQuestion "A ligação à Internet deste computador atravessa um firewall que só permite algumas ligações a certas portas?"> -<!ENTITY torSettings.firewallHelp "Se não tem a certeza de como responder esta questão, escolha Não. Se encontrar quaisquer problemas ao ligar-se á rede Tor, mude esta definição."> -<!ENTITY torSettings.enterFirewall "Introduza uma lista de portas separada por vírgulas que são permitidas pela firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.firewallQuestion "A ligação à Internet deste computador atravessa uma firewall que só permite algumas ligações a certos portos?"> +<!ENTITY torSettings.firewallHelp "Se não tem a certeza de como responder esta questão, escolha Não. Se encontrar quaisquer problemas ao ligar-se à rede Tor, mude esta definição."> +<!ENTITY torSettings.enterFirewall "Introduza uma lista de portos separada por vírgulas que são permitidas pela firewall."> +<!ENTITY torSettings.bridgeQuestion "O seu fornecedor de serviços de internet bloqueia ou censura ligações à rede Tor ?"> +<!ENTITY torSettings.bridgeHelp "Se não tem a certeza de como responder a esta questão, escolha o Nº.&#160; Se escolher Sim, vai-lhe ser pedido para configurar as Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear ligações à rede Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de bridges personalizadas.">  @@ -33,32 +33,32 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de usar um proxy para aceder à Internet."> +<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de usar uma proxy para aceder à Internet."> <!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> <!ENTITY torsettings.useProxy.address "Endereço:"> -<!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou hostname"> -<!ENTITY torsettings.useProxy.port "Porta:"> +<!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou nome de anfitrião"> +<!ENTITY torsettings.useProxy.port "Porto:"> <!ENTITY torsettings.useProxy.username "Nome do utilizador:"> <!ENTITY torsettings.useProxy.password "Palavra-Chave:"> <!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 "Este computador está protegido por um firewall que permite apenas algumas ligações a algumas portas."> -<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> +<!ENTITY torsettings.firewall.checkbox "Este computador está protegido por um firewall que permite apenas algumas ligações a alguns portos."> +<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:"> <!ENTITY torsettings.useBridges.checkbox "O meu Internet Service Provider (ISP) bloqueia ligações à rede Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Ligar com as bridges fornecidas"> +<!ENTITY torsettings.useBridges.type "Tipo de transporte:"> +<!ENTITY torsettings.useBridges.custom "Introduza bridges personalizadas"> <!ENTITY torsettings.useBridges.label "Introduza um ou mais relays bridge (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "escreva endereço:porto"> -<!ENTITY torsettings.copyLog "Copiar o Tor Log para o Clipboard"> +<!ENTITY torsettings.copyLog "Copiar o log Tor para a Área de Transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu provedor de internet (ISP) ou outro intermediário está a bloquear o Tor.&#160; Normalmente, pode contornar este problema usando Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear."> +<!ENTITY torsettings.bridgeHelp1B "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de endereços personalizados usando um dos três métodos:"> +<!ENTITY torsettings.bridgeHelp2Heading "Pela rede"> +<!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Pelo respondedor de email automático"> +<!ENTITY torsettings.bridgeHelp3 "Envie um email para bridges(a)torproject.org com a linha 'get bridges' no próprio corpo da mensagem.&#160; No entanto, para tornar mais difícil para um atacante apreender o conjunto de endereços de bridge, tem que enviar este pedido de uma conta gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Pelo Helpdesk"> +<!ENTITY torsettings.bridgeHelp4 "Em último caso, pode pedir endereços bridge enviando um email cordial para help(a)rt.torproject.org.&#160; Por favor tenha em conta que cada pedido será respondido por uma pessoa."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 985868c..7efa755 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Försäkra dig om att Tor är startad. torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller värdnamn, samt ett port-nummer för att konfigurera Tor till att använda en proxy för att nå Internet. torlauncher.error_proxy_type_missing=Du måste välja typ av proxy. torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade bryggorna. +torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade bryggor för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. torlauncher.recommended_bridge=(rekommenderas) diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index d175b3f..874951b 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -1,7 +1,40 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.tor_bootstrap_failed_details=%1$S hata (%2$S). +torlauncher.error_title=Tor Başlatıcı + +torlauncher.tor_exited=Tor beklenmedik bir şekilde kapandı. +torlauncher.please_restart_app=Lütfen bu uygulamayı yeniden başlatın. +torlauncher.tor_controlconn_failed=Tor yönetim portuna bağlanılamadı. +torlauncher.tor_failed_to_start=Tor başlatılamadı. +torlauncher.tor_control_failed=Tor'u kontrol altına alma başarısız +torlauncher.tor_bootstrap_failed=Tor'un ağ bağlantısı kurulumu başarısız oldu. +torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S). + +torlauncher.unable_to_start_tor=Tor başlatılamıyor.\n\n%S +torlauncher.tor_missing=Çalıştırılabilir Tor dosyası bulunamadı. +torlauncher.torrc_missing=torrc dosyası kayıp. +torlauncher.datadir_missing=Tor veri klasörü bulunamadı. +torlauncher.password_hash_missing=Hash'lenmiş şifreye ulaşılamadı. + +torlauncher.failed_to_get_settings=Tor ayarlarına ulaşılamıyor.\n\n%S +torlauncher.failed_to_save_settings=Tor ayarları kaydedilemiyor.\n\n%S +torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. + +torlauncher.error_proxy_addr_missing=İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor. +torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. +torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz. +torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir taşıma türü seçmelisiniz. +torlauncher.error_bridge_bad_default_type=%S taşıma türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. + +torlauncher.recommended_bridge=(önerilen) + +torlauncher.connect=Bağlan +torlauncher.quit=Çık +torlauncher.quit_win=Çıkış +torlauncher.done=Tamamlandı + +torlauncher.forAssistance=Yardım için %S ile bağlantıya geçin. torlauncher.bootstrapStatus.conn_dir=Aktarım klasörüne bağlanıyor torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index e42c83b..8283781 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Trước khi kết nối đến mạng lưới Tor, bạn cần phải cung cấp thông tin về kết nối Internet của máy tính này."> <!ENTITY torSettings.yes "Có"> <!ENTITY torSettings.no "Không"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Những mục này có miêu tả đúng vị trí của bạn không?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Tôi cần phải cấu hình cầu nối, tường lửa, hoặc thiết lập máy chủ uỷ quyền."> <!ENTITY torSettings.configure "Cấu hình"> <!ENTITY torSettings.connectPrompt2 "Tôi muốn kết nối trực tiếp đến mạng Tor,"> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> <!ENTITY torSettings.firewallHelp "Nếu như bạn không chắc chắn làm thế nào trả lời câu hỏi này, chọn Không. Nếu như bạn gặp vấn đề kết nối đến mạng Tor, thay đổi thiết lập này."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "Nhà cung cấp dịch vụ (ISP) của bạn có ngăn chặn hoặc kiểm duyệt kết nối đến mạng Tor không?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd index cbafae0..507803b 100644 --- a/src/chrome/locale/vi/progress.dtd +++ b/src/chrome/locale/vi/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.dialog.title "Trạng thái Tor"> +<!ENTITY torprogress.openSettings "Cài đặt Mở"> <!ENTITY torprogress.heading "Kết nối với mạng Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Vui lòng chờ đợi để chúng tôi kết nối đến mạng lưới Tor."> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 8566a15..9cfc93d 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -1,40 +1,40 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor Launcher -# torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_exited=Tor unexpectedly exited. torlauncher.please_restart_app=Vui lòng khởi động lại ứng dụng này. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Chạy Tor thất bại. -# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor đã thất bại khi thiết lập kết nối đến mạng Tor -# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=Tập tin thực thi của Tor bị thiếu. torlauncher.torrc_missing=Thiếu tập tin torrc. torlauncher.datadir_missing=Thư mục data trong Tor không tồn tại. -# torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.password_hash_missing=Failed to get hashed password. -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S +torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S torlauncher.failed_to_save_settings=Không thể lưu lại các cài đặt của Tor. torlauncher.ensure_tor_is_running=Hãy chắc chắn rằng Tor đang chạy. torlauncher.error_proxy_addr_missing=Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng torlauncher.error_proxy_type_missing=Bạn phải chọn kiểu proxy. torlauncher.error_bridges_missing=Bạn phải chỉ dẫn một hoặc nhiều cầu nối. -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -# torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(khuyên dùng) torlauncher.connect=Kết nối torlauncher.quit=Thoát torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Để được trợ giúp, liên hệ %S torlauncher.bootstrapStatus.conn_dir=Kết nối vào một thư mục chuyển tiếp torlauncher.bootstrapStatus.handshake_dir=Thành lập một kết nối thư mục được mã hóa diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 8bbe5f7..28b973d 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "在您连接到Tor网络之前，需要提供本机的英特网连接信息。"> +<!ENTITY torsettings.prompt "在连接 Tor 网络之前，需提供相关的网络连接信息。"> <!ENTITY torSettings.yes "是"> <!ENTITY torSettings.no "否"> @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "我需要配置网桥、防火墙或者代理设置。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connectPrompt2 "我想要直接连接 Tor 网络。"> -<!ENTITY torSettings.connectPrompt3 "这在大多数情况下正常工作。"> +<!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> <!ENTITY torSettings.proxyQuestion "该计算机是否需要通过代理访问互联网？"> @@ -22,9 +22,9 @@ <!ENTITY torSettings.firewallQuestion "该计算机的防火墙是否仅允许特定端口的互联网连接？"> <!ENTITY torSettings.firewallHelp "如果不知道如何回答该问题，请选择否。如果连接 Tor 网络时出现问题，请更改该设置。"> <!ENTITY torSettings.enterFirewall "请输入防火墙允许的端口，中间用逗号隔开。"> -<!ENTITY torSettings.bridgeQuestion "您的互联网服务提供商 (ISP) 阻挡或审查与 Tor 网络的连接吗？"> -<!ENTITY torSettings.bridgeHelp "如果您不知道此问题的答案，请选择否。&#160; 如果您选择是，您将被要求配置 Tor 网桥，它们是未被公开的中继点，可以使得 Tor 网络的连接更难以被封掉。"> -<!ENTITY torSettings.bridgeSettingsPrompt "您可以使用网桥的默认设置，您也可以获取和输入自定义的网桥地址。"> +<!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> +<!ENTITY torSettings.bridgeHelp "如果不理解该问题，请选择“否”。如果选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难于封锁。"> +<!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">  @@ -46,7 +46,7 @@ <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> <!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> -<!ENTITY torsettings.useBridges.default "使用提供的网桥连接"> +<!ENTITY torsettings.useBridges.default "使用集成的网桥进行连接"> <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> @@ -54,11 +54,11 @@ <!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> -<!ENTITY torsettings.bridgeHelp1 "如果您无法连接到 Tor 网络，可能是您的互联网服务提供商 (ISP) 或其他机构在阻挡 Tor。&#160; 通常来说，你可以使用 Tor 网桥解决此问题，因为它们是未公开的中继点，更不容易被封锁。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用预先配置好的默认设置的网桥地址；或者，您也可以使用以下三种方法之一获取自定义的地址。"> -<!ENTITY torsettings.bridgeHelp2Heading "通过万维网"> -<!ENTITY torsettings.bridgeHelp2 "使用网页浏览器访问 https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "通过电子邮件自动回复系统"> -<!ENTITY torsettings.bridgeHelp3 "发送邮件到 bridges(a)torproject.xn--org,-t85f28s26bzx6dy9kx14gz6r get bridges 行。&#160; 然而，这也可能致使攻击者获知大量网桥地址，所以你必须从 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> -<!ENTITY torsettings.bridgeHelp4Heading "通过帮助台"> -<!ENTITY torsettings.bridgeHelp4 "作为最后的手段，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.org 以请求网桥地址。&#160; 请注意，每个请求需要人工响应。"> +<!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> +<!ENTITY torsettings.bridgeHelp1B "你可以使用本软件集成的一组网桥，也可以通过以下三种方法获取网桥。"> +<!ENTITY torsettings.bridgeHelp2Heading "网页方式"> +<!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式"> +<!ENTITY torsettings.bridgeHelp3 "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 2 个单词（如需获取 obfs3 网桥，请写“transport obfs3”）。由于为了防止封锁者获取大量网桥地址，你必须使用 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> +<!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> +<!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh(a)rt.torproject.org).xn--,-ny6a9go5tm3jb1cb9a7ykqznm8ni2c559c8l1c0mll5cfqb.">

1 0

[tor-launcher/master] Bump version to 0.2.5.2.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit f9d7c77f71c3596a66b8026b06fe6ee6fdea00e2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 18:29:43 2014 -0700 Bump version to 0.2.5.2. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 1cd36da..f523acf 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.5.1</em:version> + <em:version>0.2.5.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/master] Really add the OpenSSL keyring.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit ada623c4cbc145521980e6bce08611cff7e81cad Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:46:07 2014 -0700 Really add the OpenSSL keyring. I wonder where GPG put it last time? --- gitian/gpg/OPENSSL.gpg | Bin 0 -> 6924 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg new file mode 100644 index 0000000..d8c115b Binary files /dev/null and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Update OpenSSL signing key and hashes.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit 06d2d07bdfbfd2361df94ef588f1f2513b6d3d12 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:34:42 2014 -0700 Update OpenSSL signing key and hashes. --- gitian/gpg/OPENSSL.gpg | Bin 4316 -> 0 bytes gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg deleted file mode 100644 index 1b282b7..0000000 Binary files a/gitian/gpg/OPENSSL.gpg and /dev/null differ diff --git a/gitian/versions b/gitian/versions index 739badc..570656d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -58,7 +58,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 9a7ac2f..baee44a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.beta b/gitian/versions.beta index 4d152dc..53060ca 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6717ad2..f3f0dca 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Update OpenSSL to 1.0.1g
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit 0dc9b5d20c312916ffec28dd0adc014a7cfae4a9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:04:19 2014 -0700 Update OpenSSL to 1.0.1g --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ gitian/versions | 4 ++-- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4a95497..3f12ac9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser Bundle 3.5.4 -- Apr 7 2014 + * All Platforms + * Update OpenSSL to 1.0.1g + Tor Browser Bundle 3.5.3 -- Mar 19 2014 * All Platforms * Update Firefox to 24.4.0esr diff --git a/gitian/versions b/gitian/versions index f007100..739badc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.5.3 +TORBROWSER_VERSION=3.5.4 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 @@ -22,7 +22,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 176477a..9a7ac2f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.beta b/gitian/versions.beta index 4c66e6b..4d152dc 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 57157c0..6717ad2 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22

1 0

[tor-launcher/master] Bug #9665: Report error if no bridges are usable.
by brade＠torproject.org 08 Apr '14

08 Apr '14

commit 61ff5d51649158dc07353e2034473ba6287bdfe0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Apr 7 16:46:22 2014 -0400 Bug #9665: Report error if no bridges are usable. --- src/chrome/locale/en/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index a2550db..d04cac5 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -55,3 +55,4 @@ 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

1 0

[tor-browser/tor-browser-24.4.0esr-1] fixup! Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 02 Apr '14

02 Apr '14

commit 0ae8ff689e7f6f0c07d15bfd7ad13d9f7bd54d55 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 2 04:42:20 2014 -0700 fixup! Add security enhancements suggested by Jesse Ruderman. It might be nice if I could cut and paste properly... --- browser/app/profile/000-tor-browser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 91f8697..4198843 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -143,9 +143,9 @@ pref("layers.acceleration.disabled", true); // Security enhancements // https://trac.torproject.org/projects/tor/ticket/9387#comment:17 pref("javascript.options.ion.content", false); -pref("javascripjavascript.options.baselinejit.content", false); -pref("javascripjavascript.options.asmjs", false); -pref("javascripjavascript.options.typeinference", false); +pref("javascript.options.baselinejit.content", false); +pref("javascript.options.asmjs", false); +pref("javascript.options.typeinference", false); // Version placeholder

1 0

[tor-browser-bundle/master] Bug 11240: Don't run chmod on (dangling) symlinks.
by gk＠torproject.org 02 Apr '14

02 Apr '14

commit 681b1598bbbb0704f620bc0e27624a46d6f51f89 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 2 10:30:11 2014 +0000 Bug 11240: Don't run chmod on (dangling) symlinks. --- gitian/build-helpers/dtar.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitian/build-helpers/dtar.sh b/gitian/build-helpers/dtar.sh index 282ec2d..e8ec340 100755 --- a/gitian/build-helpers/dtar.sh +++ b/gitian/build-helpers/dtar.sh @@ -5,7 +5,8 @@ export LC_ALL=C TARFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# No need to execute chmod on (possibly) dangling symlinks. +find $@ ! -type l -executable -exec chmod 700 {} \; +find $@ ! -type l ! -executable -exec chmod 600 {} \; find $@ | sort | tar --no-recursion -Jcvf $TARFILE -T -

1 0

[tor-browser/tor-browser-24.4.0esr-1] Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 8896b493c0487ac7402514257d6e4acdde00ff64 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 23:58:04 2014 -0700 Add security enhancements suggested by Jesse Ruderman. We were going to put these in the security slider, but perhaps they should be set by default. There will be a perf impact, but let's see if anyone notices and complains, at least for a beta or two. If not, maybe we can even set these in a release. --- browser/app/profile/000-tor-browser.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e2efc9..91f8697 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -140,5 +140,13 @@ pref("keyword.URL", "https://startpage.com/do/search?q="); pref("gfx.direct2d.disabled", true); pref("layers.acceleration.disabled", true); +// Security enhancements +// https://trac.torproject.org/projects/tor/ticket/9387#comment:17 +pref("javascript.options.ion.content", false); +pref("javascripjavascript.options.baselinejit.content", false); +pref("javascripjavascript.options.asmjs", false); +pref("javascripjavascript.options.typeinference", false); + + // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/tools'
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit ce74f8c3a85927cb70d2f5c1dc61a445662e9c1b Merge: 9dbf4b4 f7a5306 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:13:23 2014 -0700 Merge remote-tracking branch 'linus/tools' tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 51 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 44 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 120 insertions(+)

1 0