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

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 18 Feb '14

18 Feb '14

commit efb41b676a16c03d4bb72406f7688b7fc3d25563 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 18 02:45:25 2014 +0000 Update translations for torbirdy --- ko_KR/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko_KR/torbirdy.dtd b/ko_KR/torbirdy.dtd index 921d9e7..1e32744 100644 --- a/ko_KR/torbirdy.dtd +++ b/ko_KR/torbirdy.dtd @@ -24,7 +24,7 @@ <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings"> +<!ENTITY torbirdy.prefs.customsettings.text "사용자 지정 프록시 설정 사용"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> <!ENTITY torbirdy.prefs.socks_host.key "h">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 18 Feb '14

18 Feb '14

commit cc8730054b62a1804451bb9884083b98da0219b4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 18 02:15:48 2014 +0000 Update translations for torbutton-torbuttondtd --- ko/torbutton.dtd | 4 +- ko_KR/torbutton.dtd | 286 +++++++++++++++++++++++++-------------------------- 2 files changed, 145 insertions(+), 145 deletions(-) diff --git a/ko/torbutton.dtd b/ko/torbutton.dtd index b9f6feb..91b1791 100644 --- a/ko/torbutton.dtd +++ b/ko/torbutton.dtd @@ -1,5 +1,5 @@ -<!ENTITY torbutton.prefs.title "Torbutton 환경 설정"> -<!ENTITY torbutton.prefs.tor_settings "프록시 서버 설정"> +<!ENTITY torbutton.prefs.title "Tor버튼 환경 설정"> +<!ENTITY torbutton.prefs.tor_settings "프록시 설정"> <!ENTITY torbutton.prefs.recommended_settings "내가 사용하고 있는 파이어폭스를 위한 추천 설정 사용"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy 사용"> <!ENTITY torbutton.prefs.use_polipo "Polipo 사용"> diff --git a/ko_KR/torbutton.dtd b/ko_KR/torbutton.dtd index ecd1856..fc8df35 100644 --- a/ko_KR/torbutton.dtd +++ b/ko_KR/torbutton.dtd @@ -1,150 +1,150 @@ -<!ENTITY torbutton.prefs.title ""> +<!ENTITY torbutton.prefs.title "Tor버튼 환경 설정"> <!ENTITY torbutton.prefs.tor_settings "프록시 설정"> -<!ENTITY torbutton.prefs.recommended_settings ""> -<!ENTITY torbutton.prefs.use_privoxy ""> -<!ENTITY torbutton.prefs.use_polipo ""> -<!ENTITY torbutton.prefs.custom_settings ""> -<!ENTITY torbutton.prefs.proxy.host.http ""> -<!ENTITY torbutton.prefs.proxy.host.https ""> -<!ENTITY torbutton.prefs.proxy.host.ftp ""> -<!ENTITY torbutton.prefs.proxy.host.gopher ""> -<!ENTITY torbutton.prefs.proxy.host.socks ""> +<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> +<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy"> +<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> +<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> +<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> +<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> +<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> +<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> +<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> <!ENTITY torbutton.prefs.proxy.port "포트:"> -<!ENTITY torbutton.about.title ""> -<!ENTITY torbutton.about.version ""> -<!ENTITY torbutton.about.summary ""> -<!ENTITY torbutton.about.code ""> -<!ENTITY torbutton.about.maintainer ""> -<!ENTITY torbutton.about.security_review ""> -<!ENTITY torbutton.about.donate ""> -<!ENTITY torbutton.about.make_donation ""> -<!ENTITY torbutton.pref_connection.notice ""> -<!ENTITY torbutton.pref_connection.more_info ""> +<!ENTITY torbutton.about.title "About Torbutton"> +<!ENTITY torbutton.about.version "Version:"> +<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing."> +<!ENTITY torbutton.about.code "Code Contributors:"> +<!ENTITY torbutton.about.maintainer "Maintainer:"> +<!ENTITY torbutton.about.security_review "Security Review:"> +<!ENTITY torbutton.about.donate "If you like using Tor, you might consider"> +<!ENTITY torbutton.about.make_donation "making a donation."> +<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> +<!ENTITY torbutton.pref_connection.more_info "More information"> <!ENTITY torbutton.pref_connection_more_info.title "도움말"> -<!ENTITY torbutton.pref_connection_more_info.text ""> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "새 이름표로"> -<!ENTITY torbutton.context_menu.new_identity_key ""> -<!ENTITY torbutton.context_menu.toggle ""> -<!ENTITY torbutton.context_menu.toggle.key ""> -<!ENTITY torbutton.context_menu.preferences ""> -<!ENTITY torbutton.context_menu.preferences.key ""> -<!ENTITY torbutton.context_menu.about ""> -<!ENTITY torbutton.context_menu.about.key ""> -<!ENTITY torbutton.context_menu.networksettings ""> -<!ENTITY torbutton.context_menu.networksettings.key ""> -<!ENTITY torbutton.context_menu.downloadUpdate ""> -<!ENTITY torbutton.context_menu.downloadUpdate.key ""> -<!ENTITY torbutton.context_menu.cookieProtections ""> -<!ENTITY torbutton.context_menu.cookieProtections.key ""> -<!ENTITY torbutton.context_menu.copyTor ""> -<!ENTITY torbutton.context_menu.copyTor.key ""> -<!ENTITY torbutton.context_menu.openTorTab ""> -<!ENTITY torbutton.context_menu.openTorTab.key ""> -<!ENTITY torbutton.context_menu.openTorWindow ""> -<!ENTITY torbutton.context_menu.openTorWindow.key ""> -<!ENTITY torbutton.button.label ""> -<!ENTITY torbutton.button.tooltip ""> -<!ENTITY torbutton.prefs.sec_settings ""> -<!ENTITY torbutton.prefs.block_thread ""> -<!ENTITY torbutton.prefs.block_thwrite ""> -<!ENTITY torbutton.prefs.block_nthread ""> -<!ENTITY torbutton.prefs.block_nthwrite ""> -<!ENTITY torbutton.prefs.clear_history ""> -<!ENTITY torbutton.prefs.clear_cache ""> -<!ENTITY torbutton.prefs.block_cache ""> -<!ENTITY torbutton.prefs.cookie_jars ""> -<!ENTITY torbutton.prefs.cookie_protection ""> -<!ENTITY torbutton.prefs.mmm_cookies ""> -<!ENTITY torbutton.prefs.clear_cookies ""> -<!ENTITY torbutton.prefs.disable_plugins ""> -<!ENTITY torbutton.prefs.kill_bad_js ""> -<!ENTITY torbutton.prefs.isolate_content ""> -<!ENTITY torbutton.prefs.no_updates ""> -<!ENTITY torbutton.prefs.set_uagent ""> -<!ENTITY torbutton.prefs.dynamic ""> -<!ENTITY torbutton.prefs.cookies ""> -<!ENTITY torbutton.prefs.cache ""> -<!ENTITY torbutton.prefs.history ""> -<!ENTITY torbutton.prefs.no_search ""> -<!ENTITY torbutton.prefs.shutdown ""> -<!ENTITY torbutton.prefs.tor_shutdown ""> -<!ENTITY torbutton.prefs.all_shutdown ""> -<!ENTITY torbutton.prefs.no_shutdown ""> -<!ENTITY torbutton.prefs.disable_sessionstore ""> -<!ENTITY torbutton.prefs.headers ""> -<!ENTITY torbutton.prefs.spoof_english ""> -<!ENTITY torbutton.prefs.refererspoofing ""> -<!ENTITY torbutton.prefs.spoofblank ""> -<!ENTITY torbutton.prefs.smartspoof ""> -<!ENTITY torbutton.prefs.nospoof ""> -<!ENTITY torbutton.prefs.disable_domstorage ""> -<!ENTITY torbutton.prefs.forms ""> -<!ENTITY torbutton.prefs.block_tforms ""> -<!ENTITY torbutton.prefs.block_ntforms ""> +<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> +<!ENTITY torbutton.context_menu.toggle.key "T"> +<!ENTITY torbutton.context_menu.preferences "Preferences..."> +<!ENTITY torbutton.context_menu.preferences.key "P"> +<!ENTITY torbutton.context_menu.about "About Torbutton..."> +<!ENTITY torbutton.context_menu.about.key "A"> +<!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings.key "S"> +<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> +<!ENTITY torbutton.context_menu.cookieProtections.key "C"> +<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> +<!ENTITY torbutton.context_menu.copyTor.key "p"> +<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab"> +<!ENTITY torbutton.context_menu.openTorTab.key "r"> +<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window"> +<!ENTITY torbutton.context_menu.openTorWindow.key "d"> +<!ENTITY torbutton.button.label "Torbutton"> +<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> +<!ENTITY torbutton.prefs.sec_settings "Security Settings"> +<!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)"> +<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> +<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> +<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> +<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> +<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> +<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose"> +<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> +<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> +<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> +<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> +<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> +<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage"> +<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> +<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> +<!ENTITY torbutton.prefs.cookies "Cookies"> +<!ENTITY torbutton.prefs.cache "Cache"> +<!ENTITY torbutton.prefs.history "History"> +<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> +<!ENTITY torbutton.prefs.shutdown "Shutdown"> +<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> +<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> +<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> +<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> +<!ENTITY torbutton.prefs.headers "Headers"> +<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> +<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> +<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> +<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> +<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> +<!ENTITY torbutton.prefs.forms "Forms"> +<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> +<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> <!ENTITY torbutton.prefs.tor "Tor"> -<!ENTITY torbutton.prefs.non_tor ""> -<!ENTITY torbutton.prefs.restore_tor ""> -<!ENTITY torbutton.prefs.startup_tor ""> -<!ENTITY torbutton.prefs.reload_crashed_jar ""> -<!ENTITY torbutton.prefs.dual_cookie_jars ""> -<!ENTITY torbutton.prefs.clear_http_auth ""> -<!ENTITY torbutton.prefs.block_js_history ""> -<!ENTITY torbutton.prefs.resize_on_toggle ""> -<!ENTITY torbutton.prefs.close_tor ""> -<!ENTITY torbutton.prefs.close_nontor ""> -<!ENTITY torbutton.prefs.block_links ""> -<!ENTITY torbutton.prefs.jar_certs ""> -<!ENTITY torbutton.prefs.jar_ca_certs ""> -<!ENTITY torbutton.prefs.locked_mode ""> -<!ENTITY torbutton.prefs.startup_state ""> -<!ENTITY torbutton.prefs.shutdown_state ""> -<!ENTITY torbutton.prefs.startup ""> -<!ENTITY torbutton.prefs.block_tor_file_net ""> -<!ENTITY torbutton.prefs.block_nontor_file_net ""> +<!ENTITY torbutton.prefs.non_tor "Non-Tor"> +<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:"> +<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:"> +<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> +<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> +<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> +<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> +<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> +<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> +<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> +<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> +<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> +<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> +<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> +<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> +<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> +<!ENTITY torbutton.prefs.startup "Startup"> +<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> +<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> <!ENTITY torbutton.prefs.restore_defaults "기본값으로 돌림"> -<!ENTITY torbutton.prefs.test_settings ""> -<!ENTITY torbutton.prefs.test_auto ""> -<!ENTITY torbutton.prefs.disable_livemarks ""> -<!ENTITY torbutton.prefs.tor_memory_jar ""> -<!ENTITY torbutton.prefs.nontor_memory_jar ""> -<!ENTITY torbutton.prefs.session_restore ""> -<!ENTITY torbutton.prefs.nontor_tabs ""> -<!ENTITY torbutton.prefs.tor_tabs ""> -<!ENTITY torbutton.prefs.socks_vfour ""> -<!ENTITY torbutton.prefs.socks_vfive ""> -<!ENTITY torbutton.prefs.no_proxies_on ""> -<!ENTITY torbutton.prefs.no_proxy_warning ""> -<!ENTITY torbutton.prefs.spoofreresh ""> -<!ENTITY torbutton.prefs.refereroptions ""> -<!ENTITY torbutton.prefs.nospoof ""> -<!ENTITY torbutton.prefs.spoofroot ""> -<!ENTITY torbutton.prefs.spoofdomain ""> -<!ENTITY torbutton.prefs.spoofblank ""> -<!ENTITY torbutton.cookiedialog.title ""> -<!ENTITY torbutton.cookiedialog.lockCol ""> -<!ENTITY torbutton.cookiedialog.domainCol ""> +<!ENTITY torbutton.prefs.test_settings "Test Settings"> +<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk"> +<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk"> +<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:"> +<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor"> +<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor"> +<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> +<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> +<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> +<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> +<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh"> +<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options"> +<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> +<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page"> +<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> +<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> +<!ENTITY torbutton.cookiedialog.lockCol "Protected"> +<!ENTITY torbutton.cookiedialog.domainCol "Host"> <!ENTITY torbutton.cookiedialog.nameCol "이름"> -<!ENTITY torbutton.cookiedialog.pathCol ""> -<!ENTITY torbutton.cookiedialog.protectCookie ""> -<!ENTITY torbutton.cookiedialog.removeCookie ""> -<!ENTITY torbutton.cookiedialog.unprotectCookie ""> -<!ENTITY torbutton.cookiedialog.removeAllBut ""> -<!ENTITY torbutton.cookiedialog.saveAllCookies ""> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies ""> -<!ENTITY torbutton.prefs.disable_livemarks ""> -<!ENTITY torbutton.prefs.dtd_recommended ""> -<!ENTITY torbutton.prefs.dtd_optional ""> -<!ENTITY torbutton.prefs.dtd_crucial ""> -<!ENTITY torbutton.prefs.update_torbutton_via_tor ""> -<!ENTITY torbutton.prefs.dodge_google_captcha ""> -<!ENTITY torbutton.prefs.engine1 ""> -<!ENTITY torbutton.prefs.engine2 ""> -<!ENTITY torbutton.prefs.engine3 ""> -<!ENTITY torbutton.prefs.engine4 ""> -<!ENTITY torbutton.prefs.engine5 ""> -<!ENTITY torbutton.prefs.fix_google_srch ""> -<!ENTITY torbutton.prefs.transparentTor ""> -<!ENTITY torbutton.prefs.block_disk ""> -<!ENTITY torbutton.prefs.restrict_thirdparty ""> -<!ENTITY torbutton.prefs.block_plugins ""> -<!ENTITY torbutton.prefs.resist_fingerprinting ""> +<!ENTITY torbutton.cookiedialog.pathCol "Path"> +<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> +<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.prefs.dtd_recommended "(recommended)"> +<!ENTITY torbutton.prefs.dtd_optional "(optional)"> +<!ENTITY torbutton.prefs.dtd_crucial "(crucial)"> +<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor"> +<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:"> +<!ENTITY torbutton.prefs.engine1 "ixquick.com"> +<!ENTITY torbutton.prefs.engine2 "Bing.com"> +<!ENTITY torbutton.prefs.engine3 "Yahoo.com"> +<!ENTITY torbutton.prefs.engine4 "startpage.com"> +<!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.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">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 18 Feb '14

