- tor-commits - lists.torproject.org

[vidalia/master] Bump Vidalia to 0.2.19
by chiiph＠torproject.org 28 May '12

28 May '12

commit ec3e72607779a22d359c2fdb2cec3381f2b9d8d6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 28 20:56:10 2012 -0300 Bump Vidalia to 0.2.19 --- CMakeLists.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdab126..c240c29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(VER_MAJOR "0") set(VER_MINOR "2") -set(VER_PATCH "18") +set(VER_PATCH "19") set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/master] Fold in changes for 0.2.19
by chiiph＠torproject.org 28 May '12

28 May '12

commit 03552028d2598fe9b7622445ee8a39bc2a718a0d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 28 20:56:47 2012 -0300 Fold in changes for 0.2.19 --- CHANGELOG | 7 +++++++ changes/disableRunAtStart | 3 --- changes/settings_automigration | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b2a45a1..eedd1f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +0.2.19 28-May-2012 + o Disable "Run Vidalia when my system starts" if the + BrowserExecutable config option is set. This will avoid issues with + TBB users starting Vidalia the wrong way. + o Automigrate TorExecutable, Torrc and DataDirectory config options + to the new relative path handling. + 0.2.18 14-May-2012 o Use consensus bandwidth for routers when microdescriptors is enabled. Fixes bug 3287. diff --git a/changes/disableRunAtStart b/changes/disableRunAtStart deleted file mode 100644 index f8890fc..0000000 --- a/changes/disableRunAtStart +++ /dev/null @@ -1,3 +0,0 @@ - o Disable "Run Vidalia when my system starts" if the - BrowserExecutable config option is set. This will avoid issues with - TBB users starting Vidalia the wrong way. \ No newline at end of file diff --git a/changes/settings_automigration b/changes/settings_automigration deleted file mode 100644 index b832047..0000000 --- a/changes/settings_automigration +++ /dev/null @@ -1,2 +0,0 @@ - o Automigrate TorExecutable, Torrc and DataDirectory config options - to the new relative path handling. \ No newline at end of file

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 28 May '12

28 May '12

commit 748f29d26b531cf43a967a55c6191839afebad14 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 29 00:15:07 2012 +0000 Update translations for tsum --- ru/short-user-manual_ru_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/short-user-manual_ru_noimg.xhtml b/ru/short-user-manual_ru_noimg.xhtml index 0de66ce..0523ee3 100644 --- a/ru/short-user-manual_ru_noimg.xhtml +++ b/ru/short-user-manual_ru_noimg.xhtml @@ -8,8 +8,8 @@ <p>Это пользовательское руководство содержит информацию о том, как загрузить Tor, как им пользоваться, и что предпринимать в случаях, когда Tor не может соединиться с сетью. Если у Вас не получилось найти в этом документе ответ на свой вопрос, не стесняйтесь написать нам по адресу help(a)rt.torproject.org.</p> <p>Пожалуйста, помните, что мы осуществляем техподдержку на добровольных началах, причём каждый Божий день нам приходит куча писем с вопросами. Поэтому не волнуйтесь, если мы медлим с ответом на Ваше письмо.</p> <h2 id="how-tor-works">Как работает Tor</h2> - <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p> - <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p> + <p>Tor - это сеть виртуальных туннелей, которая позволяет Вам лучше защищать неприкосновенность Вашей частной жизни и свою безопасность в Интернете. Работает это вот как: Tor соединяет Ваш компьютер с Интернетом не напрямую, а через цепочку из трёх выбранных наугад компьютеров (т.н. <em>ретрансляторы</em>) которые принадлежат к сети Tor.</p> + <p>На рисунке выше изображено, что происходит, когда пользователь посещает различные веб-сайты через Tor. Зелёные мониторы - это ретрансляторы сети Tor, а три ключика - это последовательные слои шифрования между пользователем и каждым следующим ретранслятором.</p> <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p> <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p> <h2 id="how-to-download-tor">How to download Tor</h2>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 28 May '12

28 May '12

