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

[tor-browser-bundle/maint-3.6] Stop checking HTTPS-Everywhere's tag. We use the xpi.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit a5ccfbc333008607dee27d6d5a2d6c10e3720cb4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 16:05:02 2014 -0700 Stop checking HTTPS-Everywhere's tag. We use the xpi. --- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index bbae06f..7531589 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -51,7 +51,7 @@ echo "`cd tor && git log --format=%H -1 $TOR_TAG` tor.git" >> bundle.inputs echo "`cd tor-browser && git log --format=%H -1 $TORBROWSER_TAG` tor-browser.git" >> bundle.inputs echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> bundle.inputs echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs -echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs +#echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 324a27a..9814440 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -96,11 +96,11 @@ torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG -https-everywhere https-everywhere.gpg $HTTPSE_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG flashproxy flashproxy.gpg $FLASHPROXY_TAG EOF +#https-everywhere https-everywhere.gpg $HTTPSE_TAG while read dir commit; do check_git_hash "$dir" "$commit"

1 0

[tor-browser-bundle/maint-3.6] Switch to build candidates directory for fetching Firefox langpacks.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit b139e04c388230ba3aef98376b3d69b7aa3f30e0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:55:40 2014 -0700 Switch to build candidates directory for fetching Firefox langpacks. This will allow us to build earlier, and also make our build hashes reproducible in the event of a minor langpack hash change we decide to ignore. --- gitian/fetch-inputs.sh | 6 +++--- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.nightly | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index be5c9d9..32c4139 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -248,13 +248,13 @@ cd langpacks-$FIREFOX_LANG_VER for i in $BUNDLE_LOCALES do cd linux-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd win32-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd mac-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. done diff --git a/gitian/versions b/gitian/versions index e700ad3..25bafb0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4906e1c..d7d3dc7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,6 +27,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index c76acde..346a5d1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e19ebdc..335000b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Switch to build candidates directory for fetching Firefox langpacks.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 2da330af506d344e97b8d192a512c4c7df4a663e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:52:08 2014 -0700 Switch to build candidates directory for fetching Firefox langpacks. This will allow us to build earlier, and also make our build hashes reproducible in the event of a minor langpack hash change we decide to ignore. --- gitian/fetch-inputs.sh | 6 +++--- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.nightly | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 086085c..ad82ddf 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -227,13 +227,13 @@ cd langpacks-$FIREFOX_LANG_VER for i in $BUNDLE_LOCALES do cd linux-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd win32-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd mac-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. done diff --git a/gitian/versions b/gitian/versions index 20c7e73..9be200c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 52d0b9b..ec52a45 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index dbb50d8..c35ad6c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f2ef57c..0cf5d0b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] Bug #12974: Disable NTLM and Negotiate HTTP Auth
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 4825026471678728d5aa085717e301fc6551fe2b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:19:10 2014 -0700 Bug #12974: Disable NTLM and Negotiate HTTP Auth This is technically an embargoed Mozilla bug, so I probably shouldn't provide too many details. Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I doubt very many (or any of them) actually need it. The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421 --- extensions/auth/nsHttpNegotiateAuth.cpp | 4 ++++ netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 5248730..3e5580d 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -85,6 +85,10 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel *authChannel, nsIAuthModule *module = (nsIAuthModule *) *continuationState; *identityInvalid = false; + + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + if (module) return NS_OK; diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index d25c1de..6882803 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -239,6 +239,9 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel *channel, *identityInvalid = false; + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + // Start a new auth sequence if the challenge is exactly "NTLM". // If native NTLM auth apis are available and enabled through prefs, // try to use them.

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] Bug #12974: Disable NTLM and Negotiate HTTP Auth
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 9f4106c53e432599c084d38b7509692ccf42c5e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:19:10 2014 -0700 Bug #12974: Disable NTLM and Negotiate HTTP Auth This is technically an embargoed Mozilla bug, so I probably shouldn't provide too many details. Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I doubt very many (or any of them) actually need it. The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421 --- extensions/auth/nsHttpNegotiateAuth.cpp | 4 ++++ netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 5248730..3e5580d 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -85,6 +85,10 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel *authChannel, nsIAuthModule *module = (nsIAuthModule *) *continuationState; *identityInvalid = false; + + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + if (module) return NS_OK; diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index d25c1de..6882803 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -239,6 +239,9 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel *channel, *identityInvalid = false; + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + // Start a new auth sequence if the challenge is exactly "NTLM". // If native NTLM auth apis are available and enabled through prefs, // try to use them.

