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

[tor-browser-bundle/master] Bump versions for NoScript and for Tor.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f5484a13da65bf9138f2566326e9624178a376ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:47:44 2014 -0800 Bump versions for NoScript and for Tor. --- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 6 +++--- gitian/versions.nightly | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gitian/versions b/gitian/versions index f0e8c42..7f367a0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,7 +4,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -37,7 +37,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -61,7 +61,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d6838dc..76182b7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.5.1-alpha +TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.beta b/gitian/versions.beta index 402b8a9..94ada7c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8a2924a..baefbae 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Properly check the Tor tag before applying backport patches.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 2edf15136f5bbc939b4420537b779ab80a8c955c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:28:41 2014 -0800 Properly check the Tor tag before applying backport patches. Also only aply #5018 for PT-enabled bundles. --- gitian/descriptors/linux/gitian-tor.yml | 7 +++++-- gitian/descriptors/mac/gitian-tor.yml | 7 +++++-- gitian/descriptors/windows/gitian-tor.yml | 8 +++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 8a50ed4..a83d8a4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -77,13 +77,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index d2aab2f..1596c8e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -93,13 +93,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 00b1f9a..9033939 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -89,14 +89,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch - fi + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit fe1baf12c6957252d12a3d019175622cbda86f7b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 19:45:40 2014 +0000 Update translations for tails-misc_completed --- ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.po b/ru.po index 194c993..d85cb5f 100644 --- a/ru.po +++ b/ru.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 19:13+0000\n" +"PO-Revision-Date: 2014-03-07 19:20+0000\n" "Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Mar '14

commit 383aba95bda6922cb05a7bc66ce39194e3e231c0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 19:45:37 2014 +0000 Update translations for tails-misc --- ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.po b/ru.po index 194c993..d85cb5f 100644 --- a/ru.po +++ b/ru.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 19:13+0000\n" +"PO-Revision-Date: 2014-03-07 19:20+0000\n" "Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 5fe0ba36874eb78cd885467d88e09173283f2bc8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 19:45:24 2014 +0000 Update translations for tails-greeter_completed --- ru/ru.po | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 7341531..a6e8bb6 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 09:11+0000\n" +"POT-Creation-Date: 2014-03-06 17:16+0100\n" +"PO-Revision-Date: 2014-03-07 19:30+0000\n" "Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -36,8 +36,8 @@ msgid "Use persistence?" msgstr "Использовать постоянную память?" #: ../glade/persistencewindow.glade.h:5 -msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Помощь</a>" +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Документация</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -70,8 +70,8 @@ msgstr "Пароль администратора" #: ../glade/optionswindow.glade.h:4 msgid "" "<a " -"href=\"doc/first_steps/startup_options/administration_password.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Помощь</a>" +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Документация</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -92,14 +92,14 @@ msgid "Passwords do not match" msgstr "Пароли не совпадают" #: ../glade/optionswindow.glade.h:10 -msgid "Windows Camouflage" +msgid "Windows camouflage" msgstr "Маскировка под Windows" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " -"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Помощь</a>" +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Документация</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -116,8 +116,10 @@ msgid "MAC address spoofing" msgstr "Спуфинг MAC-адреса" #: ../glade/optionswindow.glade.h:15 -msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Помощь</a>" +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Документация</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -135,6 +137,28 @@ msgstr "Как правило, использовать спуфинг MAC-ад msgid "Spoof all MAC addresses" msgstr "Спуфинг всех MAC-адресов" +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Настройка сети" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Документация</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "Сетевое подключение этого компьютера свободно от препятствий. Вы можете подключаться к сети Tor напрямую." + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "Сетевое подключение этого компьютера цензурируется, фильтруется или проксируется. Вам надо настроить мост, брандмаузер или прокси." + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " "

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 06bc40bcd259e600d56e94482ba79fc5813193b7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 19:45:21 2014 +0000 Update translations for tails-greeter --- ru/ru.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 4a0cc4d..a6e8bb6 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 19:30+0000\n" +"Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +37,7 @@ msgstr "Использовать постоянную память?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Документация</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -71,7 +71,7 @@ msgstr "Пароль администратора" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Документация</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -93,13 +93,13 @@ msgstr "Пароли не совпадают" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Маскировка под Windows" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Документация</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -119,7 +119,7 @@ msgstr "Спуфинг MAC-адреса" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Документация</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -139,25 +139,25 @@ msgstr "Спуфинг всех MAC-адресов" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Настройка сети" #: ../glade/optionswindow.glade.h:20 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Документация</a>" #: ../glade/optionswindow.glade.h:21 msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "" +msgstr "Сетевое подключение этого компьютера свободно от препятствий. Вы можете подключаться к сети Tor напрямую." #: ../glade/optionswindow.glade.h:22 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "" +msgstr "Сетевое подключение этого компьютера цензурируется, фильтруется или проксируется. Вам надо настроить мост, брандмаузер или прокси." #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit ed0266566a074fc4dddfd8cfdce1218c9e9e901a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 19:15:36 2014 +0000 Update translations for tails-misc_completed --- ru.po | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/ru.po b/ru.po index 82acf53..194c993 100644 --- a/ru.po +++ b/ru.po @@ -12,9 +12,9 @@ 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-03-06 14:52+0100\n" +"PO-Revision-Date: 2014-03-07 19:13+0000\n" +"Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -256,21 +256,21 @@ msgstr "Информация о сборке:\n%s" msgid "About Tails" msgstr "О программе" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" msgstr "Ваше дополнительное программное обеспечение" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "Обновление сорвалось. Возможно, причиной проблема сети. Пожалуйста, проверьте Ваше подключение к сети, попробуйте перезапустить Tails или смотрите системный журнал, чтобы понять проблему лучше." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." msgstr "Обновление прошло успешно." @@ -288,10 +288,45 @@ msgstr "Часы должны работать точно для Tor, особе msgid "Failed to synchronize the clock!" msgstr "Не удалось синхронизировать часы!" +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 +msgid "Network connection blocked?" +msgstr "Сетевое подключение заблокировано?" + +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 +msgid "" +"It looks like you are blocked from the network. This may be related to the " +"MAC spoofing feature. For more information, see the <a " +"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" +" spoofing documentation</a>." +msgstr "Похоже, вы заблокированы в сети. Возможно, это связано со спуфингом MAC-адресов. Для получения дополнительной информации см. <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">документацию по спуфингу MAC-адресов</a>." + #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" msgstr "Эта версия Tails имеет известные проблемы безопасности:" +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#, sh-format +msgid "Network card ${nic} disabled" +msgstr "Сетевая карта ${nic} отключена" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "MAC-спуфинг не удался для сетевой карты ${nic_name} (${nic}), поэтому она временно отключена. Возможно, вы предпочтёте перезагрузить Tails и отключить MAC-спуфинг. См. <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>документацию</a>." + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +msgid "All networking disabled" +msgstr "Сеть полностью отключена" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "MAC-спуфинг не удался для сетевой карты ${nic_name} (${nic}). Ошибку также не удалось исправить, поэтому сеть полностью отключена.\nВозможно, вы предпочтёте перезагрузить Tails и отключить MAC-спуфинг. См. <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>документацию</a>." + #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." msgstr "Запуск I2P..." @@ -418,10 +453,15 @@ msgstr "TrueCrypt скоро удалят из Tails по соображения msgid "Report an error" msgstr "Сообщить об ошибке" -#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 msgid "Tails documentation" msgstr "Документация Tails" +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 +msgid "Learn how to use Tails" +msgstr "Научитесь пользоваться Tails" + #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " msgstr "Анонимная оверлей сеть"

