February 2014 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit 015800d89c997a7b56170bcc74288648d19b52c5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 17:45:40 2014 +0000 Update translations for tor-launcher-network-settings --- fr/network-settings.dtd | 2 +- ru/network-settings.dtd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index 570ff78..53ffad2 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au réseau Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur a besoin d'un proxy pour accéder à internet ?"> diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 188f588..5ceb42b 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -9,10 +9,10 @@ <!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 "Я бы хотел соединиться с сетью Tor напрямую."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Это должно работать в большинстве ситуаций."> <!ENTITY torSettings.connect "Соединиться"> <!ENTITY torSettings.proxyQuestion "Этому компьютеру нужен прокси для доступа в Интернет?">

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit a8a6ba16ab67a479577418e902d80fc34cc97113 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 17:45:37 2014 +0000 Update translations for tor-launcher-progress_completed --- ko/progress.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ko/progress.dtd b/ko/progress.dtd new file mode 100644 index 0000000..0d219c7 --- /dev/null +++ b/ko/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Tor 상태"> +<!ENTITY torprogress.openSettings "시작 설정"> +<!ENTITY torprogress.heading "Tor 네트워크에 연결중"> +<!ENTITY torprogress.pleaseWait "Tor 네트워크 연결 설정 후 Tor 브라우저가 열립니다.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit 051362acf62f2aa7f67ff3376dd4641d0cdc0e97 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 17:45:33 2014 +0000 Update translations for tor-launcher-progress --- ko/progress.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/progress.dtd b/ko/progress.dtd index f61a3b6..0d219c7 100644 --- a/ko/progress.dtd +++ b/ko/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 상태"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.openSettings "시작 설정"> <!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> +<!ENTITY torprogress.pleaseWait "Tor 네트워크 연결 설정 후 Tor 브라우저가 열립니다.">

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit a7e652233aa173ce8e228200be7b10f6f83c41c7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 17:15:36 2014 +0000 Update translations for tails-misc --- ko.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ko.po b/ko.po index 393245d..019e4a2 100644 --- a/ko.po +++ b/ko.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 15:05+0100\n" -"PO-Revision-Date: 2014-02-14 16:45+0000\n" +"PO-Revision-Date: 2014-02-14 17:10+0000\n" "Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -58,41 +58,41 @@ msgstr "정보" #: config/chroot_local-includes/usr/local/bin/gpgApplet:192 msgid "Encrypt Clipboard with _Passphrase" -msgstr "" +msgstr "_Passphrase 에서 클립보드를 암호화" #: config/chroot_local-includes/usr/local/bin/gpgApplet:195 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "" +msgstr "Public _Keys 에서 클립보드 서명/암호와" #: config/chroot_local-includes/usr/local/bin/gpgApplet:200 msgid "_Decrypt/Verify Clipboard" -msgstr "" +msgstr "_Decrypt/Verify 클립보드" #: config/chroot_local-includes/usr/local/bin/gpgApplet:204 msgid "_Manage Keys" -msgstr "" +msgstr "_Manage Keys" #: config/chroot_local-includes/usr/local/bin/gpgApplet:244 msgid "The clipboard does not contain valid input data." -msgstr "" +msgstr "클립보드에 유효한 입력 데이터가 포함되어 있지 않습니다." #: config/chroot_local-includes/usr/local/bin/gpgApplet:294 #: config/chroot_local-includes/usr/local/bin/gpgApplet:296 #: config/chroot_local-includes/usr/local/bin/gpgApplet:298 msgid "Unknown Trust" -msgstr "" +msgstr "신뢰 수준 - 낮음" #: config/chroot_local-includes/usr/local/bin/gpgApplet:300 msgid "Marginal Trust" -msgstr "" +msgstr "신뢰 수준 - 보통" #: config/chroot_local-includes/usr/local/bin/gpgApplet:302 msgid "Full Trust" -msgstr "" +msgstr "신뢰 수준 - 높음" #: config/chroot_local-includes/usr/local/bin/gpgApplet:304 msgid "Ultimate Trust" -msgstr "" +msgstr "신뢰 수준 - 존나 높음" #: config/chroot_local-includes/usr/local/bin/gpgApplet:357 msgid "Name" @@ -100,7 +100,7 @@ msgstr "이름" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID" -msgstr "" +msgstr "Key ID" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Status" @@ -108,30 +108,30 @@ msgstr "상태" #: config/chroot_local-includes/usr/local/bin/gpgApplet:391 msgid "Fingerprint:" -msgstr "" +msgstr "핑거 프린트:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" +msgstr[0] "사용자의 ID들을 적으시오:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" -msgstr "" +msgstr "없음 (서명 안 함)" #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "받는 사람 선택:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "받는 사람 숨기기" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "" +msgstr "암호화 된 메시지를 받는 모든 사람의 사용자 ID를 숨깁니다. 그렇지 않으면 암호화 된 메시지를 도청하는 사람은 받는 사람이 누구인지 볼 수 있습니다." #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit f5022e1f46475bf8a940fb6d4cb0eb3acd99da64 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 16:45:38 2014 +0000 Update translations for tails-misc --- ko.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ko.po b/ko.po index 8cb732a..393245d 100644 --- a/ko.po +++ b/ko.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dr.what <javrick6(a)naver.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 12:23+0100\n" -"PO-Revision-Date: 2014-01-11 08:57+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-01-29 15:05+0100\n" +"PO-Revision-Date: 2014-02-14 16:45+0000\n" +"Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgstr "<h1>버그를 찾을 수 있도록 도와주세요!</h1>\n<p>Read <a hre #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "OpenPGP 암호와 애플릿" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit"

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit 4be6d5c2cf325191a19738a77fdf7d69d0515570 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 16:45:32 2014 +0000 Update translations for tor-launcher-properties_completed --- ko/torlauncher.properties | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties new file mode 100644 index 0000000..df1625a --- /dev/null +++ b/ko/torlauncher.properties @@ -0,0 +1,52 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Tor 브라우저 Launcher + +torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. +torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세요. +torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다. +torlauncher.tor_failed_to_start=Tor 시작 실패. +torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패 +torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) + +torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S +torlauncher.tor_missing=Tor 실행 파일이 없습니다. +torlauncher.torrc_missing=torrc 파일이 없습니다. +torlauncher.datadir_missing=Tor 데이터 목록이 존재하지 않습니다. +torlauncher.password_hash_missing=해쉬 암호 획득 실패 + +torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S +torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다.\n\n%S +torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시오. + +torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. +torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. +torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. + +torlauncher.connect=연결 +torlauncher.quit=끝내기 +torlauncher.quit_win=종료 +torlauncher.done=완료 + +torlauncher.forAssistance=지원자 연결 %S + +torlauncher.bootstrapStatus.conn_dir=중계서버 디렉토리에 연결 +torlauncher.bootstrapStatus.handshake_dir=암호화된 디렉터리 연결을 설정 +torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오는중 +torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 요청중 +torlauncher.bootstrapStatus.loading_keys=권한 인증서를 로딩중 +torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청중 +torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 로딩중 +torlauncher.bootstrapStatus.conn_or=Tor 네트워크에 연결중 +torlauncher.bootstrapStatus.handshake_or=토르 서킷의 연결을 성공 +torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공! + +torlauncher.bootstrapWarning.done=완료 +torlauncher.bootstrapWarning.connectrefused=연결이 거부됨 +torlauncher.bootstrapWarning.misc=잡동사니 +torlauncher.bootstrapWarning.resourcelimit=리소스 부족 +torlauncher.bootstrapWarning.identity=계정 불일치 +torlauncher.bootstrapWarning.timeout=연결 타임아웃 +torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 +torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit 249bcaabaa58bc9561701d7d94cf0f44600a0622 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 16:45:29 2014 +0000 Update translations for tor-launcher-properties --- ko/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties index f19b2e5..df1625a 100644 --- a/ko/torlauncher.properties +++ b/ko/torlauncher.properties @@ -8,16 +8,16 @@ torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세 torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다. torlauncher.tor_failed_to_start=Tor 시작 실패. torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패 -# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) -torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다. +torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S torlauncher.tor_missing=Tor 실행 파일이 없습니다. torlauncher.torrc_missing=torrc 파일이 없습니다. torlauncher.datadir_missing=Tor 데이터 목록이 존재하지 않습니다. torlauncher.password_hash_missing=해쉬 암호 획득 실패 -torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다. -torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다. +torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S +torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다.\n\n%S torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시오. torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다.

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit 62d5cb4a8bfd40f084cc9c105d32e6a9abfc62e3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 16:15:05 2014 +0000 Update translations for gettor --- vi/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vi/gettor.po b/vi/gettor.po index 07f280e..193111e 100644 --- a/vi/gettor.po +++ b/vi/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-02-14 15:42+0000\n" +"PO-Revision-Date: 2014-02-14 15:51+0000\n" "Last-Translator: heliter\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -467,7 +467,7 @@ msgid "" "The Browser Bundle (TBB) is the package we recommend to most users. \n" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." -msgstr "" +msgstr "The Browser Bundle (TBB) là một gói phần mềm mà chúng tôi khuyên dùng cho người dùng.\nGói này có tất cả những gì bạn cần để lướt web an toàn trên Internet.\nChỉ cần giản nén và chạy." #: lib/gettor/i18n.py:292 msgid "What package should I request?" @@ -479,7 +479,7 @@ msgid "" "operating system is Microsoft Windows, you should request \"windows\". Here\n" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" -msgstr "" +msgstr "Điều này tuỳ thuộc vào hệ điều hành mà bạn sử dụng. Ví dụ, nếu như hệ điều hành của bạn là Windows, bạn nên gửi yêu cầu là windows. Đây là bạn giải thích ngắn gọn cho gói phần mềm mà bạn yêu cầu và hệ điều hành nảo để thích hợp sử dụng:" #: lib/gettor/i18n.py:299 msgid "How do I extract the file(s) you sent me?"

