January 2015 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug13857-v2'
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 5401e06508eae0aaa8f6357303b006dd833ba8e5 Merge: bf363a7 ca6ca42 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 8 14:28:00 2015 +0000 Merge remote-tracking branch 'boklm/bug13857-v2' gitian/Makefile | 16 +- gitian/README.build | 8 + tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 196 ++++++++++++++++---- 6 files changed, 189 insertions(+), 42 deletions(-)

1 0

[tor-browser-bundle/master] Add a command to check an update_responses deployement
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit ca6ca42b8a78f5dd6b0cad7db0f8416e3a419332 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 22 14:55:20 2014 +0100 Add a command to check an update_responses deployement usage: check_update_responses_deployement <base_url> [channels...] example: $ ./check_update_responses_deployement \ https://dist.torproject.org/torbrowser/update_2 release This command will read the config.yml file, then try to load different URLs to check that it returns correct xml with the expected version, incremental update files for the versions that should have them, or no update when already using the current version. It does not currently check that the checksum of the files is correct. --- tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/update_responses | 106 ++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 206bd7a..5fe69a2 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,7 +13,8 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager + IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML + LWP On Debian / Ubuntu you can install them with: @@ -21,7 +22,8 @@ On Debian / Ubuntu you can install them with: # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl + libparallel-forkmanager-perl libxml-libxml-perl \ + libwww-perl ``` On Red Hat / Fedora you can install them with: @@ -29,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager + Parallel::ForkManager XML::LibXML LWP do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0c487e3..f982637 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use feature "state"; use English; use FindBin; use YAML qw(LoadFile); @@ -15,6 +16,8 @@ use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -26,6 +29,7 @@ my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; +my @check_errors; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -327,6 +331,107 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + my %actions = ( update_responses => sub { my ($config) = @_; @@ -349,6 +454,7 @@ my %actions = ( create_missing_incremental_mars_for_version($config, $version); } }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME);

1 0

[bridgedb/develop] Clarify documentation for setting up a BridgeDB test instance.
by isis＠torproject.org 08 Jan '15

08 Jan '15

commit 43f6d7b9512e23e19797c6dd398c8ad0d02d4239 Author: Alden S. Page <pagea(a)allegheny.edu> Date: Tue Dec 23 23:35:39 2014 -0500 Clarify documentation for setting up a BridgeDB test instance. * CHANGE doc/HACKING.md and README.rst to mention leekspin installation. * THANKS to Alden Page for the patch. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> --- README.rst | 3 +++ doc/HACKING.md | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/README.rst b/README.rst index 8a33983..617dbd1 100644 --- a/README.rst +++ b/README.rst @@ -312,6 +312,9 @@ To create a bunch of fake bridge descriptors to test BridgeDB, do:: bridgedb mock [-n NUMBER_OF_DESCRIPTORS] +Note that you will need to install ``leekspin`` in order to run the +``bridgedb mock``. See HACKING.md for details. + And finally, to run the test suites, do:: make coverage diff --git a/doc/HACKING.md b/doc/HACKING.md index 0fda25a..22f9b2b 100644 --- a/doc/HACKING.md +++ b/doc/HACKING.md @@ -9,6 +9,23 @@ big that doesn't have a ticket, you should probably make one. If you don't want to register for a Trac account, you can use the ```cypherpunks``` account with password ```writecode```. +## Generating bridge descriptors + +Developers wishing to test BridgeDB will need to generate mock bridge +descriptors. This is accomplished through the [leekspin +script](https://gitweb.torproject.org/user/isis/leekspin.git). To generate 20 +bridge descriptors, change to the bridgedb running directory and do: + + $ leekspin -n 20 + +It is recommended that you generate at least 250 descriptors for testing. +Ideally, even more descriptors should be generated, somewhere in the realm of +2000, as certain bugs do not emerge until BridgeDB is processing thousands of +descriptors. + +**Leekspin is for testing purposes only and should never be deployed on a +production server.** We do not want to distribute fake bridges. + ## Git Workflow See this article on git branching [workflow][workflow]. The only modifications