1 0

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

07 Mar '14

commit 77dcb86609ee59ba09f78492e91677e8ba3dc919 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 19:15:34 2014 +0000 Update translations for tails-misc --- ru.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ru.po b/ru.po index 464a5a5..194c993 100644 --- a/ru.po +++ b/ru.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 18:42+0000\n" +"PO-Revision-Date: 2014-03-07 19:13+0000\n" "Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -307,25 +307,25 @@ msgstr "Эта версия Tails имеет известные проблемы #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "Сетевая карта ${nic} отключена" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "MAC-спуфинг не удался для сетевой карты ${nic_name} (${nic}), поэтому она временно отключена. Возможно, вы предпочтёте перезагрузить Tails и отключить MAC-спуфинг. См. <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>документацию</a>." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" -msgstr "" +msgstr "Сеть полностью отключена" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "MAC-спуфинг не удался для сетевой карты ${nic_name} (${nic}). Ошибку также не удалось исправить, поэтому сеть полностью отключена.\nВозможно, вы предпочтёте перезагрузить Tails и отключить MAC-спуфинг. См. <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>документацию</a>." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." @@ -460,7 +460,7 @@ msgstr "Документация Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" -msgstr "" +msgstr "Научитесь пользоваться Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network "

1 0

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

07 Mar '14

commit 019205c9ae4ef92b35993e57fc5492a90a8f26e1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 18:45:35 2014 +0000 Update translations for tails-misc --- ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ru.po b/ru.po index 5c4e6a5..464a5a5 100644 --- a/ru.po +++ b/ru.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 18:42+0000\n" +"Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -290,7 +290,7 @@ msgstr "Не удалось синхронизировать часы!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "Сетевое подключение заблокировано?" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -298,7 +298,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Похоже, вы заблокированы в сети. Возможно, это связано со спуфингом MAC-адресов. Для получения дополнительной информации см. <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">документацию по спуфингу MAC-адресов</a>." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit a9da4f673ee81afe2f4490f36f8befcd2fd48414 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 18:15:47 2014 +0000 Update translations for tails-iuk --- de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de.po b/de.po index 3d400e4..4e26a44 100644 --- a/de.po +++ b/de.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-07 15:13+0000\n" +"PO-Revision-Date: 2014-03-07 18:00+0000\n" "Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "Sie sollten auf folgendes aktualisieren %{name}s %{version}s.\n\nFür weitere Informationen über diese neue Version, siehe %{details_url}s\n\nEs wird empfohlen, alle offenen Anwendungen während der Aktualisierung zu schließen. Das Herunterladen der Aktualisierung kann möglicherweise sehr lange dauern, von einigen Minuten bis zu einigen Stunden.\nDas Netzwerk wird deaktiviert, nach dem Herunterladen und Aktualisieren.\n\nGröße zum herunterladen: %{size}s\n\nWollen Sie jetzt aktualisieren?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available"

1 0