- tor-commits - lists.torproject.org

[vidalia/master] Support comments in the same line as a config option
by chiiph＠torproject.org 26 Mar '12

26 Mar '12

commit 3f6c16361cda0e5c0b2622111a220f98aaca2a98 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Mar 25 17:15:34 2012 -0300 Support comments in the same line as a config option --- src/vidalia/config/TorrcDialog.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp index 08dd6a0..7f6a9c4 100644 --- a/src/vidalia/config/TorrcDialog.cpp +++ b/src/vidalia/config/TorrcDialog.cpp @@ -97,6 +97,10 @@ TorrcDialog::parseAndSet(QString *errmsg) int i = 0; foreach(QString line, lines) { i++; + int commentIndex = line.indexOf("#"); + if(commentIndex != -1) + line = line.remove(commentIndex, line.length() - commentIndex); + line = line.trimmed(); if(line.startsWith("#")) continue; // Skip commentaries parts = line.split(" ", QString::SkipEmptyParts);

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 26 Mar '12

26 Mar '12

commit eb7b8a21412b424ab9d68f2bbdc0e381aee41d7a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Mar 25 17:17:31 2012 -0300 Add a changes file --- changes/bug5475 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug5475 b/changes/bug5475 new file mode 100644 index 0000000..35a9008 --- /dev/null +++ b/changes/bug5475 @@ -0,0 +1,2 @@ + o Support adding comments in the same line as a config option inside + the torrc dialog. Fixes bug 5475. \ No newline at end of file

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 25 Mar '12

25 Mar '12

commit 9e77afbb12a7ba7fb27e60f0dbc2399a7b429733 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 25 15:15:05 2012 +0000 Update translations for orbot --- values-ja/strings.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/values-ja/strings.xml b/values-ja/strings.xml index 6937869..9cac674 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -5,7 +5,7 @@ <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">start and stop Tor</string> + <string name="control_permission_label">Torを起動・停止する</string> <string name="tor_proxy_service_process">Torプロクシサービス</string> <string name="status_starting_up">Orbotが開始されています...</string> <string name="status_activated">Torネットワークに接続しています</string> @@ -13,7 +13,7 @@ <string name="status_shutting_down">Orbotが終了しています</string> <string name="tor_process_starting">Torクライエントを開始しています...</string> <string name="tor_process_complete">完了</string> - <string name="tor_process_waiting">waiting.</string> + <string name="tor_process_waiting">お待ちください</string> <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> <string name="menu_home">ホーム</string> <string name="menu_browse">閲覧</string> @@ -32,9 +32,9 @@ <string name="menu_verify">確認</string> <string name="menu_exit">終了</string> <string name="powered_by">powered by the Tor Project</string> - <string name="press_to_start">- long press to start -</string> - <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> - <string name="pref_trans_proxy_title">Transparent Proxying</string> + <string name="press_to_start">- 長押しして起動 -</string> + <string name="pref_trans_proxy_group">透過プロキシ (要root)</string> + <string name="pref_trans_proxy_title">透過プロキシ</string> <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> <string name="pref_transparent_all_title">Tor Everything</string> <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> @@ -42,9 +42,9 @@ <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> <string name="pref_transparent_port_title">ポート一覧</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> - <string name="pref_transparent_port_dialog">Enter ports to proxy</string> + <string name="pref_transparent_port_dialog">プロキシのポート番号を入力</string> <string name="pref_has_root">ルートアクセスの許可を要求します</string> - <string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="pref_has_root_summary">透過プロキシのためにroot権限が必要です</string> <string name="status_install_success">Torバイナリインストールが成功しました</string> <string name="status_install_fail">Torバイナリファイルがインストールできませんでした。ログを調べて、通知をtor-assistants(a)torproject.xn--org-u63b4bubm7e8b7b4044dl28h.</string> <string name="title_error">アプリケーションエラー</string> @@ -106,7 +106,7 @@ <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/a…</string>-->  - <string name="wizard_transproxy_title">Transparent Proxying</string> + <string name="wizard_transproxy_title">透過プロキシ</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> <string name="wizard_transproxy_none">None</string>

1 0

[metrics-web/master] Remove line break in descriptor format example.
by karsten＠torproject.org 25 Mar '12

25 Mar '12

commit f86126e2d4a767b122b30bef2a14f472b195924f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Mar 25 13:50:09 2012 +0200 Remove line break in descriptor format example. --- web/WEB-INF/formats.jsp | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index f649554..84b7dac 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -229,8 +229,7 @@ following fields that may be relevant for statistical analysis: <tt>s Exit Fast Guard HSDir Named Running Stable V2Dir Valid</tt> <tt>v Tor 0.2.2.20-alpha</tt> <tt>w Bandwidth=30800</tt> -<tt>p reject 25,119,135-139,445,465,563,587,1214,4661-4666,6346-6429, - 6660-6999</tt> +<tt>p reject 25,119,135-139,445,465,563,587,1214,4661-4666,6346-6429,6660-6999</tt> </blockquote>

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 25 Mar '12

25 Mar '12

commit d3dd3ebe692718857f05a4f533f340722a1a84c2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 25 08:45:15 2012 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index b9561dc..ba59f2d 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.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-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-25 08:13+0000\n" +"PO-Revision-Date: 2012-03-25 08:18+0000\n" "Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -882,7 +882,7 @@ msgstr "جزایر مارشال" msgctxt "CountryInfo" msgid "Mauritania" -msgstr "" +msgstr "موريتانی" msgctxt "CountryInfo" msgid "Mauritius" @@ -906,7 +906,7 @@ msgstr "مغولستان" msgctxt "CountryInfo" msgid "Montenegro" -msgstr "" +msgstr "مونته نگرو" msgctxt "CountryInfo" msgid "Morocco" @@ -986,7 +986,7 @@ msgstr "پرو" msgctxt "CountryInfo" msgid "Philippines" -msgstr "" +msgstr "فیلیپین" msgctxt "CountryInfo" msgid "Poland" @@ -1010,23 +1010,23 @@ msgstr "روسیه" msgctxt "CountryInfo" msgid "Rwanda" -msgstr "" +msgstr "روآندا" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" -msgstr "" +msgstr "سنت کيتس و نويس" msgctxt "CountryInfo" msgid "Saint Lucia" -msgstr "" +msgstr "سنت لوسيا" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "" +msgstr "سنت وينست و گرنادين" msgctxt "CountryInfo" msgid "Samoa" -msgstr "" +msgstr "ساموآ" msgctxt "CountryInfo" msgid "San Marino" @@ -1038,7 +1038,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Saudi Arabia" -msgstr "" +msgstr "عربستان سعودی" msgctxt "CountryInfo" msgid "Senegal"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Mar '12

25 Mar '12

commit 54e34a8c85a360be7f5b4567b1c6530110dfe6ca Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 25 08:45:09 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index f80d59c..6c26dc7 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -4,13 +4,14 @@ # <green.dove1388(a)gmail.com>, 2011. # martin luther king <sabztunnel(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. +# <slander_mo(a)hotmail.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-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-22 08:51+0000\n" -"Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" +"PO-Revision-Date: 2012-03-25 08:42+0000\n" +"Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -237,7 +238,7 @@ msgstr "ویدالیا قادر به بارگذاری زبان انتخاب شد msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "آیکن کارایی سیستم (تغییرات اثر کند زمانی که شما ویدالیا را دوباره شروع می کنید)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" @@ -245,11 +246,11 @@ msgstr "" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "مخفی کردن Tray Icon" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "مخفی کردن Dock Icon" msgctxt "BandwidthGraph" msgid "Since:" @@ -2692,7 +2693,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "شما باید یک یا پل های بیشتری را مشخص کنید." msgctxt "Policy" msgid "accept" @@ -3116,7 +3117,7 @@ msgstr "بطور خودکار آدرس پل من را پخش کن" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "(ترافیک باز پخش برای شبکه تُر (بازپخش خروجی" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 25 Mar '12

25 Mar '12

commit d8296c806f585cf294a8eb858321385b1d56a314 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 25 08:15:14 2012 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 54 +++++++++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 0964383..b9561dc 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.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-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-24 19:29+0000\n" +"PO-Revision-Date: 2012-03-25 08:13+0000\n" "Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -534,7 +534,7 @@ msgstr "آنگولا" msgctxt "CountryInfo" msgid "Antigua & Barbuda" -msgstr "" +msgstr "آنتيگوآ وباربودا" msgctxt "CountryInfo" msgid "Argentina" @@ -554,7 +554,7 @@ msgstr "آذربایجان" msgctxt "CountryInfo" msgid "Bahamas" -msgstr "" +msgstr "باهاما" msgctxt "CountryInfo" msgid "Bangladesh" @@ -562,7 +562,7 @@ msgstr "بنگلادش" msgctxt "CountryInfo" msgid "Barbados" -msgstr "" +msgstr "باربادوس" msgctxt "CountryInfo" msgid "Belarus" @@ -574,11 +574,11 @@ msgstr "بلژیک" msgctxt "CountryInfo" msgid "Belize" -msgstr "" +msgstr "بليز" msgctxt "CountryInfo" msgid "Bhutan" -msgstr "" +msgstr "بوتان" msgctxt "CountryInfo" msgid "Bolivia" @@ -586,11 +586,11 @@ msgstr "بولیوی" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" -msgstr "" +msgstr "بوسنی و هرزگوين" msgctxt "CountryInfo" msgid "Botswana" -msgstr "" +msgstr "بوتساوانا" msgctxt "CountryInfo" msgid "Brazil" @@ -598,7 +598,7 @@ msgstr "برزیل" msgctxt "CountryInfo" msgid "Brunei Darussalam" -msgstr "" +msgstr "برونئی داروالسلام" msgctxt "CountryInfo" msgid "Bulgaria" @@ -606,11 +606,11 @@ msgstr "بلغارستان" msgctxt "CountryInfo" msgid "Burkina Faso" -msgstr "" +msgstr "بوركينافاسو" msgctxt "CountryInfo" msgid "Burundi" -msgstr "" +msgstr "بوروندی" msgctxt "CountryInfo" msgid "Cambodia" @@ -626,7 +626,7 @@ msgstr "کانادا" msgctxt "CountryInfo" msgid "Cape Verde" -msgstr "" +msgstr "كيپ ورد" msgctxt "CountryInfo" msgid "Central African Republic" @@ -634,7 +634,7 @@ msgstr "جمهوری آفریقای مرکزی" msgctxt "CountryInfo" msgid "Chad" -msgstr "" +msgstr "چاد" msgctxt "CountryInfo" msgid "Chile" @@ -666,7 +666,7 @@ msgstr "کاستاریکا" msgctxt "CountryInfo" msgid "Cote dâIvoire" -msgstr "" +msgstr "ساحل عاج" msgctxt "CountryInfo" msgid "Croatia" @@ -678,7 +678,7 @@ msgstr "کوبا" msgctxt "CountryInfo" msgid "Cyprus" -msgstr "" +msgstr "قبرس" msgctxt "CountryInfo" msgid "Czech Republic" @@ -714,11 +714,11 @@ msgstr "السالوادور" msgctxt "CountryInfo" msgid "Equatorial Guinea" -msgstr "" +msgstr "گینه استوایی" msgctxt "CountryInfo" msgid "Eritrea" -msgstr "" +msgstr "اريتره" msgctxt "CountryInfo" msgid "Estonia" @@ -734,7 +734,7 @@ msgstr "گابن" msgctxt "CountryInfo" msgid "Gambia" -msgstr "" +msgstr "گامبيا" msgctxt "CountryInfo" msgid "Georgia" @@ -750,7 +750,7 @@ msgstr "غنا" msgctxt "CountryInfo" msgid "Grenada" -msgstr "" +msgstr "گرنادا" msgctxt "CountryInfo" msgid "Guatemala" @@ -766,7 +766,7 @@ msgstr "گینه بیساوو" msgctxt "CountryInfo" msgid "Guyana" -msgstr "" +msgstr "گينه" msgctxt "CountryInfo" msgid "Hong Kong" @@ -810,7 +810,7 @@ msgstr "کنیا" msgctxt "CountryInfo" msgid "Kiribati" -msgstr "" +msgstr "کيريباتی" msgctxt "CountryInfo" msgid "Kuwait" @@ -818,7 +818,7 @@ msgstr "کویت" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "" +msgstr "قرقيزستان" msgctxt "CountryInfo" msgid "Laos" @@ -834,19 +834,19 @@ msgstr "لبنان" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "" +msgstr "لسوتو" msgctxt "CountryInfo" msgid "Liberia" -msgstr "" +msgstr "ليبی" msgctxt "CountryInfo" msgid "Liechtenstein" -msgstr "" +msgstr "لیختن اشتاین" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "لتونی" msgctxt "CountryInfo" msgid "Luxembourg" @@ -862,7 +862,7 @@ msgstr "ماداگاسکار" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "مالاوی" msgctxt "CountryInfo" msgid "Malaysia"

1 0

[flashproxy/js] Scroll to the bottom of debug output.
by dcf＠torproject.org 25 Mar '12

25 Mar '12

commit e7bef861f811115c27551bc5f5394cbd2dde5303 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 15 22:13:49 2012 -0700 Scroll to the bottom of debug output. --- flashproxy.js | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index ae31484..67620f7 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -99,8 +99,14 @@ function FlashProxy() this.puts = function(s) { if (this.debug_div) { + var at_bottom; + + /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ + at_bottom = (this.debug_div.scrollTop + this.debug_div.clientHeight == this.debug_div.scrollHeight); this.debug_div.appendChild(document.createTextNode(s)); this.debug_div.appendChild(document.createElement("br")); + if (at_bottom) + this.debug_div.scrollTop = this.debug_div.scrollHeight; } };

1 0

[flashproxy/js] Fix logic around XMLHttpRequest errors.
by dcf＠torproject.org 25 Mar '12

25 Mar '12

commit 888e29ea479df363b948dd308682d57cd7ba39f2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 24 21:33:32 2012 -0700 Fix logic around XMLHttpRequest errors. I had confused the status and readyState members in a way that hid the same-origin failure error condition. --- flashproxy.js | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 67620f7..43c2342 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -147,14 +147,14 @@ function FlashProxy() } xhr.responseType = "text"; xhr.onreadystatechange = function() { - /* Status 0 is UNSENT. 4 is DONE. */ - if (xhr.status == 0 && xhr.statusText == null) { - this.puts("Facilitator: cross-domain error."); - } else if (xhr.readyState == 4) { + /* Status 4 is DONE. */ + if (xhr.readyState == 4) { if (xhr.status == 200) this.fac_complete(xhr.responseText); + else if (xhr.status == 0 && xhr.statusText == "") + this.puts("Facilitator: same-origin error."); else - this.puts("Facilitator: can't connect: got response code " + xhr.status + "."); + this.puts("Facilitator: can't connect: got status " + repr(xhr.status) + " and status text " + repr(xhr.statusText) + "."); } }.bind(this); this.puts("Facilitator: connecting to " + fac_url + ".");

1 0

[flashproxy/js] Make the debug_div scrollable.
by dcf＠torproject.org 25 Mar '12

25 Mar '12

commit 8658de41ee98708363d7558b163afc2abf81af45 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 15 22:00:00 2012 -0700 Make the debug_div scrollable. --- embed.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/embed.html b/embed.html index 1d6f290..591f492 100644 --- a/embed.html +++ b/embed.html @@ -13,6 +13,7 @@ body { top: 0; width: 100%; height: 100%; + overflow: auto; color: #44cc44; background-color: #001f0f; }

1 0