1 0

[tor-launcher/master] Bug #10894: Help desk is not a bridge autoresponder.
by brade＠torproject.org 14 Feb '14

14 Feb '14

commit a187a2062840c9466b87154ba698e90decaf1302 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 14 11:06:04 2014 -0500 Bug #10894: Help desk is not a bridge autoresponder. Revise the text and layout of the Bridge Relay Help wizard page to avoid confusion and to encourage people to try the other methods of obtaining bridge addresses before they contact the help desk. --- src/chrome/content/network-settings-wizard.xul | 19 +++++++++++++++--- src/chrome/content/network-settings.js | 6 ++++++ src/chrome/locale/ar/network-settings.dtd | 8 ++++++-- src/chrome/locale/de/network-settings.dtd | 4 ++++ src/chrome/locale/en/network-settings.dtd | 12 ++++++++---- src/chrome/locale/es/network-settings.dtd | 4 ++++ src/chrome/locale/fa/network-settings.dtd | 6 +++++- src/chrome/locale/fr/network-settings.dtd | 4 ++++ src/chrome/locale/it/network-settings.dtd | 4 ++++ src/chrome/locale/ja/network-settings.dtd | 4 ++++ src/chrome/locale/ko/network-settings.dtd | 4 ++++ src/chrome/locale/nl/network-settings.dtd | 4 ++++ src/chrome/locale/pl/network-settings.dtd | 4 ++++ src/chrome/locale/pt/network-settings.dtd | 4 ++++ src/chrome/locale/ru/network-settings.dtd | 4 ++++ src/chrome/locale/vi/network-settings.dtd | 4 ++++ src/chrome/locale/zh-CN/network-settings.dtd | 4 ++++ src/chrome/skin/network-settings.css | 25 ++++++++++++++++++++---- 18 files changed, 110 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 20483ec..dcc169e 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -15,6 +15,7 @@ <wizard id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" @@ -149,9 +150,21 @@ onpageadvanced="closeHelp(); return false;"> <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox> <description>&torsettings.bridgeHelp1;</description> - <description>&torsettings.bridgeHelp2;</description> - <description>&torsettings.bridgeHelp3;</description> - <description class="endOfHelp">&torsettings.bridgeHelp4;</description> + <description class="prelist">&torsettings.bridgeHelp1B;</description> + <html:ol> + <html:li> + <html:div class="heading">&torsettings.bridgeHelp2Heading;</html:div> + <html:div>&torsettings.bridgeHelp2;</html:div> + </html:li> + <html:li> + <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div> + <html:div>&torsettings.bridgeHelp3;</html:div> + </html:li> + <html:li> + <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div> + <html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div> + </html:li> + </html:ol> </wizardpage> <hbox pack="start"> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 27b6f58..6446af2 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -520,6 +520,9 @@ function onOpenHelp() showOrHideButton("back", false, false); showOrHideButton("extra2", false, false); overrideButtonLabel("next", "done"); + var forAssistance = document.getElementById("forAssistance"); + if (forAssistance) + forAssistance.setAttribute("hidden", true); } else overrideButtonLabel("cancel", "done"); @@ -539,6 +542,9 @@ function closeHelp() if (copyLogBtn && copyLogBtn.hasAttribute("wizardCanCopyLog")) copyLogBtn.removeAttribute("hidden"); restoreButtonLabel("next"); + var forAssistance = document.getElementById("forAssistance"); + if (forAssistance) + forAssistance.removeAttribute("hidden"); } else restoreButtonLabel("cancel"); diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 21bc7e3..fda8d64 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -49,7 +49,11 @@ <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> -<!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور. &#160; وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> +<!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور.   وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "للحصول علي بعض الجسور، زر هذه الصفحة من خلال المتصفح: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 "وهناك طريقة أخرى للعثور على عناوين الجسور العامة وهي إرسال بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد.&#160; و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو إما yahoo.com"> +<!ENTITY torsettings.bridgeHelp3Heading ""> +<!ENTITY torsettings.bridgeHelp3 "وهناك طريقة أخرى للعثور على عناوين الجسور العامة وهي إرسال بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد.  و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو إما yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "يمكنك إيضاً طلب الجسور يإرسال بريد إلكتروني إلي help(a)rt.torproject.org."> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 19af78a..5621a3a 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> <!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.&#160; Dieses Problem kann meist mit der Benutzung von Torbrücke umgangen werden, dieses sind versteckte Relais und damit schwerer zu blocken."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "Um einige Brückenrelais zu erhalten, besuchen Sie mit einem Web-Browser folgende Seite: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Eine andere Möglichkeit öffentliche Brücken zu finden ist, eine E-Mail mit dem Inhalt »get bridges« an bridges(a)torproject.org zu schicken.&#160; Allerdings muss diese E-Mail, um es potentiellen Angreifern schwerer zu machen, von einer der folgenden Domains aus geschickt werden: gmail.com oder yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "Brückenrelais können auch mit Hilfe einer E-Mail an help(a)rt.torproject.org angefordert werden."> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index ee9e149..899a543 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -49,7 +49,11 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!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.  Often, you can work around this problem by using Tor Bridges which are hidden relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web browser to visit the following page: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> -<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by sending mail to help(a)rt.torproject.org."> +<!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.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> +<!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.  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.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 1fd58b2..28b0c9e 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')"> <!ENTITY torsettings.bridgeHelp1 "Si no es capaz de conectar con la red Tor, podría ser que su Proveedor de Servicios de Internet (ISP), u otra agencia, esté bloqueando Tor.&#160; A menudo puede evitar este problema usando puentes Tor ('bridges'), que son repetidores 'ocultos' más difíciles de bloquear"> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "Para obtener algunas direcciones de puentes, utilice un navegador web para visitar la siguiente página: "> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Otra manera de encontrar direcciones de puentes ('bridges') públicas es mandar un correo a bridges(a)torproject.org con la línea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para ponerle más difícil a un atacante conocer muchas direcciones de puentes, debe envíar esta solicitud desde una dirección de correo electrónico de uno de los siguientes dominios (con soporte DKIM): gmail.com o yahoo.com "> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "También puede solicitar repetidores puente ('bridge relays') mandando un correo a help(a)rt.torproject.org"> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index ab43953..d837426 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -49,7 +49,11 @@ <!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> <!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 hidden relays that are more difficult to block."> +<!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 ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "برای بدست آوردن پل ارتباطی٫با استفاده از مرورگر وب به آدرس https://bridges.torproject.org مراجعه فرمایید."> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail 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 an email address at one of the following domains: gmail.com or yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "شما میتوانید با ارسال ایمیل به help(a)rt.torproject.org درخواست پل ارتباطی نمایید."> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 7d4a4fe..edbe29e 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les bridges"> <!ENTITY torsettings.bridgeHelp1 "S'il est impossible de se connecter au réseau Tor, cela peut être le signe que votre Fournisseur d'Accès à Internet (FAI) ou une autre entité bloque Tor. La plupart du temps, vous pouvez contourner ce problème en utilisant les « bridges » Tor. Ce sont des relais cachés qui sont plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "Pour obtenir des adresses de bridges, utilisez un navigateur web pour aller sur la page : https://bridges.torproject.org/"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Une autre manière de trouver des adresses de bridges publics est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'email. Toutefois, pour que cela soit plus difficile pour un attaquant de découvrir beaucoup d'adresses, les demandes doivent provenir d'une adresse email appartenant à l'un des domaines suivants : gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander des adresses de bridges en écrivant à help-fr(a)rt.torproject.org."> diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index cc5228f..bed89b3 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> <!ENTITY torsettings.bridgeHelp1 "Se non riesci a connetterti alla rete Tor, potrebbe essere il tuo fornitore di servizi Internet (ISP), o un altro ente, che sta bloccando Tor.&#160; Spesso è possibile aggirare questo problema utilizzando i ponti Tor: si tratta di relé nascosti, più difficili da bloccare."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "Per ottenere una lista di ponti relé, visita con un browser web la seguente pagina: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Un altro modo per conoscere gli indirizzi dei ponti pubblici consiste nell'inviare una e-mail all'indirizzo bridges(a)torproject.org con il testo 'get bridges' nel corpo del messaggio.&#160; Tuttavia, per rendere più difficile ad un utente malintenzionato il rilevamento di molti indirizzi dei ponti, devi inviare la richiesta da un indirizzo e-mail appartenente ad uno dei seguenti domini: gmail.com oppure yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "Una lista di ponti relé può essere ottenuta anche inviando una e-mail all'indirizzo help(a)rt.torproject.org."> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 976df97..d12b19f 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -50,6 +50,10 @@ <!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 "パブリックなブリッジアドレスを見つけるもう一つの方法は、本文に<b>get bridges</b>と記入したE-mailを bridges(a)torproject.org 宛に送信することです。&#160; しかし、アタッカーがたくさんのブリッジアドレスを収集するのを困難にするため、あなたは、gmail.comかyahoo.comのドメインのいずれかからこのリクエストを送らなければなりません。"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "help@rt.torproject.org宛にメールを送信することでもブリッジリレーを要求できます。"> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 91886b4..8091319 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog ""> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 ""> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 ""> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 ""> diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 96cb0a2..23caff2 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Kopieer Tor log naar het klembord"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Hulp"> <!ENTITY torsettings.bridgeHelp1 "Als je niet kan verbinden met het Tor netwerk, dan is het mogelijk dat je Internet Service Provider (ISP) of en ander agentschap Tor &#160; blokkeert. Vaak kan je dit probleem omzeilen door gebruik te maken van Tor Bridges. Dit zijn verborgen relays die moeilijker te blokkeren zijn."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "Om enkele bridge relays te verkrijgen gebruik je een web browser om de volgende pagina te bezoeken: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Een andere manier om openbare bridge addressen te verkrijgen is door e-mail te sturen naar bridges(a)torproject.org met de woorden 'get bridges' als losstaande tekst in het berichtgedeelte van de e-mail. &#160; Echter: om het moelijker te maken voor een aanvaller om veel bridge adressen te verkrijgen, moet je deze e-mail versturen vanaf een e-mailadres uit één van de volgende domeinen: gmail.com of yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "Je kan ook bridge relays opvragen door een e-mail te sturen naar help(a)rt.torproject.org."> diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index ffbd499..f18352a 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> <!ENTITY torsettings.bridgeHelp1 "Jeśli nie możesz połączyć się z siecią Tor możliwe jest, że Twój dostawca internetu (ISP) blokuje Ci ten dostęp&#160. Częstym rozwiązaniem jest użycie mostków Tora, w których ukryte są przekaźniki trudne do wykrycia."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "W celu uzyskania przekaźników mostkowych skorzystać ze strony https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Inną drogą do znalezienia publicznych mostków jest wysłanie e-maila do bridges(a)torproject.org z poleceniem 'get bridges' w tytule wiadomości.&#160; Jednakże, by utrudnić atakującym dostęp do wiedzy o mostkach musisz wysłać zapytanie z adresu o domenach: gmail.com lub yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "Możesz zgłosić mostki wysyłając e-maila do help(a)rt.torproject.org."> diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index b743ce3..e998fb1 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Copiar o Tor Log para o Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay"> <!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, o seu Internet Service Provider (ISP) ou outra agência está a bloquear o Tor.&#160; Muito frequentemente poderá contornar este problema usando Bridges Tor que são relays escondidos mais difíceis de bloquear."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "Para obter alguns bridge relays, utilize um navegador web para visitar a seguinte página: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "Outra forma de encontrar enderençoes de bridges públicos é enviar um e-mail para bridges(a)torproject.org com "get bridges" no corpo da mensagem.&#160; Contudo, para tornar mais difícil para um atacante descobrir muito sobre endereções bridge, deve enviar este pedido a partir de um endereço de e-mail de um dos seguintes domínios: gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "Também pode pedir bridge relays enviando um e-mail para help(a)rt.torproject.org."> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 7c96ee2..c84d7de 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> <!ENTITY torsettings.bridgeHelp1 "Если Tor по-прежнему не работает, вполне вероятно, что Ваш провайдер блокирует 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.org со строкой get bridges в теле письма. В целях безопасности система принимает письма только с адресов gmail.com и yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "Вы также можете запросить список мостов отправив письмо на help(a)rt.torproject.org"> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 7dfa6cc..3ac3994 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog ""> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 ""> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 ""> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 ""> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 14b753d..267e4bb 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -50,6 +50,10 @@ <!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!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-z36c1381b8ja265f1ods20awtw38t bridges”。不过，为了防止攻击者获得大量网桥地址，发送邮件的电子邮件地址必须来自以下域名：gmail.com 或 yahoo.com。"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "另外，还可以发送电子邮件至 help(a)rt.torproject.org 来获取网桥中继。"> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 7ab28c1..4f39e5a 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, The Tor Project, Inc. + * Copyright (c) 2014, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -65,6 +65,7 @@ separator.tall { height: 2.1em; } +.help .heading, .question { font-weight: bold; } @@ -113,21 +114,37 @@ dialog .help { .help label { font-size: 120%; font-weight: bold; - margin: 0px 0px 20px 0px; + margin: 0px 0px 12px 0px; +} + +.help div { + -moz-user-select: text; + -moz-user-focus: normal; } .help description { - margin-bottom: 15px; + margin-bottom: 10px; -moz-user-select: text; -moz-user-focus: normal; cursor: text; } -.help description.endOfHelp { +.help description.prelist { margin-bottom: 0px; } +.help ol { + padding-top: 0px; + margin-top: 5px; + margin-bottom: 0px; +} + +.help li { + margin-bottom: 8px; +} + /* Increase font size on Windows for readability */ +.os-windows div, .os-windows label, .os-windows description, .os-windows textbox

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 14 Feb '14

