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

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit fe5b3d567efcf8e1bae344d79c1245adc2353e6a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 20 12:15:43 2014 +0000 Update translations for tor-launcher-progress --- ko/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/progress.dtd b/ko/progress.dtd index 0d219c7..bb931d0 100644 --- a/ko/progress.dtd +++ b/ko/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 상태"> <!ENTITY torprogress.openSettings "시작 설정"> <!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait "Tor 네트워크 연결 설정 후 Tor 브라우저가 열립니다."> +<!ENTITY torprogress.pleaseWait "Tor네트워크로 확실히 연결할 때까지 기다리세요.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit 6e13193d40ef157ee0df7ecf7fde0e88ba82692e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 20 11:45:34 2014 +0000 Update translations for tor-launcher-progress --- ko/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/progress.dtd b/ko/progress.dtd index dabaa61..0d219c7 100644 --- a/ko/progress.dtd +++ b/ko/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 상태"> <!ENTITY torprogress.openSettings "시작 설정"> <!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Tor 네트워크 연결 설정 후 Tor 브라우저가 열립니다.">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit 6871ef3f39ca1bc2511bc622a788fe4b7091aa95 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 20 03:45:42 2014 +0000 Update translations for abouttor-homepage_completed --- zh_CN/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd index 7a0a3d0..c952483 100644 --- a/zh_CN/aboutTor.dtd +++ b/zh_CN/aboutTor.dtd @@ -41,7 +41,7 @@ <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label " "> <!ENTITY aboutTor.searchSP.search.beforeLink.label "引擎"> <!ENTITY aboutTor.searchDDG.search.beforeLink.label "引擎"> <!ENTITY aboutTor.searchSP.search.label "Startpage">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit 4be2a5708ab90860cbcbd0993241b6388db4f4a7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 20 03:45:38 2014 +0000 Update translations for abouttor-homepage --- zh_CN/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd index 7a0a3d0..c952483 100644 --- a/zh_CN/aboutTor.dtd +++ b/zh_CN/aboutTor.dtd @@ -41,7 +41,7 @@ <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label " "> <!ENTITY aboutTor.searchSP.search.beforeLink.label "引擎"> <!ENTITY aboutTor.searchDDG.search.beforeLink.label "引擎"> <!ENTITY aboutTor.searchSP.search.label "Startpage">

1 0

r26661: {website} use <page> tag, and point to contact page (website/trunk/projects/en)
by Roger Dingledine 20 Mar '14

20 Mar '14

Author: arma Date: 2014-03-20 03:10:23 +0000 (Thu, 20 Mar 2014) New Revision: 26661 Modified: website/trunk/projects/en/torbrowser.wml Log: use <page> tag, and point to contact page Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-03-20 02:18:00 UTC (rev 26660) +++ website/trunk/projects/en/torbrowser.wml 2014-03-20 03:10:23 UTC (rev 26661) @@ -572,9 +572,10 @@ <div class="feedback box"> <div class="pjtext"> <h3>Help and support</h3> - <p>If you need help please check if the <a href="../docs/faq.html.en">FAQ</a> answers your question - and if not you can email the help desk at <strong>help(a)rt.torproject.org</strong></p> - <br><br> + <p>If you need help please check if the <a href="<page + docs/faq>">FAQ</a> answers your question and if not you can + email the <a href="<page about/contact>">help desk</a>.</p> + <br><br> <h3>Comments and suggestions</h3> <p>The Tor Browser Bundle is under development and not yet complete. To discuss improvements and submit comments, please use the <a

1 0

r26660: {website} new tbb3.5 images and text for torbrowser.wml and new 'Help (in website/trunk: images projects/en)
by tor-svn＠svn.torproject.org 20 Mar '14

20 Mar '14

