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

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

13 Feb '14

commit e2483777025ce9b51e73cbffbd755a71b1db1b4d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 15:45:31 2014 +0000 Update translations for tor-launcher-properties --- ko/torlauncher.properties | 24 ++++++++++++------------ pl/torlauncher.properties | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties index e53b2ab..f19b2e5 100644 --- a/ko/torlauncher.properties +++ b/ko/torlauncher.properties @@ -1,23 +1,23 @@ ### 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가 예기치 않게 종료되었습니다. torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세요. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. +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.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다. +torlauncher.tor_missing=Tor 실행 파일이 없습니다. +torlauncher.torrc_missing=torrc 파일이 없습니다. +torlauncher.datadir_missing=Tor 데이터 목록이 존재하지 않습니다. +torlauncher.password_hash_missing=해쉬 암호 획득 실패 -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다. +torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다. torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시오. torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. @@ -29,7 +29,7 @@ torlauncher.quit=끝내기 torlauncher.quit_win=종료 torlauncher.done=완료 -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=지원자 연결 %S torlauncher.bootstrapStatus.conn_dir=중계서버 디렉토리에 연결 torlauncher.bootstrapStatus.handshake_dir=암호화된 디렉터리 연결을 설정 diff --git a/pl/torlauncher.properties b/pl/torlauncher.properties index 6fe5500..2a003cc 100644 --- a/pl/torlauncher.properties +++ b/pl/torlauncher.properties @@ -7,8 +7,8 @@ torlauncher.tor_exited=Tor wyłączył się niespodziewanie. 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_bootstrap_failed=Tor failed to establish a Tor network connection. -# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed=Błąd Tor, nie udało się 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 torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora.

1 0

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

13 Feb '14

commit 60cd9194df54e210ee9ea8d974fe399f11222454 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 15:15:38 2014 +0000 Update translations for tor-launcher-properties --- ko/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties index 9cd8b40..e53b2ab 100644 --- a/ko/torlauncher.properties +++ b/ko/torlauncher.properties @@ -7,7 +7,7 @@ torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세요. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패 # torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S @@ -24,7 +24,7 @@ torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시 torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. -# torlauncher.connect=Connect +torlauncher.connect=연결 torlauncher.quit=끝내기 torlauncher.quit_win=종료 torlauncher.done=완료

1 0

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

13 Feb '14

commit e2232b5c3256bbb0c36a62a741212b629844a480 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 15:15:22 2014 +0000 Update translations for https_everywhere_completed --- ko/https-everywhere.dtd | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index 37d1e2c..abbc3e0 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -8,13 +8,14 @@ <!ENTITY https-everywhere.about.thanks "Thanks to"> <!ENTITY https-everywhere.about.contribute "모든곳에서 HTTPS를 사용하려면, 고려해 보십시오"> <!ENTITY https-everywhere.about.donate_tor "Tor에 기부하기"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.tor_lang_code "영어"> <!ENTITY https-everywhere.about.donate_eff "EFF에 기부하기"> <!ENTITY https-everywhere.menu.about "HTTPS Everywhere에 대하여"> <!ENTITY https-everywhere.menu.observatory "SSL 관측 환경 설정"> <!ENTITY https-everywhere.menu.globalEnable "모든곳에서 HTTPS 사용"> <!ENTITY https-everywhere.menu.globalDisable "모든곳에서 HTTPS 사용 안 함"> +<!ENTITY https-everywhere.menu.showCounter "카운터 보기"> <!ENTITY https-everywhere.prefs.title "HTTPS 모든곳 사용 환경 설정"> <!ENTITY https-everywhere.prefs.enable_all "모두 사용"> @@ -35,4 +36,13 @@ <!ENTITY https-everywhere.source.filename "파일명"> <!ENTITY https-everywhere.source.unable_to_download "소스를 다운로드할 수 없습니다."> +<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 신제품.11 알립니다."> +<!ENTITY https-everywhere.popup.paragraph1 "아, 지금까지 HTTPS Everywhere 안정화 버전을 사용하셨죠? 업그레이드 하실 수도 있습니다."> +<!ENTITY https-everywhere.popup.paragraph2 "안정화를 원하시나요?"> +<!ENTITY https-everywhere.popup.paragraph3 "저희 제품을 이용해 주심에 늘 감사드립니다. 저희는 HTTPS Everywhere를 늘 개선하고 있습니다. 혹시 오류가 여기저기에서 발생한다면 https-everywhere(a)eff.xn--org-568n 보고해 주시면 되고 불편을 끼쳐 드려 죄송합니다."> +<!ENTITY https-everywhere.popup.keep "현재 버전으로 유지"> +<!ENTITY https-everywhere.popup.revert "최신 안정화 버전 다운로드"> +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere 룰셋 테스트"> +<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "취소"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "시작">

