June 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Use -print0 in find commands.
by dcf＠torproject.org 01 Jun '13

01 Jun '13

commit ff529589a2db296d21df00df7360609da703d18d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 1 11:48:35 2013 -0700 Use -print0 in find commands. Suggested by weasel in #8416 comment 5. --- doc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index e806fe8..29a0fef 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -129,7 +129,7 @@ $(PT_BUNDLE_MACOSX_I686): cp -r "$(PYPTLIB_WORK)"/build/pyptlib "$(TBBDIR)"/Contents/MacOS mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy - find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' | xargs rm -f + find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' -print0 | xargs -0 rm -f cat bundle-torrc-macosx >> "$(TBBDIR)"/Library/Vidalia/torrc @@ -166,7 +166,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): cp -rL "$(PYPTLIB_WORK)"/build/pyptlib "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/Obfsproxy cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy - find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f + find "$(TBBDIR)"/App -name '*.pyc' -print0 | xargs -0 rm -f cat bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc

1 0

[flashproxy/master] Get rid of duplicate FLASHPROXY_VERSION by overriding DISTNAME.
by dcf＠torproject.org 01 Jun '13

01 Jun '13

commit 378243611af49f3bdb487d3fe6e71dc74ba356e2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 1 11:43:48 2013 -0700 Get rid of duplicate FLASHPROXY_VERSION by overriding DISTNAME. --- doc/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 4151bbb..e806fe8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,11 +2,10 @@ BUNDLE_VERSION = 2.4.12 BUNDLE_RELEASE = alpha-2 PT_BUNDLE_RELEASE = pt1 -FLASHPROXY_VERSION = 1.0 FLASHPROXY_HOME = $(HOME)/flashproxy FLASHPROXY_WORK = $(WORKDIR)/flashproxy -FLASHPROXY_DIST = $(FLASHPROXY_WORK)/dist/flashproxy-client-$(FLASHPROXY_VERSION) -FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_VERSION)-win32 +FLASHPROXY_DISTNAME = flashproxy-client +FLASHPROXY_DIST = $(FLASHPROXY_WORK)/dist/$(FLASHPROXY_DISTNAME) OBFSPROXY_HOME = $(HOME)/obfsproxy OBFSPROXY_WORK = $(WORKDIR)/obfsproxy OBFSPROXY_DIST_WIN32 = $(OBFSPROXY_WORK)/py2exe_bundle/dist @@ -86,11 +85,11 @@ $(PT_BUNDLE_WINDOWS): git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)" cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup_py2exe.py clean --all py2exe git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)" - cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist-exe + cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist-exe DISTNAME="$(FLASHPROXY_DISTNAME)" - cp -nr "$(FLASHPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App + cp -nr "$(FLASHPROXY_DIST)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/FlashProxy - cp "$(FLASHPROXY_DIST_WIN32)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy + cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy cp -nr "$(OBFSPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/Obfsproxy cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy @@ -117,7 +116,7 @@ $(PT_BUNDLE_MACOSX_I686): git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)" cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)" - cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist + cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist DISTNAME="$(FLASHPROXY_DISTNAME)" cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS @@ -154,7 +153,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)" cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)" - cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist + cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist DISTNAME="$(FLASHPROXY_DISTNAME)" cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App cp -rL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App

1 0

[flashproxy/master] Typo found by Arlo.
by dcf＠torproject.org 01 Jun '13

01 Jun '13

commit b30a717cc50b76235c23793ee7309bead783c73e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 1 15:25:23 2013 -0700 Typo found by Arlo. --- proxy/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/README b/proxy/README index b9d9003..8cb31b4 100644 --- a/proxy/README +++ b/proxy/README @@ -1,4 +1,4 @@ This directory contains the flash proxy JavaScript proxy program and -associated HTML and media files. End users don't ahve to do anything +associated HTML and media files. End users don't have to do anything with these files. They are meant to be installed on a centralized web server and then accessed through a browser.

1 0

[flashproxy/master] Remove unused DOWNLOADDIR.
by dcf＠torproject.org 01 Jun '13

01 Jun '13

commit 4dc06a7a10d6d4d3c2539438327ed7fe9e41f471 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 1 11:31:40 2013 -0700 Remove unused DOWNLOADDIR. --- doc/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index d40b05b..5caae73 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -14,7 +14,6 @@ MACOSX_BUNDLE_ROOT = $(HOME)/bundle P7Z = /cygdrive/c/Program Files (x86)/7-Zip/7z P7ZG = /cygdrive/c/Program Files (x86)/7-Zip/7zg -DOWNLOADDIR = download WORKDIR = work BUNDLE_DIST_URL = https://www.torproject.org/dist/torbrowser