Author: Sherief Date: 2014-03-20 02:18:00 +0000 (Thu, 20 Mar 2014) New Revision: 26660 Added: website/trunk/images/tbb-screenshot1.jpg website/trunk/images/tbb-screenshot2.jpg website/trunk/images/tbb-screenshot3.jpg Modified: website/trunk/projects/en/torbrowser.wml Log: new tbb3.5 images and text for torbrowser.wml and new 'Help and Support' section in the bottom div Added: website/trunk/images/tbb-screenshot1.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-screenshot1.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: website/trunk/images/tbb-screenshot2.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-screenshot2.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: website/trunk/images/tbb-screenshot3.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-screenshot3.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-03-19 19:22:30 UTC (rev 26659) +++ website/trunk/projects/en/torbrowser.wml 2014-03-20 02:18:00 UTC (rev 26660) @@ -535,23 +535,20 @@ <div class="pjtitle"><h2>Windows Instructions</h2></div> <div class="pjtext"> <p>Download the file above, and save it somewhere, then double click on it. - Click on the button labeled <strong>"..."</strong> (1) and select - where you want - to save the bundle then click <strong>OK</strong> (2). At least 80 - MB free space must be available in the location you select. If you + (1) Click "Run" then choose the installer's language and click <strong>OK</strong> + (2). Make sure you have at least 80MB of free disk space in the location you select. If you want to leave the bundle on the computer, saving it to the Desktop is a good choice. If you want to move it to a different computer or limit the traces you leave behind, save it to a USB disk.</p> - <p>Click <strong>Extract</strong> (3) to begin extraction. This may take a + <p>Click <strong>Install</strong> (3) Wait until the installer finishes. This may take a few minutes to complete.</p> - <p><a href="$(IMGROOT)/tbb-screenshot1.png"><img src="$(IMGROOT)/tbb-screenshot1.png" alt="Screenshot of - extraction process" width="860" height="538"></a></p> - <p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p> - <p>Double click on the <strong>Start Tor Browser</strong> (4) application (it may be called - <strong>Start Tor Browser.exe</strong> on some systems.)</p> - <p>The TorBrowser window will shortly appear.</p> - <p><a href="$(IMGROOT)/tbb-screenshot2.png"><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of - bundle startup" width="860" height="538"></a></p> + <p><a href="$(IMGROOT)/tbb-screenshot1.jpg"><img src="$(IMGROOT)/tbb-screenshot1.jpg" alt="Screenshot of + extraction process" width="860" height="645"></a></p> + <p>Once the installation is complete, click <strong> Finish </strong> to launch Tor Browser's wizard.</p> + <p> Once you see Tor Browser's wizard click <strong>Connect</strong> </p> + <p>Alternatively, you can launch Tor Browser by going to the folder <strong>Tor Browser</strong> which can be found at the location you saved the bundle at (Default: Desktop) and double click on the <strong>Start Tor Browser</strong> application.</p> + <p><a href="$(IMGROOT)/tbb-screenshot2.jpg"><img src="$(IMGROOT)/tbb-screenshot2.jpg" alt="Screenshot of + bundle startup" width="860" height="645"></a></p> <p>Once Tor is ready, Tor Browser will automatically be opened. Only web pages visited through Tor Browser will be sent via Tor. Other web browsers such as Internet Explorer are not affected.</p> @@ -559,10 +556,8 @@ windows by clicking on the <img src="$(IMGROOT)/tbb-close-button.png" alt="Close button (×)" width="19" height="19" style="margin:0px;padding:0px;"> (6). For privacy reasons, the list of web pages you visited and any cookies will be deleted.</p> - <p><a href="$(IMGROOT)/tbb-screenshot3.png"><img src="$(IMGROOT)/tbb-screenshot3.png" alt="Screenshot of - Firefox" width="860" height="538"></a></p> - <p>With the Tor Browser Bundle, Vidalia and Tor will automatically - close.</p> + <p><a href="$(IMGROOT)/tbb-screenshot3.jpg"><img src="$(IMGROOT)/tbb-screenshot3.jpg" alt="Screenshot of + Firefox" width="860" height="645"></a></p> <p>To use the Tor Browser Bundle again, double click on the "Start Tor Browser" application.</p> <p>Remember that Tor anonymizes the origin of your traffic, and it encrypts everything inside the Tor network, but <a @@ -576,6 +571,10 @@ <div id="feedback" class="anchor"></div> <div class="feedback box"> <div class="pjtext"> + <h3>Help and support</h3> + <p>If you need help please check if the <a href="../docs/faq.html.en">FAQ</a> answers your question + and if not you can email the help desk at <strong>help(a)rt.torproject.org</strong></p> + <br><br> <h3>Comments and suggestions</h3> <p>The Tor Browser Bundle is under development and not yet complete. To discuss improvements and submit comments, please use the <a