1 0

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

13 Feb '14

commit ef20a0fb0917277e48c17fc50fdd95567a8f4a43 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 15:15:18 2014 +0000 Update translations for https_everywhere --- ko/https-everywhere.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index f22f2cd..abbc3e0 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -8,14 +8,14 @@ <!ENTITY https-everywhere.about.thanks "Thanks to"> <!ENTITY https-everywhere.about.contribute "모든곳에서 HTTPS를 사용하려면, 고려해 보십시오"> <!ENTITY https-everywhere.about.donate_tor "Tor에 기부하기"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.tor_lang_code "영어"> <!ENTITY https-everywhere.about.donate_eff "EFF에 기부하기"> <!ENTITY https-everywhere.menu.about "HTTPS Everywhere에 대하여"> <!ENTITY https-everywhere.menu.observatory "SSL 관측 환경 설정"> <!ENTITY https-everywhere.menu.globalEnable "모든곳에서 HTTPS 사용"> <!ENTITY https-everywhere.menu.globalDisable "모든곳에서 HTTPS 사용 안 함"> -<!ENTITY https-everywhere.menu.showCounter "Show Counter"> +<!ENTITY https-everywhere.menu.showCounter "카운터 보기"> <!ENTITY https-everywhere.prefs.title "HTTPS 모든곳 사용 환경 설정"> <!ENTITY https-everywhere.prefs.enable_all "모두 사용"> @@ -36,13 +36,13 @@ <!ENTITY https-everywhere.source.filename "파일명"> <!ENTITY https-everywhere.source.unable_to_download "소스를 다운로드할 수 없습니다."> -<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification"> -<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release."> -<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?"> -<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere(a)eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Keep me on the development version"> -<!ENTITY https-everywhere.popup.revert "Download the latest stable version"> +<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 신제품.11 알립니다."> +<!ENTITY https-everywhere.popup.paragraph1 "아, 지금까지 HTTPS Everywhere 안정화 버전을 사용하셨죠? 업그레이드 하실 수도 있습니다."> +<!ENTITY https-everywhere.popup.paragraph2 "안정화를 원하시나요?"> +<!ENTITY https-everywhere.popup.paragraph3 "저희 제품을 이용해 주심에 늘 감사드립니다. 저희는 HTTPS Everywhere를 늘 개선하고 있습니다. 혹시 오류가 여기저기에서 발생한다면 https-everywhere(a)eff.xn--org-568n 보고해 주시면 되고 불편을 끼쳐 드려 죄송합니다."> +<!ENTITY https-everywhere.popup.keep "현재 버전으로 유지"> +<!ENTITY https-everywhere.popup.revert "최신 안정화 버전 다운로드"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere 룰셋 테스트"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "취소"> <!ENTITY https-everywhere.ruleset-tests.status_start_button "시작">

1 0

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

13 Feb '14

commit e5b789cd71f98501d35832dbd63de7c635aba527 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 15:15:03 2014 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index ad58e5a..c052dd7 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-02-13 14:44+0000\n" +"PO-Revision-Date: 2014-02-13 14:50+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" @@ -77,7 +77,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" -msgstr "" +msgstr "1단계" #: lib/bridgedb/templates/index.html:8 #, python-format @@ -86,7 +86,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "" +msgstr "2단계" #: lib/bridgedb/templates/index.html:15 #, python-format @@ -95,7 +95,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" -msgstr "" +msgstr "3단계" #: lib/bridgedb/templates/index.html:21 #, python-format