1 0

[bridgedb/develop] Merge branch 'fix/0.2.3-readme-testing-instructions' into develop
by isis＠torproject.org 08 Jan '15

08 Jan '15

commit c6d52784445f9f5c0af1d577c5f5f58836856e48 Merge: 3972bfa 43f6d7b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 8 13:17:01 2015 +0000 Merge branch 'fix/0.2.3-readme-testing-instructions' into develop README.rst | 3 +++ doc/HACKING.md | 17 +++++++++++++++++ 2 files changed, 20 insertions(+)

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 08 Jan '15

08 Jan '15

commit f80ccd1e3fd9cd90f814e35066c6f2eaa951342d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 8 12:46:00 2015 +0000 Update translations for torbutton-torbuttonproperties --- fil/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fil/torbutton.properties b/fil/torbutton.properties index d23c67d..a80fe8a 100644 --- a/fil/torbutton.properties +++ b/fil/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use To torbutton.prefs.recommended = (recommended) torbutton.prefs.optional = (optional) torbutton.prefs.crucial = (crucial) -torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.title = Mag-download ng eksternal na file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.launch = I-download ang file torbutton.popup.cancel = Cancel -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Awtomatikong mag-download na ng mga file simula ngayon torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas? torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? @@ -49,9 +49,9 @@ torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.notNow=Hindi Ngayon canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Payagan sa hinaharap canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Hindi kailanman para sa site na ito (inirerekomenda) canvas.neverAccessKey=e

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 08 Jan '15

08 Jan '15

commit 7e95a673f8ceaf626672a462d80742fdbce5161b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 8 12:45:45 2015 +0000 Update translations for tor-launcher-network-settings --- fil/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/network-settings.dtd b/fil/network-settings.dtd index 15f0d44..ca5fe24 100644 --- a/fil/network-settings.dtd +++ b/fil/network-settings.dtd @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "I-restart ang Tor"> <!ENTITY torsettings.optional "Optional">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 08 Jan '15

08 Jan '15

commit 6957f2f5cb9fc8696e30e0d377de6fd7fd1cdbd1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 8 12:45:39 2015 +0000 Update translations for tor-launcher-properties_completed --- fil/torlauncher.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fil/torlauncher.properties b/fil/torlauncher.properties index b69659f..23dfc4d 100644 --- a/fil/torlauncher.properties +++ b/fil/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tagapaglunsad ng Tor -torlauncher.tor_exited=Hindi inaasahang tumigil ang Tor. -torlauncher.tor_connection_lost=Ang iyong koneksyon sa Tor Network ay nawala. +torlauncher.tor_exited=Ang Tor ay nagsara ng hindi sinasadya. Ito ay marahil sa isang bug sa Tor, ibang programa sa iyong sistema, o depektibong hardware. Hanggang ma-restart mo ang Tor, ang Tor Browser ay hindi makakapagabot sa kahit anong mga website. Kung ang problema ay nagpapatuloy, mag-sumite ng isang kopya ng iyong Tor Log sa support team. +torlauncher.tor_exited2=Ang pag-restart sa Tor ay hindi magsasara ng mga tab sa browser. torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port. torlauncher.tor_failed_to_start=Nabigong magsimula ang Tor. torlauncher.tor_control_failed=Nabigong kontrolin ang Tor. @@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Walang maaaring gamitin sa mga ibiniga torlauncher.recommended_bridge=(rekomendado) torlauncher.connect=Kumonekta -torlauncher.reconnect=Muling kumonekta +torlauncher.restart_tor=I-restart ang Tor torlauncher.quit=Tumigil torlauncher.quit_win=Lumabas torlauncher.done=Tapos na torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S +torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message. + torlauncher.bootstrapStatus.conn_dir=Kumokonekta sa isang direktoryo ng relay torlauncher.bootstrapStatus.handshake_dir= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon torlauncher.bootstrapStatus.requesting_status=Kinukuha ang katayuan ng network

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 08 Jan '15