1 0

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

27 Aug '14

commit 086516638c0a50d3e70f02b98f979ce6ca8051d3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 27 15:45:33 2014 +0000 Update translations for tor-launcher-properties_completed --- es/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index 17d1322..6f1c18a 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S -torlauncher.copiedNLogMessages=Copia completa. %S mensajes de registro (log) de Tor están listos para ser pegados en un editor de texto o un mensaje de correo electrónico. +torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o un mensaje de correo electrónico. torlauncher.bootstrapStatus.conn_dir=Conectando a un repositorio ('Directory') de repetidores ('relays') torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión cifrada con el repositorio de repetidores

1 0

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

27 Aug '14

commit 9dd0de54e08457c548f383337a4a66291f4ce37f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 27 15:45:31 2014 +0000 Update translations for tor-launcher-properties --- es/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index 7613afa..6f1c18a 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o un mensaje de correo electrónico. torlauncher.bootstrapStatus.conn_dir=Conectando a un repositorio ('Directory') de repetidores ('relays') torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión cifrada con el repositorio de repetidores

1 0

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

27 Aug '14

commit 3f04b14bf2424531f8a0a0a68fbc6064529b08c6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 27 15:15:42 2014 +0000 Update translations for tor-launcher-network-settings_completed --- es/network-settings.dtd | 7 ++----- uk/network-settings.dtd | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 6e7d76d..73b9f80 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes describe mejor su situación?"> -<!ENTITY torSettings.configurePrompt1 "La conexión a Internet de esta computadora está censurada, filtrada o a través de un proxy."> -<!ENTITY torSettings.configurePrompt2 "Necesito configurar los ajustes del puente de red, cortafuegos o proxy."> +<!ENTITY torSettings.configurePrompt1 "La conexión a Internet de este equipo está censurada o proxyficada."> +<!ENTITY torSettings.configurePrompt2 "Tengo que ajustar las configuraciones de puente ('bridge') o proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Me gustaría conectar directamente a la red Tor."> <!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "Si no está seguro de cómo responder a esta pregunta, eche un vistazo a las configuraciones de Internet en otro navegador para ver si está configurado para usar un proxy."> <!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy."> -<!ENTITY torSettings.firewallQuestion "¿La conexión a Internet de esta computadora pasa a través de un cortafuegos que sólo permite conexiones a ciertos puertos?"> -<!ENTITY torSettings.firewallHelp "Si no está seguro de cómo responder a esta pregunta, elija No. Si encuentra problemas para conectarse a la red Tor, cambie esta configuración."> -<!ENTITY torSettings.enterFirewall "Introduzca una lista de puertos separados por comas que están permitidos por el cortafuegos."> <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> <!ENTITY torSettings.bridgeHelp "Si no está seguro como responder a esta pregunta, elija No.  Si usted elige Sí, se le pedirá configurar puentes Tor, los cuales son repetidores no listados que hacen más difícil el bloqueo de conexiones hacia la red Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puede usar el juego de repetidores puente ('bridge') proporcionado, o puede obtener e introducir un juego de puentes personalizado."> diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd index 4100657..0090d60 100644 --- a/uk/network-settings.dtd +++ b/uk/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Ні"> <!ENTITY torSettings.firstQuestion "Яке з наступних тверджень найкраще описує Вашу ситуацію?"> -<!ENTITY torSettings.configurePrompt1 "Мережеве підключення цього комп'ютера цензурується, фільтрується або йде через проксі-сервер."> -<!ENTITY torSettings.configurePrompt2 "Мені потрібно налаштувати міст, брандмауер або проксі-сервер."> +<!ENTITY torSettings.configurePrompt1 "Мережеве з'єднання цього комп'ютера цензурується або йде через проксі-сервер."> +<!ENTITY torSettings.configurePrompt2 "Мені потрібно налаштувати міст або проксі-сервер."> <!ENTITY torSettings.configure "Налаштування"> <!ENTITY torSettings.connectPrompt2 "Я бажаю підключатися до Tor напряму "> <!ENTITY torSettings.connectPrompt3 "Це має працювати у більшості ситуацій."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "Якщо Ви не знаєте, як відповісти на це питання, подивіться налаштування Інтернету в іншому браузері, щоб побачити чи він налаштований на використання проксі."> <!ENTITY torSettings.enterProxy "Задати параметри проксі"> -<!ENTITY torSettings.firewallQuestion "Чи даний комп'ютер підключений до Інтернету через брандмауер, який дозволяє підключення тільки до певних портів?"> -<!ENTITY torSettings.firewallHelp "Якщо Ви не знаєте, як відповісти на це питання, виберіть Ні. Якщо у Вас виникли проблеми з підключенням до мережі Tor, змініть дане налаштування."> -<!ENTITY torSettings.enterFirewall "Введіть список портів, відкритих у брандмауері, через кому."> <!ENTITY torSettings.bridgeQuestion "Ваш Інтернет-провайдер (ISP) блокує чи яким-небудь чином цензурує підключення до Tor мережі?"> <!ENTITY torSettings.bridgeHelp "Якщо Ви не знаєте, як відповісти на це питання, виберіть Ні.  Якщо Ви виберете Так, Вам буде запропоновано налаштувати мости Tor, що є приватними трансляторами, які роблять більш важким блокування з'єднань з Tor мережі."> <!ENTITY torSettings.bridgeSettingsPrompt "Ви можете використати визначений перелік мостів або можете отримати і ввести набір мостів вручну.">