14 Feb '14

commit 38677c7c171a93f07775d5d113240dc27038f19b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 15:45:39 2014 +0000 Update translations for tor-launcher-network-settings_completed --- pl/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd index f395b2e..2199347 100644 --- a/pl/network-settings.dtd +++ b/pl/network-settings.dtd @@ -9,10 +9,10 @@ <!ENTITY torSettings.firstQuestion "Które z poniższych najlepiej opisuje Twoją sytuację?"> <!ENTITY torSettings.configurePrompt1 "Połączenie tego komputera jest cenzurowane, filtrowane lub przekierowywane."> -<!ENTITY torSettings.configurePrompt2 "Potrzebuję dostosować ustawienia sieci."> +<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować most, firewall lub ustawienia serwera proxy."> <!ENTITY torSettings.configure "Konfiguruj"> -<!ENTITY torSettings.connectPrompt1 "Połączenie internetowe jest wolne od przeszkód."> <!ENTITY torSettings.connectPrompt2 "Chcę połączyć się bezpośrednio z siecią Tor."> +<!ENTITY torSettings.connectPrompt3 "To zadziała w większości sytuacji."> <!ENTITY torSettings.connect "Połącz"> <!ENTITY torSettings.proxyQuestion "Czy ten komputer potrzebuje proxy w celu połączenia się z Internetem?">

1 0