commit 45800979f9744e3a9b9ab4228d232315df364857 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 28 23:45:06 2012 +0000 Update translations for tsum --- ru/short-user-manual_ru_noimg.xhtml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/short-user-manual_ru_noimg.xhtml b/ru/short-user-manual_ru_noimg.xhtml index c4ba189..0de66ce 100644 --- a/ru/short-user-manual_ru_noimg.xhtml +++ b/ru/short-user-manual_ru_noimg.xhtml @@ -4,10 +4,10 @@ <title/> </head> <body> - <h1 id="the-short-user-manual">The Short User Manual</h1> - <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p> - <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p> - <h2 id="how-tor-works">How Tor works</h2> + <h1 id="the-short-user-manual">Краткое Руководство Пользователя</h1> + <p>Это пользовательское руководство содержит информацию о том, как загрузить Tor, как им пользоваться, и что предпринимать в случаях, когда Tor не может соединиться с сетью. Если у Вас не получилось найти в этом документе ответ на свой вопрос, не стесняйтесь написать нам по адресу help(a)rt.torproject.org.</p> + <p>Пожалуйста, помните, что мы осуществляем техподдержку на добровольных началах, причём каждый Божий день нам приходит куча писем с вопросами. Поэтому не волнуйтесь, если мы медлим с ответом на Ваше письмо.</p> + <h2 id="how-tor-works">Как работает Tor</h2> <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p> <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p> <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 28 May '12

28 May '12

commit c0d7a0c2188e8dddbfe4a24cbc975c531cec1ec9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 28 19:45:24 2012 +0000 Update translations for torcheck_completed --- pa/torcheck.po | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/pa/torcheck.po b/pa/torcheck.po new file mode 100644 index 0000000..85c4bfc --- /dev/null +++ b/pa/torcheck.po @@ -0,0 +1,57 @@ +# TorCheck gettext template +# Copyright (C) 2008-2012 The Tor Project, Inc +# +# Translators: +# <sukhbir.in(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2012-05-28 19:38+0000\n" +"Last-Translator: sukhbir <sukhbir.in(a)gmail.com>\n" +"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: pa\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +msgid "Congratulations. Your browser is configured to use Tor." +msgstr "ਮੁਬਾਰਕਾਂ. ਤੁਹਾਡਾ ਬ੍ਰਾਉਜ਼ਰ ਟੌਰ ਦੀ ਵਰਤੋਂ ਵਾਸਤੇ ਤਿਆਰ ਹੈ." + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "ਕਿਰਪਾ ਕਰ ਕੇ <a href=\"https://www.torproject.org/\">ਟੌਰ ਵੈੱਬਸਾਈਟ </a>ਤੇ ਜਾ ਕੇ ਟੌਰ ਦੀ ਸਹੀ ਵਰਤੋ ਬਾਰੇ ਸਮਝੋ. ਤੁਸੀਂ ਹੁਣ ਗੁਪਤ ਹੋ ਕੇ ਇੰਟਰਨੈੱਟ ਬ੍ਰਾਉਜ਼ ਕਰ ਸਕਦੇ ਹੋ." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "ਟੌਰ ਬ੍ਰਾਉਜ਼ਰ ਬੰਡਲ ਵਾਸਤੇ ਸਿਕ੍ਯੁਰਿਟੀ ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੇ." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">ਦੋਵ੍ਨ੍ਲੋਅਦ ਪੈਜ ਤੇ ਜਾਣ ਵਾਸਤੇ ਏਥੈ ਕਲਿਕ ਕਰੋ</a>" + +msgid "Sorry. You are not using Tor." +msgstr "ਮੁਆਫ ਕਰਨਾ, ਤੁਸੀਂ ਟੌਰ ਦਾ ਇਸਤੇਮਾਲ ਨਹੀਂ ਕਰ ਰਹੇ ਹੋ." + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "ਜੇ ਤੁਸੀਂ ਟੌਰ ਕਲਾਇੰਟ ਦੀ ਵਰਤੋ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਹੇ ਹੋ ਤਾਂ ਕਿਰਪਾ ਕਰ ਕੇ <a href=\"https://www.torproject.org/\">ਟੌਰ ਵੈੱਬਸਾਈਟ</a>ਅਤੇ ਖਾਸ ਕਰ ਕੇ ਟੌਰ ਕਲਾਇੰਟ ਦੀ <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">ਹਿਦਾਇਤਾਂ</a>ਜ਼ਰੁਰ ਪੜ੍ਹ ਲੋ." + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "ਮੁਆਫ ਕਰਨਾ, ਤੁਹਾਡੀ ਕ਼ੁਏਰੀ ਪੂਰੀ ਨਹੀਂ ਹੋ ਸਕੀ ਜਾਂ ਉੱਤਰ ਠੀਕ ਨਹੀਂ ਆਈਆ." + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "ਅਸੀਂ ਕਿਸੇ ਅਸਥਾਈ ਵਿਘਨ ਕਰ ਕੇ ਨਹੀਂ ਪਤਾ ਕਰ ਸਕਦੇ ਕੇ ਤੁਹਾਡਾ ਮੁੱਢ IP <a href=\"https://www.torproject.org/\">ਟੌਰ ਨੋਡ</a> ਹੈ ਕੇ ਨਹੀਂ." + +msgid "Your IP address appears to be: " +msgstr "ਤੁਹਾਡਾ IP ਅੱਡ੍ਰੇੱਸ ਹੈ:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 28 May '12