1 0

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

27 Aug '14

commit 95e11fc60e1caac82caa42b7d5f8b2c87de699ab Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 27 15:15:39 2014 +0000 Update translations for tor-launcher-network-settings --- es/network-settings.dtd | 4 ++-- uk/network-settings.dtd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index ef81fc5..73b9f80 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes describe mejor su situación?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "La conexión a Internet de este equipo está censurada o proxyficada."> +<!ENTITY torSettings.configurePrompt2 "Tengo que ajustar las configuraciones de puente ('bridge') o proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Me gustaría conectar directamente a la red Tor."> <!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd index 3646f0a..0090d60 100644 --- a/uk/network-settings.dtd +++ b/uk/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Ні"> <!ENTITY torSettings.firstQuestion "Яке з наступних тверджень найкраще описує Вашу ситуацію?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Мережеве з'єднання цього комп'ютера цензурується або йде через проксі-сервер."> +<!ENTITY torSettings.configurePrompt2 "Мені потрібно налаштувати міст або проксі-сервер."> <!ENTITY torSettings.configure "Налаштування"> <!ENTITY torSettings.connectPrompt2 "Я бажаю підключатися до Tor напряму "> <!ENTITY torSettings.connectPrompt3 "Це має працювати у більшості ситуацій.">

1 0

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

27 Aug '14

commit 60f497ea90da9dd6b33f0939ec0133c1176f34e0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 27 15:15:32 2014 +0000 Update translations for tor-launcher-properties --- uk/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/torlauncher.properties b/uk/torlauncher.properties index 94d7d4d..8287a1f 100644 --- a/uk/torlauncher.properties +++ b/uk/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Готово torlauncher.forAssistance=Для допомоги зв'яжіться з %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Копіювання завершено. %S повідомлень журналу tor готові до вставки у текстовий редактор або повідомлення електронної пошти. torlauncher.bootstrapStatus.conn_dir=З'єднання з довідником маршрутизатора torlauncher.bootstrapStatus.handshake_dir=Встановлення зашифрованого з'єднання до каталогу

1 0