1 0

[tor/master] Merge remaining changes/* items into ChangeLog
by nickm＠torproject.org 20 Mar '14

20 Mar '14

commit 452aa186800cbdeea13c9c5e40b78984db0616a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 19 20:28:10 2014 -0400 Merge remaining changes/* items into ChangeLog (Not taking bug11235 since it's a whitespace fix) --- ChangeLog | 3 +++ changes/bug11235 | 3 --- changes/bug9059 | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5d65f0..f8ffc9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,9 @@ Changes in version 0.2.5.3-alpha - 2014-03-?? - Document in the manpage that "KBytes" may also be written as "kilobytes" or "KB", that "Kbits" may also be written as "kilobits", and so forth. Closes ticket 9222. + - Document that the ClientOnly config option overrides ORPort. + Our old explanation made ClientOnly sound as though it did + nothing at all. Resolves bug 9059. - Explain that SocksPolicy, DirPolicy, and similar options don't take port arguments. Fixes the other part of ticket 11108. - Fix a comment about the rend_server_descriptor_t.protocols field diff --git a/changes/bug11235 b/changes/bug11235 deleted file mode 100644 index 87a14a4..0000000 --- a/changes/bug11235 +++ /dev/null @@ -1,3 +0,0 @@ - o Code style: - - Remove superfluous newline in src/or/config.c that make check-spaces - was complaining about. Resolves bug 11235. diff --git a/changes/bug9059 b/changes/bug9059 deleted file mode 100644 index 9872a59..0000000 --- a/changes/bug9059 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Provide a more accurate description of the ClientOnly config - option on the man page. Resolves bug 9059.

1 0

[tor/master] extract some changelog principles into doc/HACKING
by nickm＠torproject.org 20 Mar '14

20 Mar '14

commit 8a647291c837846dca73c2017d3101621fd25a8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 19 20:24:15 2014 -0400 extract some changelog principles into doc/HACKING --- doc/HACKING | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/HACKING b/doc/HACKING index 3c1d0d9..ea7d82d 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -474,6 +474,10 @@ interesting and understandable. Present and imperative tense: not past. + 'Relays', not 'servers' or 'nodes' or 'Tor relays'. + + "Stop FOOing", not "Fix a bug where we would FOO". + Try not to let any given section be longer than about a page. Break up long sections into subsections by some sort of common subtopic. This guideline is especially important when organizing Release Notes for

1 0

[bridgedb/develop] Fix typo in inline comment in HTTPServer.
by isis＠torproject.org 20 Mar '14

20 Mar '14

commit fa1a5612592b72da5630a6c7d00cb4c51602ab61 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 22:55:17 2014 +0000 Fix typo in inline comment in HTTPServer. --- lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 89989eb..2744193 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -68,7 +68,7 @@ try: "please install the geoip-database package." % _geoipdb) # This is a "pure" python version which interacts with the Maxmind GeoIP - # API (version 1). It require, in Debian, the libgeoip-dev and + # API (version 1). It requires, in Debian, the libgeoip-dev and # geoip-database packages. import pygeoip geoip = pygeoip.GeoIP(_geoipdb, flags=pygeoip.MEMORY_CACHE)

1 0

[bridgedb/develop] Rearrange logging calls during pygeoip import in HTTPServer.py.
by isis＠torproject.org 20 Mar '14

20 Mar '14

commit e2044209095f1a00ae65c998dc93f64796dd9e6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 22:56:51 2014 +0000 Rearrange logging calls during pygeoip import in HTTPServer.py. --- lib/bridgedb/HTTPServer.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 2744193..96ee029 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -72,12 +72,10 @@ try: # geoip-database packages. import pygeoip geoip = pygeoip.GeoIP(_geoipdb, flags=pygeoip.MEMORY_CACHE) + logging.info("GeoIP database loaded") except Exception as err: - logging.debug("Error while loading geoip module: %r" % err) - logging.warn("GeoIP database not found") + logging.warn("Error while loading geoip module: %r" % err) geoip = None -else: - logging.info("GeoIP database loaded") def replaceErrorPage(error, template_name=None):

1 0