1 0

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

13 Feb '14

commit 3d3b290b5d8e734daa492f27a55513cd5eae5711 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 14:45:41 2014 +0000 Update translations for tor-launcher-properties_completed --- pt_BR/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index fa87be9..6b338a0 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor fechou inesperadamente. torlauncher.please_restart_app=Por favor, reinicie esta aplicação. torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor. torlauncher.tor_failed_to_start=Falha ao iniciar Tor. -torlauncher.tor_bootstrap_failed=Falha ao tentar estabelecer uma conexão com a rede Tor (%S). +torlauncher.tor_bootstrap_failed=Falha ao tentar estabelecer uma conexão com a rede Tor. +torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Impossível iniciar Tor. torlauncher.tor_missing=Falta o programa de execução de Tor.

1 0

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

13 Feb '14

commit e47b5b633f068244cc1583ad8ff6869b25a59213 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 14:45:38 2014 +0000 Update translations for tor-launcher-properties --- pt_BR/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index 073a007..6b338a0 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -7,8 +7,8 @@ torlauncher.tor_exited=Tor fechou inesperadamente. torlauncher.please_restart_app=Por favor, reinicie esta aplicação. torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor. torlauncher.tor_failed_to_start=Falha ao iniciar Tor. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed=Falha ao tentar estabelecer uma conexão com a rede Tor. +torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Impossível iniciar Tor. torlauncher.tor_missing=Falta o programa de execução de Tor.

1 0

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

13 Feb '14

commit 2d46f96384555a01a45bb6cdb11393cb41d7ad69 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 14:45:02 2014 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 6bd25cf..ad58e5a 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-02-13 14:00+0000\n" +"PO-Revision-Date: 2014-02-13 14:44+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" @@ -42,7 +42,7 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "" +msgstr "공개된 브릿지 주소를 찾을 때, 통신선에 'get brides'라고 이메일을 적어서 보내는 방법도 있습니다.(메일을 보내는 사람의 주소 표기는 from %s 또는 %s 주소)" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" @@ -54,22 +54,22 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "" +msgstr "귀하의 토르가 작동하지 않는다면, %s의 이메일을 보내셔야 합니다. 가능한 한 많은 정보를 포함해서 보내주세요. 예를 들면 귀하가 사용한 브릿지의 목록, 귀하가 사용하는 번들의 파일 이름과 버전, 귀하의 토르가 맛 갔을 때 나온 메세지. 이 외에도 적을 수 있는 여러 가지." #: lib/bridgedb/templates/bridges.html:10 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "" +msgstr "위 통신선을 사용하시려면 'Vidalia's Network settings'-비달리아 네트워크 설정-페이지에 들어간 후, 'My ISP blocks connections to the Tor network'-Tor 네트워크에 내 ISP 연결을 차단-을 클릭합니다. 그러면 한번에 각각의 브릿지 주소를 추가 할 수 있습니다." #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "" +msgstr "현재 이용 가능한 브릿지 없음" #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox" -msgstr "" +msgstr "당신의 브라우저를 파이어폭스로 업그레이드 하세요!" #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words"

1 0

[metrics-db/master] Only parse assignments.log, not manually rotated logs.
by karsten＠torproject.org 13 Feb '14

13 Feb '14

commit 9c5b86cf99e059698c90ae270d738667e8e952be Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 13 15:39:02 2014 +0100 Only parse assignments.log, not manually rotated logs. --- .../ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java index 4735d35..942f89f 100644 --- a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java +++ b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java @@ -92,7 +92,7 @@ public class BridgePoolAssignmentsProcessor extends Thread { File file = files.pop(); if (file.isDirectory()) { files.addAll(Arrays.asList(file.listFiles())); - } else if (!file.getName().endsWith(".gz")) { + } else if (file.getName().equals("assignments.log")) { assignmentFiles.add(file); } }

1 0

[tor-launcher/master] Bug #10610: Users don't know if free of obstacles
by brade＠torproject.org 13 Feb '14

13 Feb '14