18 Feb '14

commit d0eb08413e18eb2d3354fdc2ba8c1006485ca4ac Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 18 02:15:32 2014 +0000 Update translations for tor-launcher-network-settings --- km/network-settings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/km/network-settings.dtd b/km/network-settings.dtd index 93f5de2..b662ccf 100644 --- a/km/network-settings.dtd +++ b/km/network-settings.dtd @@ -9,10 +9,10 @@ <!ENTITY torSettings.firstQuestion "តើការពណ៌នាណាមួយដូចខាងក្រោមនេះល្អបំផុតសម្រាប់ស្ថានភាពរបស់អ្នក?"> <!ENTITY torSettings.configurePrompt1 "ការភ្ជាប់អ៊ីនធឺណិតកុំព្យូទ័រនេះត្រូវបានកែ ច្រោះ ឬដាក់ប្រូកស៊ី។"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "ខ្ញុំត្រូវកំណត់រចនាសម្ព័ន្ធប្រ៊ីត, ជញ្ជាំងភ្លើង ឬការកំណត់ប្រូកស៊ី។"> <!ENTITY torSettings.configure "កំណត់រចនាសម្ព័ន្ធ"> <!ENTITY torSettings.connectPrompt2 "ខ្ញុំចង់ភ្ជាប់ដោយផ្ទាល់ទៅបណ្ដាញ Tor ។"> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "វានឹងដំណើរការក្នុងស្ថានភាពភាគច្រើន។"> <!ENTITY torSettings.connect "តភ្ជាប់"> <!ENTITY torSettings.proxyQuestion "តើកុំព្យូទ័រនេះត្រូវប្រើប្រូកស៊ី ដើម្បីចូលអ៊ីនធឺណិតឬ?"> @@ -49,10 +49,10 @@ <!ENTITY torsettings.copyLog "ចម្លងកំណត់ហេតុ Tor ទៅក្ដារតម្បៀតខ្ទាស់"> <!ENTITY torsettings.bridgeHelpTitle "ជំនួយបញ្ជូនប្រ៊ីតបន្ត"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp1 "បើអ្នកមិនអាចភ្ជាប់ទៅបណ្ដាញ Tor វាអាចមកពីក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) ឬភ្នាក់ងារផ្សេងកំពុងទប់ស្កាត់ Tor ។ &#160; ជារឿយៗអ្នកអាចស្វែងយល់ពីបញ្ហានេះ ដោយប្រើប៊្រីត Tor ដែលត្រូវបានលាក់ការបញ្ជូនបន្តដែលពិបាកទប់ស្កាត់។"> +<!ENTITY torsettings.bridgeHelp1B "នេះជាវិធីបីយ៉ាង ដើម្បីទទួលអាសយដ្ឋានប៊្រីត៖"> +<!ENTITY torsettings.bridgeHelp2Heading "តាមរយៈបណ្ដាញ"> +<!ENTITY torsettings.bridgeHelp2 "ប្រើកម្មវិធីរុករកបណ្ដាញ ដើម្បីមើល https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">

