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

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 May '13

27 May '13

commit d6860741c1c54ec73bef162178f8126ece985c23 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:45:19 2013 +0000 Update translations for vidalia --- lt/vidalia_lt.po | 4 ++-- si_LK/vidalia_si_LK.po | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lt/vidalia_lt.po b/lt/vidalia_lt.po index 6d62b2d..14ceae8 100644 --- a/lt/vidalia_lt.po +++ b/lt/vidalia_lt.po @@ -9,7 +9,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-05-27 10:11+0000\n" +"PO-Revision-Date: 2013-05-27 10:40+0000\n" "Last-Translator: Aleksandr Jadov <a.jadov(a)tata.lt>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -2916,7 +2916,7 @@ msgstr "" msgctxt "ServerPage" msgid "Basic Settings" -msgstr "" +msgstr "Pagrindiniai nustatymai" msgctxt "ServerPage" msgid "" diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index d7c70c1..6ea39ec 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-05-27 10:11+0000\n" +"PO-Revision-Date: 2013-05-27 10:40+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" @@ -2977,31 +2977,31 @@ msgctxt "ServerPage" msgid "" "Your maximum bandwidth rate must be greater than or equal to your average " "bandwidth rate. Both values must be at least 20 KB/s." -msgstr "" +msgstr "ඔබගේ උපරිම කලාප පළල රේටය සාමාන්‍ය කලාප පළල රේටයට වඩා වැඩි හෝ සමාන විය යුතුය. අගයන් දෙකම අඩුතරමින් 20 KB/s ක් විය යුතුය." msgctxt "ServerPage" msgid "Bandwidth Limits" -msgstr "" +msgstr "කලාප පළල සීමා" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" -msgstr "" +msgstr "පොර්ටයන් 6660 - 6669 සහ 6697" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "අන්තර්ජාල ප්‍රතියෝජක කතාබස (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" -msgstr "" +msgstr "පොර්ටයන් 110, 143, 993 සහ 995" msgctxt "ServerPage" msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "තැපෑල ලබාගන්න (POP, IMAP)" msgctxt "ServerPage" msgid "Ports unspecified by other checkboxes" -msgstr "" +msgstr "සලකුණු කොටු මගින් නිශ්චය නොකල පොර්ටයන්" msgctxt "ServerPage" msgid "Misc Other Services" @@ -3009,11 +3009,11 @@ msgstr "" msgctxt "ServerPage" msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888" -msgstr "" +msgstr "පොර්ටයන් 706, 1863, 5050, 5190, 5222, 5223, 8300 සහ 8888" msgctxt "ServerPage" msgid "Instant Messaging (IM)" -msgstr "" +msgstr "ක්ෂණික පණිවුඩකරණය (IM)" msgctxt "ServerPage" msgid "Port 443" @@ -3021,7 +3021,7 @@ msgstr "443 වැනි තොට" msgctxt "ServerPage" msgid "Secure Websites (SSL)" -msgstr "" +msgstr "ආරක්‍ෂිත වෙබ්අඩවි (SSL)" msgctxt "ServerPage" msgid "Port 80" @@ -3033,26 +3033,26 @@ msgstr "වෙබ්අඩවි" msgctxt "ServerPage" msgid "Show help topic on exit policies" -msgstr "" +msgstr "පිටවුම් ප්‍රතිපත්ති වලට අදාළ උදව් මාතෘකා පෙන්වන්න" msgctxt "ServerPage" msgid "" "What Internet resources should users be able to access from your relay?" -msgstr "" +msgstr "ඔබගේ ප්‍රතියෝජකයෙන් පරිශීලකයන්ට ලබාගැනීමට හැක්කේ කුමන අන්තර්ජාල සම්පත්ද?" msgctxt "ServerPage" msgid "" "Tor will still block some outgoing mail and file sharing applications by " "default to reduce spam and other abuse." -msgstr "" +msgstr "Tor තවමත් යම් පිටයවන තැපෑල් සහ ගොනු බෙදාගැනීමේ යෙදුම් පෙරනිමියෙන් අවහිර කරනුයේ ආයාචිත තැපැල් සහ අනෙකුත් අපයෝජන අඩු කිරීමටය." msgctxt "ServerPage" msgid "Exit Policies" -msgstr "" +msgstr "පිටවුම් ප්‍රතිපත්ති" msgctxt "ServerPage" msgid "Let others access your bridge by giving them this line:" -msgstr "" +msgstr "මෙම පේලිය අනෙක් අයට දීමෙන් ඔවුන්ට ඔබගේ සේටුව යොදාගැනීමට ඉඩ දෙන්න:" msgctxt "ServerPage" msgid ""

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 27 May '13

27 May '13