commit b84f602123f3acbb81419376191f377a770f6208 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 13 09:36:44 2014 -0500 Bug #10610: Users don't know if free of obstacles Improve wording on initial wizard panel. --- src/chrome/content/network-settings-wizard.xul | 4 ++-- src/chrome/locale/ar/network-settings.dtd | 2 +- src/chrome/locale/de/network-settings.dtd | 2 +- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/es/network-settings.dtd | 2 +- src/chrome/locale/fa/network-settings.dtd | 2 +- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/it/network-settings.dtd | 2 +- src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/ko/network-settings.dtd | 2 +- src/chrome/locale/nl/network-settings.dtd | 2 +- src/chrome/locale/pl/network-settings.dtd | 2 +- src/chrome/locale/pt/network-settings.dtd | 2 +- src/chrome/locale/ru/network-settings.dtd | 2 +- src/chrome/locale/vi/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 0002af4..20483ec 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -41,8 +41,8 @@ <vbox class="firstResponses" align="start"> <label class="question">&torSettings.firstQuestion;</label> <separator/> - <label>&torSettings.connectPrompt1;</label> <label>&torSettings.connectPrompt2;</label> + <label>&torSettings.connectPrompt3;</label> <button label="&torSettings.connect;" oncommand="useSettings();"/> <separator class="tall"/> <label>&torSettings.configurePrompt1;</label> diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index b29ae6a..21bc7e3 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 " اتصال الإنترنت لهذا الكمبيوتر مُراقب، أو مصفى، أو يعمل ببروكسي."> <!ENTITY torSettings.configurePrompt2 "أحتاج إلي تكوين إعدادات الشبكة."> <!ENTITY torSettings.configure "تكوين"> -<!ENTITY torSettings.connectPrompt1 "اتصال الإنترنت لهذا الكمبيوتر خالي من العقبات."> <!ENTITY torSettings.connectPrompt2 "أود الاتصال مباشرة إلى شبكة تور."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "اتصل"> <!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الجهاز إلي بروكسي حتي يصل إلي شبكة الإنترنت؟"> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 5e620ff..19af78a 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert, gefiltert oder vermittelt."> <!ENTITY torSettings.configurePrompt2 "Ich muss die Netzwerkeinstellungen konfigurieren."> <!ENTITY torSettings.configure "Konfigurieren"> -<!ENTITY torSettings.connectPrompt1 "Die Internetverbindung dieses Rechners ist frei von Hindernissen."> <!ENTITY torSettings.connectPrompt2 "Ich würde gerne direkt eine Verbindung zum Tor-Netzwerk herstellen."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "Verbinden"> <!ENTITY torSettings.proxyQuestion "Benötigt dieser Rechner einen Vermittlungsserver um eine Verbindung zum Internet herzustellen?"> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 3017865..ee9e149 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -9,10 +9,10 @@ <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure network settings."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles."> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 2ca7d03..1fd58b2 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "La conexión a Internet de esta computadora está censurada, filtrada o proxificada."> <!ENTITY torSettings.configurePrompt2 "Necesito configurar la opciones de red."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt1 "La conexión a Internet de esta computadora está libre de obstáculos."> <!ENTITY torSettings.connectPrompt2 "Me gustaría conectar directamente a la red Tor."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyQuestion "¿Necesita usar un proxy de acceso a Internet esta computadora ?"> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index a7f773f..ab43953 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "اینترنت استفاده شده در این رایانه ها سانسور شده٫فیلتر شده و یا عبور کرده از روی پراکسی می باشند."> <!ENTITY torSettings.configurePrompt2 "من نیاز به تنظیمات شبکه دارم."> <!ENTITY torSettings.configure "پیکربندی"> -<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles."> <!ENTITY torSettings.connectPrompt2 "تمایل دارم مستقیما به شبکه‌ی تور متصل شوم."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "اتصال"> <!ENTITY torSettings.proxyQuestion "آیا این رایانه برای اتصال به اینترنت نیاز به استفاده از پراکسی دارد؟"> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index b39112c..7d4a4fe 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou nécessite un proxy."> <!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer les paramètres réseau. "> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt1 "Rien n'entrave la connexion Internet de cet ordinateur."> <!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au réseau Tor."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur à besoin d'un proxy pour accéder à internet ?"> diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index d88ff63..cc5228f 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "La connessione ad Internet di questo computer è censurata, filtrata, o passa attraverso un proxy."> <!ENTITY torSettings.configurePrompt2 "Devo configurare le impostazioni di rete."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt1 "La connessione ad internet di questo computer è priva di ostacoli."> <!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "Connetti"> <!ENTITY torSettings.proxyQuestion "Questo computer usa un proxy per accedere ad Internet?"> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index c3c4245..976df97 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "このコンピュータのインターネット接続は検閲されているか、フィルターされているか、プロキシを通します。"> <!ENTITY torSettings.configurePrompt2 "ネットワーク設定を構成する必要があります。"> <!ENTITY torSettings.configure "構成"> -<!ENTITY torSettings.connectPrompt1 "このコンピュータのインターネット接続には障害がありません。"> <!ENTITY torSettings.connectPrompt2 "Torネットワークへ直接接続したいです。"> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "接続"> <!ENTITY torSettings.proxyQuestion "このコンピューターはインターネットにアクセスするのにProxyが必要ですか？"> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index acb43ea..91886b4 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 ""> <!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> <!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect ""> <!ENTITY torSettings.proxyQuestion ""> diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 8208ff4..96cb0a2 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer wordt gecensureerd, gefilterd of geproxyed."> <!ENTITY torSettings.configurePrompt2 "Ik moet netwerkinstellingen configureren."> <!ENTITY torSettings.configure "Configureer"> -<!ENTITY torSettings.connectPrompt1 "De internetverbinding van deze computer is vrij van obstakels."> <!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor netwerk verbinden."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "Verbind"> <!ENTITY torSettings.proxyQuestion "Heeft deze computer een proxy nodig om met het internet te verbinden?"> diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index f395b2e..ffbd499 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "Połączenie tego komputera jest cenzurowane, filtrowane lub przekierowywane."> <!ENTITY torSettings.configurePrompt2 "Potrzebuję dostosować ustawienia sieci."> <!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 ""> <!ENTITY torSettings.connect "Połącz"> <!ENTITY torSettings.proxyQuestion "Czy ten komputer potrzebuje proxy w celu połączenia się z Internetem?"> diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 63cba8a..b743ce3 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "A ligação à Internet deste computador está a ser censurada, filtrada ou utilizada através de um proxy."> <!ENTITY torSettings.configurePrompt2 "Preciso de configuar definições de rede."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt1 "A ligação à Internet deste computador está livre de obstáculos."> <!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente à rede Tor."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "Ligar"> <!ENTITY torSettings.proxyQuestion "Este computador precisa de usar um proxy para aceder a Internet?"> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 3bdd609..7c96ee2 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "Интернет-соединение этого компьютера цензурируется, фильтруется или находятся за прокси."> <!ENTITY torSettings.configurePrompt2 "Мне нужно настроить сетевые параметры."> <!ENTITY torSettings.configure "Настроить"> -<!ENTITY torSettings.connectPrompt1 "Интернет-соединение этого компьютера не имеет ограничений."> <!ENTITY torSettings.connectPrompt2 "Я бы хотел соединиться с сетью Tor напрямую."> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "Соединиться"> <!ENTITY torSettings.proxyQuestion "Этому компьютеру нужен прокси для доступа в Интернет?"> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 465f35b..7dfa6cc 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 ""> <!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> <!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect ""> <!ENTITY torSettings.proxyQuestion ""> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index eaeb77f..14b753d 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 "该计算机的网络连接受到审查或过滤，或者需要使用代理。"> <!ENTITY torSettings.configurePrompt2 "我需要配置网络设置。"> <!ENTITY torSettings.configure "配置"> -<!ENTITY torSettings.connectPrompt1 "该计算机的网络连接毫无阻碍。"> <!ENTITY torSettings.connectPrompt2 "我想要直接连接 Tor 网络。"> +<!ENTITY torSettings.connectPrompt3 ""> <!ENTITY torSettings.connect "连接"> <!ENTITY torSettings.proxyQuestion "该计算机是否需要通过代理访问互联网？">

1 0