08 Jan '15

commit 6caad944547a224b04ae1e4f76557a373cae1530 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 8 12:45:35 2015 +0000 Update translations for tor-launcher-properties --- fil/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/torlauncher.properties b/fil/torlauncher.properties index 4664697..23dfc4d 100644 --- a/fil/torlauncher.properties +++ b/fil/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tagapaglunsad ng Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=Ang Tor ay nagsara ng hindi sinasadya. Ito ay marahil sa isang bug sa Tor, ibang programa sa iyong sistema, o depektibong hardware. Hanggang ma-restart mo ang Tor, ang Tor Browser ay hindi makakapagabot sa kahit anong mga website. Kung ang problema ay nagpapatuloy, mag-sumite ng isang kopya ng iyong Tor Log sa support team. torlauncher.tor_exited2=Ang pag-restart sa Tor ay hindi magsasara ng mga tab sa browser. torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port. torlauncher.tor_failed_to_start=Nabigong magsimula ang Tor.

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 08 Jan '15

08 Jan '15

commit e2ce7c7e2fb325a49a6d0609c77e509df80490c1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 8 12:45:03 2015 +0000 Update translations for bridgedb --- fil/LC_MESSAGES/bridgedb.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fil/LC_MESSAGES/bridgedb.po b/fil/LC_MESSAGES/bridgedb.po index d27b7a8..f42faab 100644 --- a/fil/LC_MESSAGES/bridgedb.po +++ b/fil/LC_MESSAGES/bridgedb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Jed Aureus Gonzales, 2015 # Kay P., 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-12-27 01:40+0000\n" -"Last-Translator: Kay P.\n" +"PO-Revision-Date: 2015-01-08 12:30+0000\n" +"Last-Translator: Jed Aureus Gonzales\n" "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -252,7 +253,7 @@ msgstr "Humiling ng Pluggable Transport gamit ang TYPE." #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Kumuha ng kopya ng pampublikong GnuPG key ng BridgeDB." #: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" @@ -260,11 +261,11 @@ msgstr "Mag-report ng Bug" #: lib/bridgedb/templates/base.html:94 msgid "Source Code" -msgstr "" +msgstr "Source Code" #: lib/bridgedb/templates/base.html:97 msgid "Changelog" -msgstr "" +msgstr "Changelog" #: lib/bridgedb/templates/base.html:99 msgid "Contact" @@ -330,7 +331,7 @@ msgstr "%sJ%sust ibigay mo sa akin ang bridges!" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "Mga advance na options" #: lib/bridgedb/templates/options.html:88 msgid "No" @@ -346,7 +347,7 @@ msgstr "wala" #: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sY%ses!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -354,4 +355,4 @@ msgstr "" #: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sG%set Bridges"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 08 Jan '15

08 Jan '15

commit ffe61ab5f54ab2fa20d3fcc063cf3dda5eefd08d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 8 12:15:49 2015 +0000 Update translations for torbutton-torbuttondtd --- fil/torbutton.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fil/torbutton.dtd b/fil/torbutton.dtd index 908317f..e4fa9ac 100644 --- a/fil/torbutton.dtd +++ b/fil/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Mga Setting na Pang-Pribado at Seguridad"> <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> @@ -144,14 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption "Mga Setting na Pang-Pribado"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_caption "Lebel ng Seguridad"> <!ENTITY torbutton.prefs.sec_low "Mababa (rematado)"> <!ENTITY torbutton.prefs.sec_med_low "Gitnang-Mababa"> <!ENTITY torbutton.prefs.sec_med_high "Gitnang-Mataas"> <!ENTITY torbutton.prefs.sec_high "Mataas"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_custom "Custom na Halaga">

1 0