commit 47654783cd54ea3cc8b821012206d7f3d7621e8d Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:16:52 2013 +0000 Update translations for tor-launcher-network-settings --- lt/network-settings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd index 0a2757a..2d9168c 100644 --- a/lt/network-settings.dtd +++ b/lt/network-settings.dtd @@ -35,11 +35,11 @@ <!ENTITY torsettings.useProxy.address "Adresas:"> <!ENTITY torsettings.useProxy.address.placeholder ""> <!ENTITY torsettings.useProxy.port "Prievadas:"> -<!ENTITY torsettings.useProxy.username ""> -<!ENTITY torsettings.useProxy.password ""> -<!ENTITY torsettings.useProxy.type.socks4 ""> -<!ENTITY torsettings.useProxy.type.socks5 ""> -<!ENTITY torsettings.useProxy.type.http ""> +<!ENTITY torsettings.useProxy.username "Vartotojo vardas:"> +<!ENTITY torsettings.useProxy.password "Slaptažodis:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox ""> <!ENTITY torsettings.firewall.allowedPorts ""> <!ENTITY torsettings.useBridges.checkbox "">

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 27 May '13

27 May '13

commit d39425cdab8666630c9541a3aa17128e9f6de5d5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:16:36 2013 +0000 Update translations for tails-greeter --- lt/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/lt.po b/lt/lt.po index 724ccba..d669445 100644 --- a/lt/lt.po +++ b/lt/lt.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: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-05-23 11:39+0000\n" +"PO-Revision-Date: 2013-05-27 10:01+0000\n" "Last-Translator: Aleksandr Jadov <a.jadov(a)tata.lt>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgstr "" #: ../glade/optionswindow.glade.h:6 msgid "Password:" -msgstr "" +msgstr "Slaptažodis:" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 27 May '13

27 May '13

commit 2c3256abeea3bc2e1bed320c05634a4d4209abe9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:16:19 2013 +0000 Update translations for whisperback --- lt/lt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/lt.po b/lt/lt.po index bb973cc..6146d50 100644 --- a/lt/lt.po +++ b/lt/lt.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-05-27 09:44+0000\n" +"PO-Revision-Date: 2013-05-27 10:01+0000\n" "Last-Translator: Aleksandr Jadov <a.jadov(a)tata.lt>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 27 May '13

27 May '13