1 0

[tor/master] whoops; mistaek in a496010642c2. so many comma
by nickm＠torproject.org 18 Feb '14

18 Feb '14

commit e616f5b51312fef55099f2a7cd93af58d2b08032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 01:15:59 2014 +0000 whoops; mistaek in a496010642c2. so many comma --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 211d34c..42096db 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) dnl check for asciidoc and a2x AC_PATH_PROG([ASCIIDOC], [asciidoc], none) -AC_PATH_PROGS([A2X], [a2x, a2x.py], none) +AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Feb '14

18 Feb '14

commit c0835f8e75bf23497971b860742d019f39834c58 Merge: bafae04 e616f5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 01:16:22 2014 +0000 Merge remote-tracking branch 'origin/maint-0.2.4' configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] whoops; mistaek in a496010642c2. so many comma
by nickm＠torproject.org 18 Feb '14

18 Feb '14

commit e616f5b51312fef55099f2a7cd93af58d2b08032 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 01:15:59 2014 +0000 whoops; mistaek in a496010642c2. so many comma --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 211d34c..42096db 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) dnl check for asciidoc and a2x AC_PATH_PROG([ASCIIDOC], [asciidoc], none) -AC_PATH_PROGS([A2X], [a2x, a2x.py], none) +AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)

1 0