1 0

[flashproxy/master] Add "make clean".
by dcf＠torproject.org 01 Jun '13

01 Jun '13

commit 427d7533c49c8235198fdc1fa445cb7763e69001 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 1 10:47:08 2013 -0700 Add "make clean". --- doc/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 9183539..d40b05b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -167,6 +167,13 @@ $(BUNDLE_GNULINUX_X86_64) $(BUNDLE_GNULINUX_X86_64).asc: checksig-%: % %.asc gpg --verify "$*".asc "$*" +clean: + rm -rf "$(WORKDIR)" + rm -rf "$(PT_BUNDLE_WINDOWS)" + rm -rf "$(PT_BUNDLE_MACOSX_I686)" + rm -rf "$(PT_BUNDLE_GNULINUX_I686)" + rm -rf "$(PT_BUNDLE_GNULINUX_X86_64)" + # Need Bash for certain wildcards. SHELL = /bin/bash -.PHONY: checksig-% windows macosx-i686 gnulinux-i686 gnulinux-x86_64 +.PHONY: clean checksig-% windows macosx-i686 gnulinux-i686 gnulinux-x86_64

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 01 Jun '13

01 Jun '13

commit df487cc65c33e4306d804cd91175216045fa5baa Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 1 17:45:24 2013 +0000 Update translations for vidalia_alpha --- si_LK/vidalia_si_LK.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index 1ca46cd..2052c60 100644 --- a/si_LK/vidalia_si_LK.po +++ b/si_LK/vidalia_si_LK.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:46+0000\n" -"PO-Revision-Date: 2013-06-01 17:11+0000\n" +"PO-Revision-Date: 2013-06-01 17:30+0000\n" "Last-Translator: Randika.Pathirage <randika.pathirage(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 01 Jun '13

01 Jun '13

commit 64b5d03aed6e4c74de5c1566c13af2eb13c393c4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 1 17:45:18 2013 +0000 Update translations for vidalia --- si_LK/vidalia_si_LK.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index 99cb252..1ccc51c 100644 --- a/si_LK/vidalia_si_LK.po +++ b/si_LK/vidalia_si_LK.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: 2013-06-01 17:10+0000\n" +"PO-Revision-Date: 2013-06-01 17:30+0000\n" "Last-Translator: ganeshwaki <ganeshwaki(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -3381,7 +3381,7 @@ msgid "" "Tor is trying to determine if your relay's server port is reachable from the" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." -msgstr "" +msgstr "Tor උත්සහ කරන්නේ ඔබගේ ප්‍රතියෝජකයේ සේවාදායක පෝර්ටය Tor ජාලයේ සිට ලගාවිය හැකි ලෙස එයට %1:%2කිං සබැදිය හැකි බව නිර්ණය කිරීමයි. මෙම පරීක්ෂණයට මිනිත්තු කිහිපයක් ගනු ඇත. " msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 01 Jun '13

01 Jun '13

commit e3f967eb2ef34d7155561adb7121abdf4b063a77 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 1 17:15:24 2013 +0000 Update translations for vidalia_alpha --- si_LK/vidalia_si_LK.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index bc4a372..1ca46cd 100644 --- a/si_LK/vidalia_si_LK.po +++ b/si_LK/vidalia_si_LK.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:46+0000\n" -"PO-Revision-Date: 2013-06-01 16:44+0000\n" +"PO-Revision-Date: 2013-06-01 17:11+0000\n" "Last-Translator: Randika.Pathirage <randika.pathirage(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -2363,7 +2363,7 @@ msgctxt "MessageLog" msgid "" "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." -msgstr "" +msgstr "Messages that appear when something has \ngone very wrong and Tor cannot proceed." msgctxt "MessageLog" msgid "" @@ -3414,14 +3414,14 @@ msgid "" "Tor detected that your DNS provider is providing false responses for domains" " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are " "known to do this in order to display their own search or advertising pages." -msgstr "" +msgstr "Tor අනාවරණය කරන ලද්දේ ඔබගේ DNS සේවාසපයන්නා සපයන්නේ නොපවතින වසම් වලට වැරදි ප්‍රතිචාර බවය. සමහර ISP සහ වෙනත් DNS සේවාසපයන්නන්, OpenDNS වැන්නන්, ඔවුන්ගේ සෙවුම් හෝ ප්‍රචාරක පිටු දර්ශනය කිරීමට යොදන බව පිළිගත් දෙයකි." msgctxt "StatusEventWidget" msgid "" "Tor detected that your DNS provider is providing false responses for well " "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." -msgstr "" +msgstr "Tor අනාවරණය කරන ලද්දේ ඔබගේ DNS සේවාසපයන්නා සපයන්නේ හොදින් දන්නා වසම් වලට වැරදි ප්‍රතිචාර බවය. සේවාලාභීන් Tor ජාල ප්‍රතියෝජක නිවැරදි DNS ප්‍රතිචාර ලබාදීම සම්බන්දව රදාපවතින නිසා, ඔබගේ ප්‍රතියෝජකය පිටවුම් ප්‍රතියෝජකයක් ලෙස වින්‍යාස නොවනු ඇත." msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" @@ -3432,7 +3432,7 @@ msgid "" "Tor is trying to determine if your relay's server port is reachable from the" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." -msgstr "" +msgstr "Tor උත්සහ කරන්නේ ඔබගේ ප්‍රතියෝජකයේ සේවාදායක පෝර්ටය Tor ජාලයේ සිට ලගාවිය හැකි ලෙස එයට %1:%2කිං සබැදිය හැකි බව නිර්ණය කිරීමයි. මෙම පරීක්ෂණයට මිනිත්තු කිහිපයක් ගනු ඇත. " msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 01 Jun '13

01 Jun '13

commit 9dfeacc7009a048141bf6540c42ab47f4fcbd93c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 1 17:15:18 2013 +0000 Update translations for vidalia --- si_LK/vidalia_si_LK.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index a4faa8a..99cb252 100644 --- a/si_LK/vidalia_si_LK.po +++ b/si_LK/vidalia_si_LK.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: 2013-06-01 16:40+0000\n" +"PO-Revision-Date: 2013-06-01 17:10+0000\n" "Last-Translator: ganeshwaki <ganeshwaki(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -2412,7 +2412,7 @@ msgctxt "MessageLog" msgid "" "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." -msgstr "" +msgstr "Messages that appear when something has \ngone very wrong and Tor cannot proceed." msgctxt "MessageLog" msgid "" @@ -3005,7 +3005,7 @@ msgstr "සලකුණු කොටු මගින් නිශ්චය න msgctxt "ServerPage" msgid "Misc Other Services" -msgstr "" +msgstr "වෙනත් සේවා" msgctxt "ServerPage" msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888" @@ -3356,21 +3356,21 @@ msgstr "Tor තීරණය කරන ලද්දේ ඔබගේ ප්‍ර msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "DNS හයිජැකින් අනාවරණය විය" msgctxt "StatusEventWidget" msgid "" "Tor detected that your DNS provider is providing false responses for domains" " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are " "known to do this in order to display their own search or advertising pages." -msgstr "" +msgstr "Tor අනාවරණය කරන ලද්දේ ඔබගේ DNS සේවාසපයන්නා සපයන්නේ නොපවතින වසම් වලට වැරදි ප්‍රතිචාර බවය. සමහර ISP සහ වෙනත් DNS සේවාසපයන්නන්, OpenDNS වැන්නන්, ඔවුන්ගේ සෙවුම් හෝ ප්‍රචාරක පිටු දර්ශනය කිරීමට යොදන බව පිළිගත් දෙයකි." msgctxt "StatusEventWidget" msgid "" "Tor detected that your DNS provider is providing false responses for well " "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." -msgstr "" +msgstr "Tor අනාවරණය කරන ලද්දේ ඔබගේ DNS සේවාසපයන්නා සපයන්නේ හොදින් දන්නා වසම් වලට වැරදි ප්‍රතිචාර බවය. සේවාලාභීන් Tor ජාල ප්‍රතියෝජක නිවැරදි DNS ප්‍රතිචාර ලබාදීම සම්බන්දව රදාපවතින නිසා, ඔබගේ ප්‍රතියෝජකය පිටවුම් ප්‍රතියෝජකයක් ලෙස වින්‍යාස නොවනු ඇත." msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability"

1 0

[flashproxy/master] Typo.
by dcf＠torproject.org 01 Jun '13

01 Jun '13

commit daf1c874686a043263d332a5982651207bd20048 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 1 10:06:21 2013 -0700 Typo. --- doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 9a6cee9..9183539 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -128,7 +128,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): TBBDIR = $(WORKDIR)/tor $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): @if [ ! -f "$(BUNDLE_GNULINUX)" ]; then \ echo "$(BUNDLE_GNULINUX) is missing."; \ - echo "Run \"make fetch-gnulinux-i686\" or \"make fetch gnulinux-i86_64\"."; \ + echo "Run \"make fetch-gnulinux-i686\" or \"make fetch gnulinux-x86_64\"."; \ false; \ fi rm -rf "$(WORKDIR)"

1 0