commit 4282f67dd49b90bf07906714ab8e55a34ecdbf43 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:15:52 2013 +0000 Update translations for vidalia_help --- lt/server.po | 2 +- si_LK/config.po | 6 +++--- si_LK/server.po | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/server.po b/lt/server.po index 2ac39de..1b905bb 100644 --- a/lt/server.po +++ b/lt/server.po @@ -287,7 +287,7 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:163 msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Internet Relay Chat (IRC)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:164 diff --git a/si_LK/config.po b/si_LK/config.po index 4e01bdc..efecd9a 100644 --- a/si_LK/config.po +++ b/si_LK/config.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: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2013-05-27 09:41+0000\n" +"PO-Revision-Date: 2013-05-27 10:13+0000\n" "Last-Translator: Sachie <jemabha(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" @@ -245,7 +245,7 @@ msgid "" "connects to Tor's control port. If Vidalia starts Tor for you, you can have " "Vidalia randomly generate a new password each time it starts Tor by checking" " the <i>Randomly Generate</i> checkbox." -msgstr "" +msgstr "<b>මුරපදය</b> <i>(පෙරනිමිය)</i> -- ඔබ මෙම විකල්පය තෝරාගතහොත් Tor හී පාලන පෝටයට පරිශීලකයෙක් හෝ යම් යෙදුමක් සම්බන්ධවීමට උත්සහකිරිමේදී මුරපදයක් අවශ්‍ය වේ. විදාලියා විසින් Tor ආරම්භ කරන සෑම අවස්ථාවකදීම නව මුරපදයක් ජනනය කිරීම සදහා <i>සසම්භාවීව ජනනය කරන්න</i> කොටුව සලකුණු කරන්න." #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:162 @@ -254,7 +254,7 @@ msgid "" " (or, <i>cookie</i>) containing random bytes to its data directory when it " "starts. Any user or application that tries to connect to Tor's control port " "must be able to provide the contents of this cookie." -msgstr "" +msgstr "<b>කුකී</b> -- කුකී සහතික කිරීම තොරගෙන ඇති විට, ආරම්භ කිරීමේදී Tor සසම්භාවී බයිට අඩංගු ගොනුවක් (හෝ, <i>කුකියක්</i>) එහි දත්ත නාමාවලිය තුල ලියයි. Tor හී පාලක පෝටයට සම්බන්ධවීමට ඕනෑම යෙදුමක් හෝ පරිශීලකයෙක් මෙම කුකියේ සංයුක්තය ඉදිරිපත් කල යුතුය." #. type: Content of: <html><body><ul><li> #: en/config.html:170 diff --git a/si_LK/server.po b/si_LK/server.po index a5ac5df..19c15fc 100644 --- a/si_LK/server.po +++ b/si_LK/server.po @@ -30,7 +30,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/server.html:24 msgid "Basic Settings" -msgstr "" +msgstr "මුලික සිටුවම්" #. type: Content of: <html><body><p> #: en/server.html:26

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 27 May '13

27 May '13

commit 8f17cd0000fce7f9038e30c5d0acf5b45f190ce2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:15:36 2013 +0000 Update translations for vidalia_alpha --- lt/vidalia_lt.po | 104 ++++++++++++++++++++++++------------------------ si_LK/vidalia_si_LK.po | 44 ++++++++++---------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/lt/vidalia_lt.po b/lt/vidalia_lt.po index 91e33ba..1e7a821 100644 --- a/lt/vidalia_lt.po +++ b/lt/vidalia_lt.po @@ -412,7 +412,7 @@ msgstr "" msgctxt "CircuitListWidget" msgid "Status" -msgstr "" +msgstr "Statusas" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" @@ -432,7 +432,7 @@ msgstr "" msgctxt "ConfigDialog" msgid "Network" -msgstr "" +msgstr "Tinklas" msgctxt "ConfigDialog" msgid "Sharing" @@ -440,7 +440,7 @@ msgstr "" msgctxt "ConfigDialog" msgid "Appearance" -msgstr "" +msgstr "Išvaizda" msgctxt "ConfigDialog" msgid "Advanced" @@ -519,11 +519,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Afghanistan" -msgstr "" +msgstr "Afganistanas" msgctxt "CountryInfo" msgid "Andorra" -msgstr "" +msgstr "Andora" msgctxt "CountryInfo" msgid "Angola" @@ -783,15 +783,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "Italija" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "Jamaika" msgctxt "CountryInfo" msgid "Japan" -msgstr "" +msgstr "Japonija" msgctxt "CountryInfo" msgid "Jordan" @@ -823,7 +823,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "Latvija" msgctxt "CountryInfo" msgid "Lebanon" @@ -843,7 +843,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Lietuva" msgctxt "CountryInfo" msgid "Luxembourg" @@ -871,7 +871,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "Malta" msgctxt "CountryInfo" msgid "Marshall Islands" @@ -1247,7 +1247,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "Suomija" msgctxt "CountryInfo" msgid "Greece" @@ -1500,7 +1500,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Ctrl+H" -msgstr "" +msgstr "Ctrl+H" msgctxt "HelpBrowser" msgid "Find" @@ -1512,7 +1512,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "HelpBrowser" msgid "Close" @@ -1524,7 +1524,7 @@ msgstr "Uždaryti Vidalia pagalba" msgctxt "HelpBrowser" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "HelpBrowser" msgid "Find:" @@ -1907,7 +1907,7 @@ msgstr "" msgctxt "MainWindow" msgid "Status" -msgstr "" +msgstr "Statusas" msgctxt "MainWindow" msgid "Password Reset Failed" @@ -2196,7 +2196,7 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+C" -msgstr "" +msgstr "Ctrl+C" msgctxt "MessageLog" msgid "Select All" @@ -2208,7 +2208,7 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+A" -msgstr "" +msgstr "Ctrl+A" msgctxt "MessageLog" msgid "Save All" @@ -2248,7 +2248,7 @@ msgstr "Parodyti pagalbos naršyklę" msgctxt "MessageLog" msgid "F1" -msgstr "" +msgstr "F1" msgctxt "MessageLog" msgid "Close" @@ -2260,7 +2260,7 @@ msgstr "Uždaryti pranešimų registrą" msgctxt "MessageLog" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "MessageLog" msgid "Find" @@ -2272,7 +2272,7 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "MessageLog" msgid "Time" @@ -2407,7 +2407,7 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+R" -msgstr "" +msgstr "Ctrl+R" msgctxt "NetViewer" msgid "Help" @@ -2423,7 +2423,7 @@ msgstr "" msgctxt "NetViewer" msgid "F1" -msgstr "" +msgstr "F1" msgctxt "NetViewer" msgid "Close" @@ -2435,7 +2435,7 @@ msgstr "Uždaryti tinklo žemėlapį" msgctxt "NetViewer" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "NetViewer" msgid "Zoom In" @@ -2447,7 +2447,7 @@ msgstr "" msgctxt "NetViewer" msgid "+" -msgstr "" +msgstr "+" msgctxt "NetViewer" msgid "Zoom Out" @@ -2459,7 +2459,7 @@ msgstr "" msgctxt "NetViewer" msgid "-" -msgstr "" +msgstr "-" msgctxt "NetViewer" msgid "Zoom To Fit" @@ -2471,7 +2471,7 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "NetViewer" msgid "Relay Not Found" @@ -2495,7 +2495,7 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "NetViewer" msgid "Network Map" @@ -2511,7 +2511,7 @@ msgstr "" msgctxt "NetViewer" msgid "Status" -msgstr "" +msgstr "Statusas" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" @@ -2537,7 +2537,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" -msgstr "" +msgstr "Kopijuoti (Ctrl+C)" msgctxt "NetworkPage" msgid "" @@ -2569,11 +2569,11 @@ msgstr "Proxy nustatymai" msgctxt "NetworkPage" msgid "Username:" -msgstr "" +msgstr "Vartotojo vardas:" msgctxt "NetworkPage" msgid "Password:" -msgstr "" +msgstr "Slaptažodis:" msgctxt "NetworkPage" msgid "Port:" @@ -2597,7 +2597,7 @@ msgstr "" msgctxt "NetworkPage" msgid "80, 443" -msgstr "" +msgstr "80, 443" msgctxt "NetworkPage" msgid "" @@ -2661,15 +2661,15 @@ msgstr "" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." @@ -2837,7 +2837,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Summary" -msgstr "" +msgstr "Santrauka" msgctxt "RouterInfoDialog" msgid "Name:" @@ -2999,23 +2999,23 @@ msgstr "" msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" -msgstr "" +msgstr "Cable/DSL 256 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 512 Kbps" -msgstr "" +msgstr "Cable/DSL 512 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 768 Kbps" -msgstr "" +msgstr "Cable/DSL 768 Kbps" msgctxt "ServerPage" msgid "T1/Cable/DSL 1.5 Mbps" -msgstr "" +msgstr "T1/Cable/DSL 1.5 Mbps" msgctxt "ServerPage" msgid "> 1.5 Mbps" -msgstr "" +msgstr "> 1.5 Mbps" msgctxt "ServerPage" msgid "Custom" @@ -3039,7 +3039,7 @@ msgstr "" msgctxt "ServerPage" msgid "KB/s" -msgstr "" +msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" @@ -3065,7 +3065,7 @@ msgstr "" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Internet Relay Chat (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" @@ -3508,7 +3508,7 @@ msgstr "" msgctxt "StatusTab" msgid "Status" -msgstr "" +msgstr "Statusas" msgctxt "StatusTab" msgid "Message Log" @@ -3638,7 +3638,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Ctrl+C" -msgstr "" +msgstr "Ctrl+C" msgctxt "TorrcDialog" msgid "Ctrl+V" @@ -3646,7 +3646,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "TorrcDialog" msgid "Ctrl+Shift+Z" @@ -3654,7 +3654,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Ctrl+A" -msgstr "" +msgstr "Ctrl+A" msgctxt "UPNPControl" msgid "Success" @@ -3901,11 +3901,11 @@ msgstr "" msgctxt "stringutil.h" msgid "%1 secs" -msgstr "" +msgstr "%1 secs" msgctxt "stringutil.h" msgid "%1 B/s" -msgstr "" +msgstr "%1 B/s" msgctxt "stringutil.h" msgid "%1 KB/s" @@ -3913,11 +3913,11 @@ msgstr "%1 KB/s" msgctxt "stringutil.h" msgid "%1 MB/s" -msgstr "" +msgstr "%1 MB/s" msgctxt "stringutil.h" msgid "%1 GB/s" -msgstr "" +msgstr "%1 GB/s" msgctxt "stringutil.h" msgid "%1 days" diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index ce2dc03..02e3c3f 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-05-27 09:40+0000\n" +"PO-Revision-Date: 2013-05-27 10:15+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" @@ -2950,7 +2950,7 @@ msgstr "ප්‍රතියෝජක පෝර්ටය:" msgctxt "ServerPage" msgid "Enable to mirror the relay directory" -msgstr "" +msgstr "ප්‍රතියෝජක ඩිරෙක්ටරි දැකීම සබල කරන්න" msgctxt "ServerPage" msgid "Attempt to automatically configure port forwarding" @@ -2962,41 +2962,41 @@ msgstr "පරීක්‍ෂාව" msgctxt "ServerPage" msgid "Show help topic on port forwarding" -msgstr "" +msgstr "පොර්ටයන් ඉදිරිකරණයට අදාළ උදව් මාතෘකා පෙන්වන්න " msgctxt "ServerPage" msgid "Directory Port:" -msgstr "" +msgstr "ඩිරෙක්ටරි පෝර්ටය:" msgctxt "ServerPage" msgid "Directory Port Number" -msgstr "" +msgstr "ඩිරෙක්ටරි පොර්ට අංකය" msgctxt "ServerPage" msgid "Contact Info:" -msgstr "" +msgstr "ඇමතුම් තොරතුරු:" msgctxt "ServerPage" msgid "Name of your relay" -msgstr "" +msgstr "ඔබගේ ප්‍රතියෝජකයේ නාමය " msgctxt "ServerPage" msgid "Port on which users and other relays can communicate with your relay" -msgstr "" +msgstr "පරිශීලකයන් සහ වෙනත් ප්‍රතියෝජකයන් ඔබේ ප්‍රතියෝජකය සමග සන්නිවේදනය කල හැකි පෝර්ටය" msgctxt "ServerPage" msgid "Nickname:" -msgstr "" +msgstr "අපනාමය:" msgctxt "ServerPage" msgid "Basic Settings" -msgstr "" +msgstr "මුලික සිටුවම්" msgctxt "ServerPage" msgid "" "For Internet connections with fast download speed but slow upload, please " "list your upload speed here." -msgstr "" +msgstr "වේගවත් බාගත වේගයන් නමුත් මද උඩුගත වේගයන් සහිත අන්තර්ජාල සබැදුම් සදහා, කරුණාකර ඔබගේ උඩුගත වේගය මෙහි ලැයිස්තුගත කරන්න." msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" @@ -3020,23 +3020,23 @@ msgstr "> 1.5 Mbps" msgctxt "ServerPage" msgid "Custom" -msgstr "" +msgstr "අභිරුචි" msgctxt "ServerPage" msgid "Select the entry that most closely resembles your Internet connection" -msgstr "" +msgstr "ඔබගේ අන්තර්ජාල සබැදුමට ආසන්න වශයෙන් එකසමාන සටහන තෝරාගන්න" msgctxt "ServerPage" msgid "Show help topic on bandwidth rate limits" -msgstr "" +msgstr "කලාප පළල රේට සීමා වල උදව් මාතෘකා පෙන්වන්න" msgctxt "ServerPage" msgid "Average Rate" -msgstr "" +msgstr "සාමාන්‍ය රේටය" msgctxt "ServerPage" msgid "Long-term average bandwidth limit" -msgstr "" +msgstr "දිගු-කාලීන සාමාන්‍ය කලාප පළල සීමාව" msgctxt "ServerPage" msgid "KB/s" @@ -3044,7 +3044,7 @@ msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" -msgstr "" +msgstr "උපරිම සීමාව" msgctxt "ServerPage" msgid "Peak bandwidth rate limit" @@ -3054,23 +3054,23 @@ msgctxt "ServerPage" msgid "" "Your maximum bandwidth rate must be greater than or equal to your average " "bandwidth rate. Both values must be at least 20 KB/s." -msgstr "" +msgstr "ඔබගේ උපරිම කලාප පළල රේටය සාමාන්‍ය කලාප පළල රේටයට වඩා වැඩි හෝ සමාන විය යුතුය. අගයන් දෙකම අඩුතරමින් 20 KB/s ක් විය යුතුය." msgctxt "ServerPage" msgid "Bandwidth Limits" -msgstr "" +msgstr "කලාප පළල සීමා" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" -msgstr "" +msgstr "පොර්ටයන් 6660 - 6669 සහ 6697" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "අන්තර්ජාල ප්‍රතියෝජක කතාබස (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" -msgstr "" +msgstr "පොර්ටයන් 110, 143, 993 සහ 995" msgctxt "ServerPage" msgid "Retrieve Mail (POP, IMAP)"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 May '13

27 May '13

commit 6181a8312e6ae8a3a1371ffaefc6cdb748e9e963 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:15:29 2013 +0000 Update translations for vidalia --- lt/vidalia_lt.po | 96 ++++++++++++++++++++++++------------------------ si_LK/vidalia_si_LK.po | 34 ++++++++--------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/lt/vidalia_lt.po b/lt/vidalia_lt.po index afad284..6d62b2d 100644 --- a/lt/vidalia_lt.po +++ b/lt/vidalia_lt.po @@ -9,7 +9,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-05-27 09:45+0000\n" +"PO-Revision-Date: 2013-05-27 10:11+0000\n" "Last-Translator: Aleksandr Jadov <a.jadov(a)tata.lt>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -369,7 +369,7 @@ msgstr "" msgctxt "Circuit" msgid "Failed" -msgstr "Klaida" +msgstr "Nepavyko" msgctxt "Circuit" msgid "Closed" @@ -461,11 +461,11 @@ msgstr "" msgctxt "ControlPasswordInputDialog" msgid "Password Required" -msgstr "" +msgstr "Reikalingas slaptažodis" msgctxt "ControlPasswordInputDialog" msgid "Remember my password" -msgstr "" +msgstr "Prisiminti mano slaptažodį" msgctxt "ControlPasswordInputDialog" msgid "" @@ -491,11 +491,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Afghanistan" -msgstr "" +msgstr "Afganistanas" msgctxt "CountryInfo" msgid "Andorra" -msgstr "" +msgstr "Andora" msgctxt "CountryInfo" msgid "Angola" @@ -755,15 +755,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "Italija" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "Jamaika" msgctxt "CountryInfo" msgid "Japan" -msgstr "" +msgstr "Japonija" msgctxt "CountryInfo" msgid "Jordan" @@ -795,7 +795,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "Latvija" msgctxt "CountryInfo" msgid "Lebanon" @@ -815,7 +815,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Lietuva" msgctxt "CountryInfo" msgid "Luxembourg" @@ -843,7 +843,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "Malta" msgctxt "CountryInfo" msgid "Marshall Islands" @@ -1219,7 +1219,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "Suomija" msgctxt "CountryInfo" msgid "Greece" @@ -1472,7 +1472,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Ctrl+H" -msgstr "" +msgstr "Ctrl+H" msgctxt "HelpBrowser" msgid "Find" @@ -1484,7 +1484,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "HelpBrowser" msgid "Close" @@ -1496,7 +1496,7 @@ msgstr "Uždaryti Vidalia pagalba" msgctxt "HelpBrowser" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "HelpBrowser" msgid "Find:" @@ -1955,7 +1955,7 @@ msgstr "" msgctxt "MainWindow" msgid "Status" -msgstr "" +msgstr "Statusas" msgctxt "MainWindow" msgid "Vidalia Shortcuts" @@ -2241,7 +2241,7 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+C" -msgstr "" +msgstr "Ctrl+C" msgctxt "MessageLog" msgid "Select All" @@ -2253,7 +2253,7 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+A" -msgstr "" +msgstr "Ctrl+A" msgctxt "MessageLog" msgid "Save All" @@ -2293,7 +2293,7 @@ msgstr "Parodyti pagalbos naršyklę" msgctxt "MessageLog" msgid "F1" -msgstr "" +msgstr "F1" msgctxt "MessageLog" msgid "Close" @@ -2305,7 +2305,7 @@ msgstr "Uždaryti pranešimų registrą" msgctxt "MessageLog" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "MessageLog" msgid "Find" @@ -2317,7 +2317,7 @@ msgstr "" msgctxt "MessageLog" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "MessageLog" msgid "Time" @@ -2464,7 +2464,7 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+R" -msgstr "" +msgstr "Ctrl+R" msgctxt "NetViewer" msgid "Help" @@ -2480,7 +2480,7 @@ msgstr "" msgctxt "NetViewer" msgid "F1" -msgstr "" +msgstr "F1" msgctxt "NetViewer" msgid "Close" @@ -2492,7 +2492,7 @@ msgstr "Uždaryti tinklo žemėlapį" msgctxt "NetViewer" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "NetViewer" msgid "Zoom In" @@ -2504,7 +2504,7 @@ msgstr "" msgctxt "NetViewer" msgid "+" -msgstr "" +msgstr "+" msgctxt "NetViewer" msgid "Zoom Out" @@ -2516,7 +2516,7 @@ msgstr "" msgctxt "NetViewer" msgid "-" -msgstr "" +msgstr "-" msgctxt "NetViewer" msgid "Zoom To Fit" @@ -2528,7 +2528,7 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "NetViewer" msgid "Relay Not Found" @@ -2552,11 +2552,11 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" -msgstr "" +msgstr "Kopijuoti (Ctrl+C)" msgctxt "NetworkPage" msgid "" @@ -2588,11 +2588,11 @@ msgstr "Proxy nustatymai" msgctxt "NetworkPage" msgid "Username:" -msgstr "" +msgstr "Vartotojo vardas:" msgctxt "NetworkPage" msgid "Password:" -msgstr "" +msgstr "Slaptažodis:" msgctxt "NetworkPage" msgid "Port:" @@ -2616,7 +2616,7 @@ msgstr "" msgctxt "NetworkPage" msgid "80, 443" -msgstr "" +msgstr "80, 443" msgctxt "NetworkPage" msgid "" @@ -2680,15 +2680,15 @@ msgstr "" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." @@ -2764,7 +2764,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Summary" -msgstr "" +msgstr "Santrauka" msgctxt "RouterInfoDialog" msgid "Name:" @@ -2926,23 +2926,23 @@ msgstr "" msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" -msgstr "" +msgstr "Cable/DSL 256 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 512 Kbps" -msgstr "" +msgstr "Cable/DSL 512 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 768 Kbps" -msgstr "" +msgstr "Cable/DSL 768 Kbps" msgctxt "ServerPage" msgid "T1/Cable/DSL 1.5 Mbps" -msgstr "" +msgstr "T1/Cable/DSL 1.5 Mbps" msgctxt "ServerPage" msgid "> 1.5 Mbps" -msgstr "" +msgstr "> 1.5 Mbps" msgctxt "ServerPage" msgid "Custom" @@ -2966,7 +2966,7 @@ msgstr "" msgctxt "ServerPage" msgid "KB/s" -msgstr "" +msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" @@ -2992,7 +2992,7 @@ msgstr "" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Internet Relay Chat (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" @@ -3818,11 +3818,11 @@ msgstr "" msgctxt "stringutil.h" msgid "%1 secs" -msgstr "" +msgstr "%1 secs" msgctxt "stringutil.h" msgid "%1 B/s" -msgstr "" +msgstr "%1 B/s" msgctxt "stringutil.h" msgid "%1 KB/s" @@ -3830,11 +3830,11 @@ msgstr "%1 KB/s" msgctxt "stringutil.h" msgid "%1 MB/s" -msgstr "" +msgstr "%1 MB/s" msgctxt "stringutil.h" msgid "%1 GB/s" -msgstr "" +msgstr "%1 GB/s" msgctxt "stringutil.h" msgid "%1 days" diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index ed46814..d7c70c1 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-05-27 09:40+0000\n" +"PO-Revision-Date: 2013-05-27 10:11+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" @@ -2873,7 +2873,7 @@ msgstr "ප්‍රතියෝජක තොට:" msgctxt "ServerPage" msgid "Enable to mirror the relay directory" -msgstr "" +msgstr "ප්‍රතියෝජක ඩිරෙක්ටරි දැකීම සබල කරන්න" msgctxt "ServerPage" msgid "Attempt to automatically configure port forwarding" @@ -2885,41 +2885,41 @@ msgstr "පරීක්‍ෂාව" msgctxt "ServerPage" msgid "Show help topic on port forwarding" -msgstr "" +msgstr "පොර්ටයන් ඉදිරිකරණයට අදාළ උදව් මාතෘකා පෙන්වන්න " msgctxt "ServerPage" msgid "Directory Port:" -msgstr "" +msgstr "ඩිරෙක්ටරි පෝර්ටය:" msgctxt "ServerPage" msgid "Directory Port Number" -msgstr "" +msgstr "ඩිරෙක්ටරි පොර්ට අංකය" msgctxt "ServerPage" msgid "Contact Info:" -msgstr "" +msgstr "ඇමතුම් තොරතුරු:" msgctxt "ServerPage" msgid "Name of your relay" -msgstr "" +msgstr "ඔබගේ ප්‍රතියෝජකයේ නාමය " msgctxt "ServerPage" msgid "Port on which users and other relays can communicate with your relay" -msgstr "" +msgstr "පරිශීලකයන් සහ වෙනත් ප්‍රතියෝජකයන් ඔබේ ප්‍රතියෝජකය සමග සන්නිවේදනය කල හැකි පෝර්ටය" msgctxt "ServerPage" msgid "Nickname:" -msgstr "" +msgstr "අපනාමය:" msgctxt "ServerPage" msgid "Basic Settings" -msgstr "" +msgstr "මුලික සිටුවම්" msgctxt "ServerPage" msgid "" "For Internet connections with fast download speed but slow upload, please " "list your upload speed here." -msgstr "" +msgstr "වේගවත් බාගත වේගයන් නමුත් මද උඩුගත වේගයන් සහිත අන්තර්ජාල සබැදුම් සදහා, කරුණාකර ඔබගේ උඩුගත වේගය මෙහි ලැයිස්තුගත කරන්න." msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" @@ -2943,23 +2943,23 @@ msgstr "> 1.5 Mbps" msgctxt "ServerPage" msgid "Custom" -msgstr "" +msgstr "අභිරුචි" msgctxt "ServerPage" msgid "Select the entry that most closely resembles your Internet connection" -msgstr "" +msgstr "ඔබගේ අන්තර්ජාල සබැදුමට ආසන්න වශයෙන් එකසමාන සටහන තෝරාගන්න" msgctxt "ServerPage" msgid "Show help topic on bandwidth rate limits" -msgstr "" +msgstr "කලාප පළල රේට සීමා වල උදව් මාතෘකා පෙන්වන්න" msgctxt "ServerPage" msgid "Average Rate" -msgstr "" +msgstr "සාමාන්‍ය රේටය" msgctxt "ServerPage" msgid "Long-term average bandwidth limit" -msgstr "" +msgstr "දිගු-කාලීන සාමාන්‍ය කලාප පළල සීමාව" msgctxt "ServerPage" msgid "KB/s" @@ -2967,7 +2967,7 @@ msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" -msgstr "" +msgstr "උපරිම සීමාව" msgctxt "ServerPage" msgid "Peak bandwidth rate limit"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 May '13

27 May '13

commit 1e3575ec9480d3ad270c4045efc852b2e146b22d Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 10:15:19 2013 +0000 Update translations for orbot --- values-lt/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/values-lt/strings.xml b/values-lt/strings.xml index 2981981..99aa274 100644 --- a/values-lt/strings.xml +++ b/values-lt/strings.xml @@ -27,6 +27,7 @@ <string name="wizard_transproxy_none">Joks</string>  + <string name="status">Statusas</string> <string name="error">Klaida</string> <string name="default_bridges"></string> <string name="btn_save_settings">Išsaugoti nustatymus</string>

1 0

[compass/master] Add a column with the relay primary (IPv4) address
by karsten＠torproject.org 27 May '13

27 May '13

commit e69386813093c79842efd94ddff48a882f0a6577 Author: Lunar <lunar(a)torproject.org> Date: Sun May 26 19:18:13 2013 +0200 Add a column with the relay primary (IPv4) address Onionoo protocol specification guarantee that the first entry in or_addreses is always the primary IP address. --- compass.py | 6 ++++-- templates/result.html | 2 ++ util.py | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/compass.py b/compass.py index 05de2f5..c55fe98 100755 --- a/compass.py +++ b/compass.py @@ -259,10 +259,10 @@ class RelayStats(object): Print the selection returned by sort_and_reduce relays into a string for the command line version. """ - column_widths = [9,10,10,10,10,21,80 if options.links else 42,7,7,4,11] + column_widths = [9,10,10,10,10,21,80 if options.links else 42,7,7,4,16,11] headings = ["CW","adv_bw","P_guard","P_middle", "P_exit", "Nickname", "Link" if options.links else "Fingerprint", - "Exit","Guard","CC", "Autonomous System"] + "Exit","Guard","CC", "IPv4", "Autonomous System"] #Print the header header = "".join(word.ljust(column_widths[i]) for i,word in enumerate(headings)) @@ -402,6 +402,7 @@ class RelayStats(object): result.guard = '-' result.cc = relay.get('country', '??').upper() countries_in_group.add(result.cc) + result.primary_ip = relay.get('or_addresses', ['??:0'])[0].split(':')[0] result.as_no = relay.get('as_number', '??') result.as_name = relay.get('as_name', '??') result.as_info = "%s %s" %(result.as_no, result.as_name) @@ -412,6 +413,7 @@ class RelayStats(object): # specially if options.by_country or options.by_as: result.nick = "*" + result.primary_ip = "*" result.fp = "(%d relays)" % relays_in_group result.exit = "(%d)" % exits_in_group result.guard = "(%d)" % guards_in_group diff --git a/templates/result.html b/templates/result.html index 3d4b57a..705e7a4 100644 --- a/templates/result.html +++ b/templates/result.html @@ -13,6 +13,7 @@ <th>Exit</th> <th>Guard</th> <th>Country</th> + <th>IPv4</th> <th>Autonomous System</th> </tr> </thead> @@ -35,6 +36,7 @@ <td>{{ result.exit }}</td> <td>{{ result.guard }}</td> <td>{{ result.cc }}</td> + <td>{{ result.primary_ip }}</td> <td>{{ result.as_info }}</td> </tr> {% endfor %} diff --git a/util.py b/util.py index 77cb02b..fe9d7d7 100644 --- a/util.py +++ b/util.py @@ -57,6 +57,7 @@ class Result(): self.exit = "" self.guard = "" self.cc = "" + self.primary_ip = "" self.as_no = "" self.as_name = "" self.as_info = "" @@ -75,11 +76,11 @@ class Result(): Return this Result object as a list with the fields in the order expected for printing. """ - format_str = "%.4f%%|%.4f%%|%.4f%%|%.4f%%|%.4f%%|%s|%s|%s|%s|%s|%s" + format_str = "%.4f%%|%.4f%%|%.4f%%|%.4f%%|%.4f%%|%s|%s|%s|%s|%s|%s|%s" formatted = format_str % ( self.cw, self.adv_bw, self.p_guard, self.p_middle, self.p_exit, self.nick, "https://atlas.torproject.org/#details/" + self.fp if links else self.fp, - self.exit, self.guard, self.cc, self.as_info ) + self.exit, self.guard, self.cc, self.primary_ip, self.as_info ) return formatted.split("|") class ResultEncoder(json.JSONEncoder):