28 May '12

commit a8bfd7464fb16af8fe447f374e9d4cdd18247d7e Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 28 19:45:22 2012 +0000 Update translations for torcheck --- pa/torcheck.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pa/torcheck.po b/pa/torcheck.po index fae6cd0..85c4bfc 100644 --- a/pa/torcheck.po +++ b/pa/torcheck.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-05-28 18:59+0000\n" +"PO-Revision-Date: 2012-05-28 19:38+0000\n" "Last-Translator: sukhbir <sukhbir.in(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." +msgstr "ਕਿਰਪਾ ਕਰ ਕੇ <a href=\"https://www.torproject.org/\">ਟੌਰ ਵੈੱਬਸਾਈਟ </a>ਤੇ ਜਾ ਕੇ ਟੌਰ ਦੀ ਸਹੀ ਵਰਤੋ ਬਾਰੇ ਸਮਝੋ. ਤੁਸੀਂ ਹੁਣ ਗੁਪਤ ਹੋ ਕੇ ਇੰਟਰਨੈੱਟ ਬ੍ਰਾਉਜ਼ ਕਰ ਸਕਦੇ ਹੋ." msgid "There is a security update available for the Tor Browser Bundle." msgstr "ਟੌਰ ਬ੍ਰਾਉਜ਼ਰ ਬੰਡਲ ਵਾਸਤੇ ਸਿਕ੍ਯੁਰਿਟੀ ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੇ." @@ -43,7 +43,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "ਜੇ ਤੁਸੀਂ ਟੌਰ ਕਲਾਇੰਟ ਦੀ ਵਰਤੋ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਹੇ ਹੋ ਤਾਂ ਕਿਰਪਾ ਕਰ ਕੇ <a href=\"https://www.torproject.org/\">ਟੌਰ ਵੈੱਬਸਾਈਟ</a>ਅਤੇ ਖਾਸ ਕਰ ਕੇ ਟੌਰ ਕਲਾਇੰਟ ਦੀ <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">ਹਿਦਾਇਤਾਂ</a>ਜ਼ਰੁਰ ਪੜ੍ਹ ਲੋ." msgid "Sorry, your query failed or an unexpected response was received." msgstr "ਮੁਆਫ ਕਰਨਾ, ਤੁਹਾਡੀ ਕ਼ੁਏਰੀ ਪੂਰੀ ਨਹੀਂ ਹੋ ਸਕੀ ਜਾਂ ਉੱਤਰ ਠੀਕ ਨਹੀਂ ਆਈਆ." @@ -51,7 +51,7 @@ msgstr "ਮੁਆਫ ਕਰਨਾ, ਤੁਹਾਡੀ ਕ਼ੁਏਰੀ ਪੂ msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "ਅਸੀਂ ਕਿਸੇ ਅਸਥਾਈ ਵਿਘਨ ਕਰ ਕੇ ਨਹੀਂ ਪਤਾ ਕਰ ਸਕਦੇ ਕੇ ਤੁਹਾਡਾ ਮੁੱਢ IP <a href=\"https://www.torproject.org/\">ਟੌਰ ਨੋਡ</a> ਹੈ ਕੇ ਨਹੀਂ." msgid "Your IP address appears to be: " msgstr "ਤੁਹਾਡਾ IP ਅੱਡ੍ਰੇੱਸ ਹੈ:"

1 0

[arm/master] Accounting for Fedora's UsrMove feature
by atagar＠torproject.org 28 May '12

28 May '12

commit 2ac1ec5a6364389beeac8075eb6a6302606302f9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 28 12:42:25 2012 -0700 Accounting for Fedora's UsrMove feature Patch by miceliux to account for Fedora's UsrMove feature... https://trac.torproject.org/5973 --- arm | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arm b/arm index a6dba93..0a23aaa 100755 --- a/arm +++ b/arm @@ -1,5 +1,9 @@ #!/bin/sh -if [ "$0" = /usr/bin/arm ]; then + +# Also looking in /bin/arm because of the UsrMove feature on Fedora... +# https://trac.torproject.org/5973 + +if [ "$0" = /usr/bin/arm ] || [ "$0" = /bin/arm ]; then arm_base=/usr/share/arm/ else arm_base=$( dirname "$0" )/src/

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 28 May '12

28 May '12

commit 94a4209b6b4645ba76539bf19b42517c62ca3542 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 28 19:15:26 2012 +0000 Update translations for torcheck --- pa/torcheck.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pa/torcheck.po b/pa/torcheck.po index 703d0df..fae6cd0 100644 --- a/pa/torcheck.po +++ b/pa/torcheck.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-05-28 18:39+0000\n" +"PO-Revision-Date: 2012-05-28 18:59+0000\n" "Last-Translator: sukhbir <sukhbir.in(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" @@ -19,16 +19,16 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "ਮੁਬਾਰਕਾਂ. ਤੁਹਾਡਾ ਬ੍ਰਾਉਜ਼ਰ ਤੌਰ ਦੀ ਵਰਤੋਂ ਵਾਸਤੇ ਤਿਆਰ ਹੈ." +msgstr "ਮੁਬਾਰਕਾਂ. ਤੁਹਾਡਾ ਬ੍ਰਾਉਜ਼ਰ ਟੌਰ ਦੀ ਵਰਤੋਂ ਵਾਸਤੇ ਤਿਆਰ ਹੈ." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "ਟੌਰ ਬ੍ਰਾਉਜ਼ਰ ਬੰਡਲ ਵਾਸਤੇ ਸਿਕ੍ਯੁਰਿਟੀ ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੇ." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -36,7 +36,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">ਦੋਵ੍ਨ੍ਲੋਅਦ ਪੈਜ ਤੇ ਜਾਣ ਵਾਸਤੇ ਏਥੈ ਕਲਿਕ ਕਰੋ</a>" msgid "Sorry. You are not using Tor." -msgstr "ਮੁਆਫ ਕਰਨਾ, ਤੁਸੀਂ ਤੌਰ ਦਾ ਇਸਤੇਮਾਲ ਨਹੀਂ ਕਰ ਰਹੇ ਹੋ." +msgstr "ਮੁਆਫ ਕਰਨਾ, ਤੁਸੀਂ ਟੌਰ ਦਾ ਇਸਤੇਮਾਲ ਨਹੀਂ ਕਰ ਰਹੇ ਹੋ." msgid "" "If you are attempting to use a Tor client, please refer to the <a "

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 May '12

28 May '12

commit 944292b16aeed83a5cd3528f1b55e93dd4f765d1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 28 19:15:09 2012 +0000 Update translations for vidalia --- pa/vidalia_pa.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pa/vidalia_pa.po b/pa/vidalia_pa.po index 5fc6d33..a18e025 100755 --- a/pa/vidalia_pa.po +++ b/pa/vidalia_pa.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-05-27 17:41+0000\n" +"PO-Revision-Date: 2012-05-28 18:56+0000\n" "Last-Translator: sukhbir <sukhbir.in(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr "ਵਿਦਾਲਿਆ 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "ਤੌਰ 0.2.0.32" +msgstr "ਟੌਰ 0.2.0.32" msgctxt "AboutDialog" msgid "Qt 4.4.2" @@ -47,7 +47,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "ਤੌਰ ਕਨ੍ਫਿਗ੍ਯਰੇਸ਼ਨ ਫਾਇਲ ਦੀ ਚੁਣਨਾ ਕਰੋ" +msgstr "ਟੌਰ ਕਨ੍ਫਿਗ੍ਯਰੇਸ਼ਨ ਫਾਇਲ ਦੀ ਚੁਣਨਾ ਕਰੋ" msgctxt "AdvancedPage" msgid "File Not Found" @@ -111,7 +111,7 @@ msgstr ":" msgctxt "AdvancedPage" msgid "Tor Configuration File" -msgstr "ਤੌਰ ਕਨ੍ਫਿਗ੍ਯਰੇਸ਼ਨ ਫਾਇਲ" +msgstr "ਟੌਰ ਕਨ੍ਫਿਗ੍ਯਰੇਸ਼ਨ ਫਾਇਲ" msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" @@ -1361,7 +1361,7 @@ msgstr "" msgctxt "GeneralPage" msgid "Tor" -msgstr "ਤੌਰ" +msgstr "ਟੌਰ" msgctxt "GeneralPage" msgid "Proxy Application (optional)"

1 0

[torbrowser/maint-2.2] Win: Update the Firefox package sequence to a sane variant.
by erinn＠torproject.org 28 May '12

28 May '12

commit 4e405e991f9fc2994a302c97add7ad2424230e42 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue May 22 17:23:20 2012 +0200 Win: Update the Firefox package sequence to a sane variant. --- build-scripts/windows.mk | 5 +---- src/current-patches/mozilla-build/start-msvc.patch | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e9d2b28..e2537c2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -111,10 +111,7 @@ copy-firefox: -mkdir -p $(FIREFOX) cp -r config/firefox-portable/* $(FIREFOX) cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp $(FIREFOX_DIR)/obj-*/dist/*zip $(FIREFOX)/App/Firefox/ - cd $(FIREFOX)/App/Firefox && unzip $(FIREFOX)/App/Firefox/firefox-*\.zip - rm $(FIREFOX)/App/Firefox/firefox-*\.zip - mv $(FIREFOX)/App/Firefox/firefox/* $(FIREFOX)/App/Firefox/ && rmdir $(FIREFOX)/App/Firefox/firefox + cp -r $(FIREFOX_DIR)/obj-*/dist/firefox/* $(FIREFOX)/App/Firefox build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox echo "If we're here, we've done something right." diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 94b31fa..4101d89 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -1,3 +1,14 @@ +This patch changes the start-msvcX batch file to suit our needs. +First, it adds a 64-bit-aware-when-running-in-a-32-bit-process guess-msvc.bat. +Second, it adds the option to run 'make' immediately by providing arguments. +The default make arguments contain the following: +Targets build, package: these are needed to build an actual package we can use. +This includes generating manifest and packaging omni.ja, among others. +INNER_MAKE_PACKAGE=true, when the package target is run it will normally create +a zip file that contains the completed package. +Since we grab the staging folder we don't need the zip file. +So instead of running the actual packaging command we 'run' true instead. +(See .\toolkit\mozapps\installer\packager.mk in the FF source for more details) --- start-msvcx.bat.org 2010-08-17 23:01:48 +0200 +++ start-msvcx.bat 2011-11-04 15:28:02 +0100 @@ -7,7 +7,7 @@ @@ -17,5 +28,5 @@ +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true" +)

1 0