[tor/master] Enveigle configure to look for a2x.py as well as a2x.
by nickm＠torproject.org 17 Feb '14

17 Feb '14

commit a496010642c29018b5141991683a7d93dcf7d117 Author: dana koch <dsk(a)google.com> Date: Sat Feb 15 21:46:55 2014 +1100 Enveigle configure to look for a2x.py as well as a2x. It's not guaranteed that every package symlinks a2x to a2x.py; OpenBSD does not do this, so let's just look for a2x.py as well. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6f40ac4..211d34c 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) dnl check for asciidoc and a2x AC_PATH_PROG([ASCIIDOC], [asciidoc], none) -AC_PATH_PROG([A2X], [a2x], none) +AC_PATH_PROGS([A2X], [a2x, a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)

1 0

[tor/master] add changes file for bug 10929
by nickm＠torproject.org 17 Feb '14

17 Feb '14

commit 9f38cd935009e1c962804fb82bf0b0e3834e856d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 17 23:06:18 2014 +0000 add changes file for bug 10929 --- changes/bug10929 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug10929 b/changes/bug10929 new file mode 100644 index 0000000..acf3960 --- /dev/null +++ b/changes/bug10929 @@ -0,0 +1,6 @@ + - Minor bugfixes: + - Fix build warnings about missing "a2x" comment when building the + manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py". + Fixes bug 10929; bugfix on tor-0.2.2.9-alpha. Patch from + Dana Koch. +

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 17 Feb '14

17 Feb '14

commit bafae045ba4a117e2685a925f8a3e21e68368ed4 Merge: 3899cde 9f38cd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 17 23:06:34 2014 +0000 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug10929 | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] Enveigle configure to look for a2x.py as well as a2x.
by nickm＠torproject.org 17 Feb '14

17 Feb '14

commit a496010642c29018b5141991683a7d93dcf7d117 Author: dana koch <dsk(a)google.com> Date: Sat Feb 15 21:46:55 2014 +1100 Enveigle configure to look for a2x.py as well as a2x. It's not guaranteed that every package symlinks a2x to a2x.py; OpenBSD does not do this, so let's just look for a2x.py as well. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6f40ac4..211d34c 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) dnl check for asciidoc and a2x AC_PATH_PROG([ASCIIDOC], [asciidoc], none) -AC_PATH_PROG([A2X], [a2x], none) +AC_PATH_PROGS([A2X], [a2x, a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)

1 0