1 0

[compass/master] Refactor RelayStats._get_group_function
by karsten＠torproject.org 27 May '13

27 May '13

commit a1bbdbd5e7eada06db1ff4070f0ce1be69916a25 Author: Lunar <lunar(a)torproject.org> Date: Sun May 26 20:26:41 2013 +0200 Refactor RelayStats._get_group_function We need it to scale for more than two grouping options --- compass.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/compass.py b/compass.py index c55fe98..283424e 100755 --- a/compass.py +++ b/compass.py @@ -237,14 +237,15 @@ class RelayStats(object): return filters def _get_group_function(self, options): - if options.by_country and options.by_as: - return lambda relay: (relay.get('country', None), relay.get('as_number', None)) - elif options.by_country: - return lambda relay: relay.get('country', None) - elif options.by_as: - return lambda relay: relay.get('as_number', None) - else: - return lambda relay: relay.get('fingerprint') + funcs = [] + if options.by_country: + funcs.append(lambda relay: relay.get('country', None)) + if options.by_as: + funcs.append(lambda relay: relay.get('as_number', None)) + # Default on grouping by fingerprint + if len(funcs) == 0: + funcs.append(lambda relay: relay.get('fingerprint')) + return lambda relay: tuple([func(relay) for func in funcs]) def add_relay(self, relay): key = self._get_group(relay)

1 0