November 2019 - tor-commits - lists.torproject.org

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 13980968f404ffce562149d95e19d6205c1f285a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 12:15:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ms_MY/LC_MESSAGES/messages.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/locale/ms_MY/LC_MESSAGES/messages.po b/locale/ms_MY/LC_MESSAGES/messages.po index 0a96da600..47756f080 100644 --- a/locale/ms_MY/LC_MESSAGES/messages.po +++ b/locale/ms_MY/LC_MESSAGES/messages.po @@ -33,12 +33,14 @@ msgstr "" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:44 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:64 msgid "Subscription Confirmed!" -msgstr "" +msgstr "Langganan Disahkan!" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:57 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:78 msgid "Thanks for joining our email list - you'll hear from us soon!" msgstr "" +"Terima kasih kerana menyertai senarai emel kami - anda akan menerima apa-apa" +" berita daripada kami kelak!" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:59 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:80 @@ -64,7 +66,7 @@ msgstr "" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:67 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:88 msgid "please donate today" -msgstr "" +msgstr "silalah menderma hari ini" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:71 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:92 @@ -132,7 +134,7 @@ msgstr "@torproject" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:101 #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:83 msgid "Become a Defender of Privacy!" -msgstr "" +msgstr "Jadilah seorang Pembela Kerahsiaan!" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:105 #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:87 @@ -1021,7 +1023,7 @@ msgstr "Pek Kemeja-t" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:492 msgid "Take back the Internet with Tor" -msgstr "" +msgstr "Perkasakan Internet anda dengan Tor" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:516 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:513

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit ee4f898dffe5455c186f9055c5b583dcb1e10358 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 12:15:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ms/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms/aboutTor.dtd b/ms/aboutTor.dtd index d49880cd3..10fb2af3f 100644 --- a/ms/aboutTor.dtd +++ b/ms/aboutTor.dtd @@ -34,4 +34,4 @@  <!ENTITY aboutTor.ey2019.mozilla "Sumbanglah hari ini dan Mozilla akan sepadankan sumbangan ikhlas anda!"> <!ENTITY aboutTor.ey2019.tracking "Penjejakan, pengintipan, dan penapisan kini bermajarajalela di dalam talian."> -<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor"> +<!ENTITY aboutTor.ey2019.takeback "Perkasakan Internet anda dengan Tor">

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 277bede0b9096f37e14c447bb5c8d9c1a840a98f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 11:53:13 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ms.po | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/contents+ms.po b/contents+ms.po index 8417cf45d..a827ed08f 100644 --- a/contents+ms.po +++ b/contents+ms.po @@ -92,7 +92,7 @@ msgstr "Muat Turun" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.title) msgid "Sponsors" -msgstr "" +msgstr "Penaja" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.section) #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section) @@ -145,7 +145,7 @@ msgstr "Dermalah Sekarang" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.title) msgid "Trademark" -msgstr "" +msgstr "Tanda Dagangan" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" @@ -259,7 +259,7 @@ msgstr "" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "#### About the Tor Project" -msgstr "" +msgstr "#### Perihal Projek Tor" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -338,12 +338,12 @@ msgstr "" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "#### Further Reading" -msgstr "" +msgstr "#### Bacaan Lanjutan" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- [The Tor Project in the Media](https://www.torproject.org/press/)" -msgstr "" +msgstr "- [Projek Tor dalam Media](https://www.torproject.org/press/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -351,6 +351,7 @@ msgid "" "- [The Tor Project Financial " "Reports](https://www.torproject.org/about/reports/)" msgstr "" +"- [Laporan Kewangan Projek Tor](https://www.torproject.org/about/reports/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -1079,7 +1080,7 @@ msgstr "Pergi ke Google Play" #: templates/download-android.html:34 msgid "Go to F-Droid" -msgstr "" +msgstr "Pergi ke F-Droid" #: templates/download-android.html:44 msgid "Are you an iOS user? We encourage you to try Onion Browser." @@ -1091,31 +1092,31 @@ msgstr "Bahasa" #: templates/download-languages.html:12 templates/download-options.html:12 msgid "Windows" -msgstr "" +msgstr "Windows" #: templates/download-languages.html:13 msgid "macOS" -msgstr "" +msgstr "macOS" #: templates/download-languages.html:14 templates/download-options.html:14 msgid "GNU/Linux" -msgstr "" +msgstr "GNU/Linux" #: templates/download-options.html:13 msgid "MacOS" -msgstr "" +msgstr "MacOS" #: templates/download-options.html:43 msgid "Tor Browser for Android Alpha" -msgstr "" +msgstr "Pelayar Tor untuk Android Alfa" #: templates/download-options.html:49 msgid "Google Play" -msgstr "" +msgstr "Google Play" #: templates/download-tor.html:8 msgid "Tor Source" -msgstr "" +msgstr "Sumber Tor" #: templates/download-tor.html:12 msgid "Version" @@ -1127,15 +1128,15 @@ msgstr "sig" #: templates/download-tor.html:37 msgid "Windows Expert Bundle" -msgstr "" +msgstr "Windows Expert Bundle" #: templates/download-tor.html:42 msgid "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE" -msgstr "" +msgstr "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, dan Windows 98SE" #: templates/download-tor.html:43 msgid "Contains just Tor and nothing else." -msgstr "" +msgstr "Hanya mengandung Tor tiada yang lain." #: templates/download.html:5 msgid "Get Connected" @@ -1231,11 +1232,11 @@ msgstr "" #: templates/hero-download-languages.html:2 #: templates/hero-download-options.html:2 msgid "DEFEND YOURSELF" -msgstr "" +msgstr "PERTAHANKAN DIRI ANDA" #: templates/hero-download-tor.html:2 msgid "GROW THE NETWORK" -msgstr "" +msgstr "KEMBANGKAN RANGKAIAN" #: templates/hero-download.html:2 msgid "Defend yourself." @@ -1247,7 +1248,7 @@ msgstr "Muat turun dalam bahasa atau platform lain" #: templates/hero-download.html:46 msgid "Download the latest alpha build" -msgstr "" +msgstr "Muat turun binaan alfa yang terkini" #: templates/hero-download.html:50 msgid "Read the latest release announcements" @@ -1317,6 +1318,9 @@ msgid "" "Tor Browser aims to make all users look the same, making it difficult for " "you to be fingerprinted based on your browser and device information." msgstr "" +"Matlamat Pelayar Tor adalah untuk memastikan semua penggunanya nampak serupa" +" dan sukar di tentukan identiti berdasarkan pelayar dan maklumat peranti " +"anda." #: templates/home.html:58 msgid "Multi-layered Encryption"

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 13521c1694de00547f94ba7c2bef84d6287256a4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 11:52:09 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- ms/browserOnboarding.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ms/browserOnboarding.properties b/ms/browserOnboarding.properties index 86a688bb2..2a304198f 100644 --- a/ms/browserOnboarding.properties +++ b/ms/browserOnboarding.properties @@ -16,7 +16,7 @@ onboarding.tour-tor-network=Rangkaian Tor onboarding.tour-tor-network.title=Menjelajah dengan rangkaian tidak terpusat. onboarding.tour-tor-network.description=Pelayar Tor menghubungkan anda dengan rangkaian Tor yang diurus oleh beribu-ribu para sukarelawan di seluruh dunia. Tidak seperti VPN, tiada kegagalan atau entiti terpusat yang anda kena percaya untuk menikmati internet secara persendirian. onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.action-button=Laras Tetapan Rangkaian Tor anda onboarding.tour-tor-network.button=Pergi ke Paparan Litar onboarding.tour-tor-circuit-display=Paparan Litar @@ -49,7 +49,7 @@ onboarding.tour-tor-update.prefix-new=Baharu onboarding.tour-tor-update.prefix-updated=Dikemaskini onboarding.tour-tor-toolbar=Palang Alat -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. +onboarding.tour-tor-toolbar-update-9.0.title=Selamat Tinggal Butang Onion. onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit b7ac7fb2def15eba95636e3215b4da39bee17778 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 11:51:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ms/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms/torbutton.dtd b/ms/torbutton.dtd index 9a8739f8f..8a63b2207 100644 --- a/ms/torbutton.dtd +++ b/ms/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Lihat baharu untuk Laman ini">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Buka bisikan pengesahihan klien perkhidmatan onion">

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit fa039149d11f13a764eae0fea3114de46f6d6c00 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 11:50:21 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+ms.po | 2134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2134 insertions(+) diff --git a/contents+ms.po b/contents+ms.po new file mode 100644 index 000000000..c265e46e6 --- /dev/null +++ b/contents+ms.po @@ -0,0 +1,2134 @@ +# Translators: +# erinm, 2019 +# Emma Peel, 2019 +# abuyop <abuyop(a)gmail.com>, 2019 +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-11-08 10:34+CET\n" +"PO-Revision-Date: 2018-11-14 12:31+0000\n" +"Last-Translator: abuyop <abuyop(a)gmail.com>, 2019\n" +"Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ms_MY\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title) +msgid "Tor Browser User Manual" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "About" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Documentation" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Press" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Blog" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Newsletter" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Support" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Community" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Contact" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Jobs" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "About Tor Browser" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Downloading" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Running Tor Browser for the first time" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Pluggable transports" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Circumvention" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Bridges" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Managing identities" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Onion Services" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Secure Connections" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Security Settings" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Updating" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Plugins" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Troubleshooting" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Uninstalling" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.description) +msgid "Known issues" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Becoming a Tor Translator" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Making Tor Browser portable" +msgstr "" + +#: https//tb-manual.torproject.org/menu/ +#: (content/menu/contents+en.lrtopic.body) +msgid "Installation" +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.title) +msgid "ABOUT TOR BROWSER" +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.description) +msgid "Learn what Tor Browser can do to protect your privacy and anonymity" +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"Tor Browser uses the Tor network to protect your privacy and anonymity. " +"Using the Tor network has two main properties:" +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"* Your internet service provider, and anyone watching your connection " +"locally, will not be able to track your internet activity, including the " +"names and addresses of the websites you visit." +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"* The operators of the websites and services that you use, and anyone " +"watching them, will see a connection coming from the Tor network instead of " +"your real Internet (IP) address, and will not know who you are unless you " +"explicitly identify yourself." +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"In addition, Tor Browser is designed to prevent websites from " +"“fingerprinting” or identifying you based on your browser configuration." +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"By default, Tor Browser does not keep any browsing history. Cookies are only" +" valid for a single session (until Tor Browser is exited or a [New Identity" +"](/managing-identities/#new-identity) is requested)." +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "### HOW TOR WORKS" +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"Tor is a network of virtual tunnels that allows you to improve your privacy " +"and security on the Internet. Tor works by sending your traffic through " +"three random servers (also known as *relays*) in the Tor network. The last " +"relay in the circuit (the “exit relay”) then sends the traffic out onto the " +"public Internet." +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"How Tor " +"Browser works\">" +msgstr "" + +#: https//tb-manual.torproject.org/about/ +#: (content/about/contents+en.lrtopic.body) +msgid "" +"The image above illustrates a user browsing to different websites over Tor. " +"The green middle computers represent relays in the Tor network, while the " +"three keys represent the layers of encryption between the user and each " +"relay." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.title) +msgid "DOWNLOADING" +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.description) +msgid "How to download Tor Browser" +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"The safest and simplest way to download Tor Browser is from the official Tor" +" Project website at https://www.torproject.org/download." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"Your connection to the site will be secured using [HTTPS](/secure-" +"connections), which makes it much harder for somebody to tamper with." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"However, there may be times when you cannot access the Tor Project website: " +"for example, it could be blocked on your network." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"If this happens, you can use one of the alternative download methods listed " +"below." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "### MIRRORS" +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"If you're unable to download Tor Browser from the official Tor Project " +"website, you can instead try downloading it from one of our official " +"mirrors, either through [EFF](https://tor.eff.org), [Calyx " +"Institute](https://tor.calyxinstitute.org) or [CCC](https://tor.ccc.de)." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "### GETTOR" +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"GetTor is a service that automatically responds to messages with links to " +"the latest version of Tor Browser, hosted at a variety of locations, such as" +" Dropbox, Google Drive and GitHub." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "### TO USE GETTOR VIA EMAIL:" +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"Send an email to gettor(a)torproject.org, and in the body of the message " +"simply write “windows”, “osx”, or “linux”, (without quotation marks) " +"depending on your operating system." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"GetTor will respond with an email containing links from which you can " +"download the Tor Browser package, the cryptographic signature (needed for " +"verifying the download), the fingerprint of the key used to make the " +"signature, and the package’s checksum. You may be offered a choice of " +"“32-bit” or “64-bit” software: this depends on the model of the computer you" +" are using." +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):" +msgstr "" + +#: https//tb-manual.torproject.org/downloading/ +#: (content/downloading/contents+en.lrtopic.body) +msgid "" +"To get links for downloading Tor Browser in Chinese for Linux, send a " +"message to gettor(a)torproject.org with the words \"linux zh\" in it." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.title) +msgid "INSTALLATION" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.description) +msgid "Installing Tor Browser" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "For Windows:" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"1. Navigate to the Tor Browser [download " +"page](https://www.torproject.org/download)." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "2. Download the Windows `.exe` file" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"3. (Recommended) Verify the [file's " +"signature](https://support.torproject.org/en/tbb/how-to-verify-signature/)." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"4. When the download is complete, double click the `.exe` file. Complete the" +" installation wizard process." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "For macOS:" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "2. Download the macOS `.dmg` file" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"4. When the download is complete, double click the `.dmg` file. Complete the" +" installation wizard process." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "For GNU/Linux:" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "2. Download the GNU/Linux `.tar.xz` file" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"4. When the download is complete, extract the archive with the command `tar " +"-xf [TB archive]` or by using an archive manager." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"5. You'll need to tell your GNU/Linux that you want the ability to execute " +"shell scripts from the graphical interface." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "Navigate to the newly extracted Tor Browser directory." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"Right click on `start-tor-browser.desktop`, open Properties or Preferences " +"and change the permission to allow executing file as program." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "Double-click the icon to start up Tor Browser for the first time." +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "" +"6. Alternatively, from inside the Tor Browser directory, you can also start " +"from the command line by running:" +msgstr "" + +#: https//tb-manual.torproject.org/installation/ +#: (content/installation/contents+en.lrtopic.body) +msgid "`./start-tor-browser`" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.title) +msgid "RUNNING TOR BROWSER FOR THE FIRST TIME" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.description) +msgid "Learn how to use Tor Browser for the first time" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"When you run Tor Browser for the first time, you will see the Tor Network " +"Settings window." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"This offers you the option to connect directly to the Tor network, or to " +"configure Tor Browser for your connection." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "### CONNECT" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "<img class=\"col-md-6\" src=\"../../static/images/connect.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"In most cases, choosing \"Connect\" will allow you to connect to the Tor " +"network without any further configuration." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"Once clicked, a status bar will appear, showing Tor’s connection progress." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"If you are on a relatively fast connection, but this bar seems to get stuck " +"at a certain point, see the [Troubleshooting](/troubleshooting) page for " +"help solving the problem." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "### CONFIGURE" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "<img class=\"col-md-6\" src=\"../../static/images/configure.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"If you know that your connection is censored, or uses a proxy, you should " +"select this option. Tor Browser will take you through a series of " +"configuration options." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"The first screen asks if access to the Tor network is blocked or censored on" +" your connection. If you do not believe this is the case, select “No”. If " +"you know your connection is censored, or you have tried and failed to " +"connect to the Tor network and no other solutions have worked, select “Yes”." +" You will then be taken to the [Circumvention](/circumvention) screen to " +"configure a pluggable transport." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "" +"The next screen asks if your connection uses a proxy. In most cases, this is" +" not necessary. You will usually know if you need to answer “Yes”, as the " +"same settings will be used for other browsers on your system. If possible, " +"ask your network administrator for guidance. If your connection does not use" +" a proxy, click “Continue”." +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/running-tor-browser/ +#: (content/running-tor-browser/contents+en.lrtopic.body) +msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.title) +msgid "CIRCUMVENTION" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.description) +msgid "What to do if the Tor network is blocked" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Direct access to the Tor network may sometimes be blocked by your Internet " +"Service Provider or by a government." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Tor Browser includes some circumvention tools for getting around these " +"blocks. These tools are called “pluggable transports”." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "### TYPES OF PLUGGABLE TRANSPORT" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Currently there are three pluggable transports available, but more are being" +" developed." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "<table class=\"table table-striped\">" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "<tbody>" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "<tr class=\"odd\">" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "<td>" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "obfs4" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "</td>" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"obfs4 makes Tor traffic look random, and also prevents censors from finding " +"bridges by Internet scanning. obfs4 bridges are less likely to be blocked " +"than its predecessor, obfs3 bridges." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "</tr>" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "meek" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"meek transports all make it look like you are browsing a major web site " +"instead of using Tor. meek-azure makes it look like you are using a " +"Microsoft web site." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "<tr class=\"even\">" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "Snowflake" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Snowflake is an improvement upon Flashproxy. It sends your traffic through " +"WebRTC, a peer-to-peer protocol with built-in NAT punching." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "</tbody>" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "</table>" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "### USING PLUGGABLE TRANSPORTS" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"To use a pluggable transport, click 'Configure' when starting Tor Browser " +"for the first time. In the window that appears, from the drop-down menu, " +"select whichever pluggable transport you'd like to use." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Or, if you have Tor Browser running, click on 'Preferences' in the hamburger" +" menu and then on 'Tor' in the sidebar. In 'Bridges' section, check the box " +"'Use a bridge', and from the drop-down menu 'Select a built-in bridge', " +"choose whichever pluggable transport you'd like to use." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Once you've selected the pluggable transport you'd like to use, click " +"'Connect' to save your settings." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "### WHICH TRANSPORT SHOULD I USE?" +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Each of the transports listed in Tor Launcher’s menu works in a different " +"way, and their effectiveness depends on your individual circumstances." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"If you are trying to circumvent a blocked connection for the first time, you" +" should try the different transports: obfs4, snowflake, and meek-azure." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"If you try all of these options, and none of them gets you online, you will " +"need to enter bridge addresses manually." +msgstr "" + +#: https//tb-manual.torproject.org/circumvention/ +#: (content/circumvention/contents+en.lrtopic.body) +msgid "" +"Read the [Bridges](/en-US/bridges/) section to learn what bridges are and " +"how to obtain them." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.title) +msgid "BRIDGES" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.description) +msgid "" +"Most Pluggable Transports, such as obfs4, rely on the use of “bridge” " +"relays." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use " +"of “bridge” relays." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary " +"relays, however, they are not listed publicly, so an adversary cannot " +"identify them easily." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Using bridges in combination with pluggable transports helps to disguise the" +" fact that you are using Tor, but may slow down the connection compared to " +"using ordinary Tor relays." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Other pluggable transports, like meek, use different anti-censorship " +"techniques that do not rely on bridges. You do not need to obtain bridge " +"addresses in order to use these transports." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "### GETTING BRIDGE ADDRESSES" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Because bridge addresses are not public, you will need to request them " +"yourself. You have a few options:" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"* Visit https://bridges.torproject.org/ and follow the instructions, or" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "* Email bridges(a)torproject.org from a Gmail, or Riseup email address" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "* Use MOAT to fetch bridges from within Tor Browser." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "### USING MOAT" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"If you're starting Tor Browser for the first time, click 'Configure' to open" +" the Tor Network Settings window." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then" +" on 'Tor' in the sidebar." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"In the Tor Network Settings window, select 'Tor is censored in my country.'" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Then, select 'Request a bridge from torproject.org' and click 'Request a " +"bridge...'" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "Complete the CAPTCHA and click 'Submit'." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "### ENTERING BRIDGE ADDRESSES" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/tor-launcher-custom-bridges.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"Once you have obtained some bridge addresses, you will need to enter them " +"into Tor Launcher." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"If you're starting Tor Browser for the first time, click 'Configure' to open" +" the Tor Network Settings window. Otherwise, click on 'Preferences' in the " +"hamburger menu (main menu) and then on 'Tor' in the sidebar to access these " +"options." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"In 'Bridges' section, check the box 'Use a bridge', then, select 'Provide a " +"bridge I know' and enter each bridge address on a separate line." +msgstr "" + +#: https//tb-manual.torproject.org/bridges/ +#: (content/bridges/contents+en.lrtopic.body) +msgid "" +"If the connection fails, the bridges you received may be down. Please use " +"one of the above methods to obtain more bridge addresses, and try again." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.title) +msgid "MANAGING IDENTITIES" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.description) +msgid "Learn how to control personally-identifying information in Tor Browser" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"When you connect to a website, it is not only the operators of that website " +"who can record information about your visit. Most websites now use numerous " +"third-party services, including social networking “Like” buttons, analytics " +"trackers, and advertising beacons, all of which can link your activity " +"across different sites." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"Using the Tor network stops observers from being able to discover your exact" +" location and IP address, but even without this information they might be " +"able to link different areas of your activity together. For this reason, Tor" +" Browser includes some additional features that help you control what " +"information can be tied to your identity." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "### THE URL BAR" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"Tor Browser centers your web experience around your relationship with the " +"website in the URL bar. Even if you connect to two different sites that use " +"the same third-party tracking service, Tor Browser will force the content to" +" be served over two different Tor circuits, so the tracker will not know " +"that both connections originate from your browser." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"On the other hand, all connections to a single website address will be made " +"over the same Tor circuit, meaning you can browse different pages of a " +"single website in separate tabs or windows, without any loss of " +"functionality." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/circuit_full.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"You can see a diagram of the circuit that Tor Browser is using for the " +"current tab in the site information menu, in the URL bar." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"In the circuit, the Guard or entry node is the first node and it's " +"automatically and randomly selected by Tor. But it is different from the " +"other nodes in the circuit. In order to avoid profiling attacks, the Guard " +"node changes only after 2-3 months, unlike the other nodes, which change " +"with every new domain. For more information about Guards, consult the " +"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support " +"Portal](https://support.torproject.org/tbb/tbb-2/)." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "### LOGGING IN OVER TOR" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"Although Tor Browser is designed to enable total user anonymity on the web, " +"there may be situations in which it makes sense to use Tor with websites " +"that require usernames, passwords, or other identifying information." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"If you log into a website using a regular browser, you also reveal your IP " +"address and geographical location in the process. The same is often true " +"when you send an email. Logging into your social networking or email " +"accounts using Tor Browser allows you to choose exactly which information " +"you reveal to the websites you browse. Logging in using Tor Browser is also " +"useful if the website you are trying to reach is censored on your network." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"When you log in to a website over Tor, there are several points you should " +"bear in mind:" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"* See the [Secure Connections](/secure-connections) page for important " +"information on how to secure your connection when logging in." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"* Tor Browser often makes your connection appear as though it is coming from" +" an entirely different part of the world. Some websites, such as banks or " +"email providers, might interpret this as a sign that your account has been " +"hacked or compromised, and lock you out. The only way to resolve this is by " +"following the site’s recommended procedure for account recovery, or " +"contacting the operators and explaining the situation." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "### CHANGING IDENTITIES AND CIRCUITS" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "<img class=\"col-md-6\" src=\"../../static/images/new_identity.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"Tor Browser features “New Identity” and “New Tor Circuit for this Site” " +"options. There are also located in the main menu (hamburger menu)." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "### NEW IDENTITY" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"This option is useful if you want to prevent your subsequent browser " +"activity from being linkable to what you were doing before. Selecting it " +"will close all your open tabs and windows, clear all private information " +"such as cookies and browsing history, and use new Tor circuits for all " +"connections. Tor Browser will warn you that all activity and downloads will " +"be stopped, so take this into account before clicking “New Identity”." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"To use this option, you just need to click on 'New Identity' in Tor " +"Browser's toolbar." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "### NEW TOR CIRCUIT FOR THIS SITE" +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"This option is useful if the [exit relay](/about/#how-tor-works) you are " +"using is unable to connect to the website you require, or is not loading it " +"properly. Selecting it will cause the currently-active tab or window to be " +"reloaded over a new Tor circuit. Other open tabs and windows from the same " +"website will use the new circuit as well once they are reloaded. This option" +" does not clear any private information or unlink your activity, nor does it" +" affect your current connections to other websites." +msgstr "" + +#: https//tb-manual.torproject.org/managing-identities/ +#: (content/managing-identities/contents+en.lrtopic.body) +msgid "" +"You can also access this option in the new circuit display, in the site " +"information menu, in the URL bar." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.title) +msgid "ONION SERVICES" +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.description) +msgid "Services that are only accessible using Tor" +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"Onion services (formerly known as “hidden services”) are services (like " +"websites) that are only accessible through the Tor network." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"Onion services offer several advantages over ordinary services on the non-" +"private web:" +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"* An onion services’s location and IP address are hidden, making it " +"difficult for adversaries to censor it or identify its operators." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"* All traffic between Tor users and onion services is end-to-end encrypted, " +"so you do not need to worry about [connecting over HTTPS](/secure-" +"connections)." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"* The address of an onion service is automatically generated, so the " +"operators do not need to purchase a domain name; the .onion URL also helps " +"Tor ensure that it is connecting to the right location and that the " +"connection is not being tampered with." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "### HOW TO ACCESS AN ONION SERVICE" +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"Just like any other website, you will need to know the address of an onion " +"service in order to connect to it. An onion address is a string of 16 (and " +"in V3 format, 56) mostly random letters and numbers, followed by “.onion”." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"When accessing a website that uses an onion service, Tor Browser will show " +"at the URL bar an icon of a little green onion displaying the state of your " +"connection: secure and using an onion service. And if you're accessing a " +"website with https and onion service, it will show an icon of a green onion " +"and a padlock." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "### TROUBLESHOOTING" +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"If you cannot reach the onion service you require, make sure that you have " +"entered the onion address correctly: even a small mistake will stop Tor " +"Browser from being able to reach the site." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"If you are still unable to connect to the onion service, please try again " +"later. There may be a temporary connection issue, or the site operators may " +"have allowed it to go offline without warning." +msgstr "" + +#: https//tb-manual.torproject.org/onion-services/ +#: (content/onion-services/contents+en.lrtopic.body) +msgid "" +"You can also ensure that you're able to access other onion services by " +"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)." +msgstr "" + +#: https//tb-manual.torproject.org/secure-connections/ +#: (content/secure-connections/contents+en.lrtopic.title) +msgid "SECURE CONNECTIONS" +msgstr "" + +#: https//tb-manual.torproject.org/secure-connections/ +#: (content/secure-connections/contents+en.lrtopic.description) +msgid "Learn how to protect your data using Tor Browser and HTTPS" +msgstr "" + +#: https//tb-manual.torproject.org/secure-connections/ +#: (content/secure-connections/contents+en.lrtopic.body) +msgid "" +"If personal information such as a login password travels unencrypted over " +"the Internet, it can very easily be intercepted by an eavesdropper. If you " +"are logging into any website, you should make sure that the site offers " +"HTTPS encryption, which protects against this kind of eavesdropping. You can" +" verify this in the URL bar: if your connection is encrypted, the address " +"will begin with “https://”, rather than “http://”." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.title) +msgid "SECURITY SETTINGS" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.description) +msgid "Configuring Tor Browser for security and usability" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"By default, Tor Browser protects your security by encrypting your browsing " +"data." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"You can further increase your security by choosing to disable certain web " +"features that can be used to attack your security and anonymity." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"You can do this by increasing Tor Browser's Security Settings in the shield " +"menu." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"Increasing Tor Browser's security level will stop some web pages from " +"functioning properly, so you should weigh your security needs against the " +"degree of usability you require." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "### ACCESSING THE SECURITY SETTINGS" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"The Security Settings can be accessed by clicking the Shield icon next to " +"the Tor Browser URL bar." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"To view and adjust your Security Settings, click the 'Advanced Security " +"Settings...' button in the shield menu." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" +"anim.gif\">" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "### SECURITY LEVELS" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"Increasing the Security Level in the Tor Browser Security Settings will " +"disable or partially disable certain browser features to protect against " +"possible attacks." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"You can enable these settings again at any time by adjusting your Security " +"Level." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" +"safest.png\">" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "###### Standard" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "* At this level, all Tor Browser and website features are enabled." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "###### Safer" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"* This level disables website features that are often dangerous. This may " +"cause some sites to lose functionality." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some " +"fonts and math symbols are disabled; audio and video (HTML5 media) are " +"click-to-play." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "###### Safest" +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"* This level only allows website features required for static sites and " +"basic services." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "These changes affect images, media, and scripts." +msgstr "" + +#: https//tb-manual.torproject.org/security-settings/ +#: (content/security-settings/contents+en.lrtopic.body) +msgid "" +"* Javascript is disabled by default on all sites; some fonts, icons, math " +"symbols, and images are disabled; audio and video (HTML5 media) are click-" +"to-play." +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.title) +msgid "UPDATING" +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.description) +msgid "How to update Tor Browser" +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "" +"Tor Browser must be kept updated at all times. If you continue to use an " +"outdated version of the software, you may be vulnerable to serious security " +"flaws that compromise your privacy and anonymity." +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "" +"Tor Browser will prompt you to update the software once a new version has " +"been released: the Torbutton icon will display a yellow triangle, and you " +"may see a written update indicator when Tor Browser opens. You can update " +"either automatically or manually." +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "### UPDATING TOR BROWSER AUTOMATICALLY" +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "<img width=\"400\" src=\"../../static/images/update1.png\" />" +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "" +"When you are prompted to update Tor Browser, click on hamburger menu (main " +"menu), then select “Restart to update Tor browser”." +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "<img width=\"500\" src=\"../../static/images/update4.png\" />" +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "" +"Wait for the update to download and install, then Tor Browser will restart " +"itself. You will now be running the latest version." +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "### UPDATING TOR BROWSER MANUALLY" +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "" +"When you are prompted to update Tor Browser, finish the browsing session and" +" close the program." +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "" +"Remove Tor Browser from your system by deleting the folder that contains it " +"(see the [Uninstalling](/uninstalling) section for more information)." +msgstr "" + +#: https//tb-manual.torproject.org/updating/ +#: (content/updating/contents+en.lrtopic.body) +msgid "" +"Visit https://www.torproject.org/download/ and download a copy of the latest" +" Tor Browser release, then install it as before." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.title) +msgid "TROUBLESHOOTING" +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.description) +msgid "What to do if Tor Browser doesn’t work" +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"You should be able to start browsing the web using Tor Browser shortly after" +" running the program, and clicking the “Connect” button if you are using it " +"for the first time." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "### QUICK FIXES" +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"If Tor Browser doesn’t connect, there may be a simple solution. Try each of " +"the following:" +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"* Your computer’s system clock must be set correctly, or Tor will not be " +"able to connect." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"* Make sure another Tor Browser is not already running. If you’re not sure " +"if Tor Browser is running, restart your computer." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"* Make sure that any antivirus program you have installed is not preventing " +"Tor from running. You may need to consult the documentation for your " +"antivirus software if you do not know how to do this." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "* Temporarily disable your firewall." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"* Delete Tor Browser and install it again. If updating, do not just " +"overwrite your previous Tor Browser files; ensure they are fully deleted " +"beforehand." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "### IS YOUR CONNECTION CENSORED?" +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"If you still can’t connect, your Internet Service Provider might be " +"censoring connections to the Tor network. Read the " +"[Circumvention](/circumvention) section for possible solutions." +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "### KNOWN ISSUES" +msgstr "" + +#: https//tb-manual.torproject.org/troubleshooting/ +#: (content/troubleshooting/contents+en.lrtopic.body) +msgid "" +"Tor Browser is under constant development, and some issues are known about " +"but not yet fixed. Please check the [Known Issues](/known-issues) page to " +"see if the problem you are experiencing is already listed there." +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.title) +msgid "PLUGINS, ADD-ONS AND JAVASCRIPT" +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.description) +msgid "How Tor Browser handles add-ons, plugins and JavaScript" +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "### FLASH PLAYER" +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "" +"Video websites, such as Vimeo make use of the Flash Player plugin to display" +" video content. Unfortunately, this software operates independently of Tor " +"Browser and cannot easily be made to obey Tor Browser’s proxy settings. It " +"can therefore reveal your real location and IP address to the website " +"operators, or to an outside observer. For this reason, Flash is disabled by " +"default in Tor Browser, and enabling it is not recommended." +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "" +"Some video websites (such as YouTube) offer alternative video delivery " +"methods that do not use Flash. These methods may be compatible with Tor " +"Browser." +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "### JAVASCRIPT" +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "" +"JavaScript is a programming language that websites use to offer interactive " +"elements such as video, animation, audio, and status timelines. " +"Unfortunately, JavaScript can also enable attacks on the security of the " +"browser, which might lead to deanonymization." +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "" +"Tor Browser includes an add-on called NoScript. It's accessible through " +"'Preferences' on hamburger menu (main menu), then select 'Customize' and " +"drag the “S” icon to the top-right of the window. NoScript allows you to " +"control the JavaScript (and other scripts) that runs on individual web " +"pages, or block it entirely." +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "" +"Users who require a high degree of security in their web browsing should set" +" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which " +"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for " +"all websites). However, disabling JavaScript will prevent many websites from" +" displaying correctly, so Tor Browser’s default setting is to allow all " +"websites to run scripts in \"Standard\" mode." +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "### BROWSER ADD-ONS" +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "" +"Tor Browser is based on Firefox, and any browser add-ons or themes that are " +"compatible with Firefox can also be installed in Tor Browser." +msgstr "" + +#: https//tb-manual.torproject.org/plugins/ +#: (content/plugins/contents+en.lrtopic.body) +msgid "" +"However, the only add-ons that have been tested for use with Tor Browser are" +" those included by default. Installing any other browser add-ons may break " +"functionality in Tor Browser or cause more serious problems that affect your" +" privacy and security. It is strongly discouraged to install additional add-" +"ons, and the Tor Project will not offer support for these configurations." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.title) +msgid "UNINSTALLING" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.description) +msgid "How to remove Tor Browser from your system" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "Removing Tor Browser from your system is simple:" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "On Windows:" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"* Locate your Tor Browser folder or application. The default location is the" +" Desktop." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "* Delete the Tor Browser folder or application." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "* Empty your Trash." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "On macOS:" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"* Locate your Tor Browser application. The default location is the " +"Applications folder." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "* Move the Tor Browser application to Trash." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "* Go to your `~/Library/Application Support/` folder." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"* Note the Library folder is hidden on newer versions of macOS. To navigate " +"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go " +"to folder menu option.\">" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"* Then type \"~/Library/Application Support/\" in the window and click Go." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" " +"alt=\"Go to folder window.\">" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "* Locate the TorBrowser-Data folder and move it to Trash." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"Note that if you did not install Tor Browser in the default location (the " +"Applications folder), then the TorBrowser-Data folder is not located in the " +"`~/Library/Application Support/` folder, but in the same folder where you " +"installed Tor Browser." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "On Linux:" +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"* Locate your Tor Browser folder. On Linux, there is no default location, " +"however the folder will be named \"tor-browser_en-US\" if you are running " +"the English Tor Browser." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "* Delete the Tor Browser folder." +msgstr "" + +#: https//tb-manual.torproject.org/uninstalling/ +#: (content/uninstalling/contents+en.lrtopic.body) +msgid "" +"Note that your operating system’s standard \"Uninstall\" utility is not " +"used." +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.title) +msgid "KNOWN ISSUES" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "" +"* Tor needs your system clock (and your time zone) set to the correct time." +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "" +"* The following firewall software have been known to interfere with Tor and " +"may need to be temporarily disabled:" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "* Webroot SecureAnywhere" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "* Kaspersky Internet Security 2012" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "* Sophos Antivirus for Mac" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "* Microsoft Security Essentials" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "" +"* Videos that require Adobe Flash are unavailable. Flash is disabled for " +"security reasons." +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "* Tor can not use a bridge if a proxy is set." +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "" +"* The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to " +"ensure that each software build is exactly reproducible." +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "" +"* To run Tor Browser on Ubuntu, users need to execute a shell script. Open " +"\"Files\" (Unity's explorer), open Preferences → Behavior Tab → Set \"Run " +"executable text files when they are opened\" to \"Ask every time\", then " +"click OK." +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "" +"* Tor Browser can also be started from the command line by running the " +"following command from inside the Tor Browser directory:" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "./start-tor-browser.desktop" +msgstr "" + +#: https//tb-manual.torproject.org/known-issues/ +#: (content/known-issues/contents+en.lrtopic.body) +msgid "" +"* BitTorrent in specific is [not anonymous over " +"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.title) +msgid "MAKE TOR BROWSER PORTABLE" +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.description) +msgid "How to install Tor Browser onto removable media" +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"If preferred, Tor Browser may be made portable by extracting it from its " +"archive directly onto removable media such as a USB stick or SD card." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"It is recommended to use writable media so that Tor Browser can be updated " +"as required." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"1. Plug in your removable media and format it. Any filesystem type will " +"work." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"2. Navigate to the Tor Browser [download " +"page](https://torproject.org/download)." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"3. Download the Windows `.exe` file and save it directly to your media." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"4. (Recommended) Verify the [files " +"signature](https://support.torproject.org/tbb/how-to-verify-signature/)." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"5. When the download is complete, click the `.exe` file and begin the " +"installation process." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"6. When the installer asks where to install Tor Browser, select your " +"removable media." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"1. Plug in your removable media and format it. You *must* use macOS Extended" +" (Journaled) format." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "3. Download the macOS `.dmg` file and save it directly to your media." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"5. When the download is complete, click the `.dmg` file and begin the " +"installation process." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"3. Download the Linux `.tar.xz` file and save it directly to your media." +msgstr "" + +#: https//tb-manual.torproject.org/make-tor-portable/ +#: (content/make-tor-portable/contents+en.lrtopic.body) +msgid "" +"5. When the download is complete, extract the archive onto the media as " +"well." +msgstr "" + +#: lego/templates/banner.html:2 lego/templates/banner.html:4 +#: templates/banner.html:2 templates/banner.html:4 +msgid "Close banner" +msgstr "" + +#: lego/templates/banner.html:10 templates/banner.html:10 +msgid "Tracking, surveillance, and censorship are widespread online." +msgstr "" + +#: lego/templates/banner.html:14 templates/banner.html:14 +msgid "TAKE BACK THE INTERNET WITH TOR" +msgstr "" + +#: lego/templates/banner.html:18 templates/banner.html:18 +msgid "DONATE NOW" +msgstr "" + +#: lego/templates/banner.html:19 templates/banner.html:19 +msgid "Give today, and Mozilla will match your donation." +msgstr "" + +#: lego/templates/footer.html:9 lego/templates/footer.html:18 +#: lego/templates/navbar.html:74 templates/footer.html:9 +#: templates/footer.html:18 templates/navbar.html:74 +msgid "Download Tor Browser" +msgstr "" + +#: lego/templates/footer.html:10 templates/footer.html:10 +msgid "" +"Download Tor Browser to experience real private browsing without tracking, " +"surveillance, or censorship." +msgstr "" + +#: lego/templates/footer.html:27 templates/footer.html:27 +msgid "Our mission:" +msgstr "" + +#: lego/templates/footer.html:28 templates/footer.html:28 +msgid "" +"To advance human rights and freedoms by creating and deploying free and open" +" source anonymity and privacy technologies, supporting their unrestricted " +"availability and use, and furthering their scientific and popular " +"understanding." +msgstr "" + +#: lego/templates/footer.html:49 lego/templates/navbar.html:17 +#: templates/footer.html:49 templates/navbar.html:17 +msgid "Donate" +msgstr "" + +#: lego/templates/footer.html:49 lego/templates/navbar.html:17 +#: templates/footer.html:49 templates/navbar.html:17 +msgid "Donate Now" +msgstr "" + +#: lego/templates/footer.html:54 templates/footer.html:54 +msgid "Subscribe to our Newsletter" +msgstr "" + +#: lego/templates/footer.html:55 templates/footer.html:55 +msgid "Get monthly updates and opportunities from the Tor Project:" +msgstr "" + +#: lego/templates/footer.html:56 templates/footer.html:56 +msgid "Sign up" +msgstr "" + +#: lego/templates/footer.html:75 templates/footer.html:75 +#, python-format +msgid "" +"Trademark, copyright notices, and rules for use by third parties can be " +"found in our %(link_to_faq)s" +msgstr "" + +#: lego/templates/navbar.html:21 templates/navbar.html:21 +msgid "Menu" +msgstr "" + +#: lego/templates/search.html:5 templates/search.html:5 +msgid "Search" +msgstr "" + +#: lego/templates/secure-connections.html:1 +#: templates/secure-connections.html:1 +msgid "" +"The following visualization shows what information is visible to " +"eavesdroppers with and without Tor Browser and HTTPS encryption:" +msgstr "" + +#: lego/templates/secure-connections.html:4 +#: templates/secure-connections.html:4 +msgid "" +"Click the “Tor” button to see what data is visible to observers when you're " +"using Tor. The button will turn green to indicate that Tor is on." +msgstr "" + +#: lego/templates/secure-connections.html:5 +#: templates/secure-connections.html:5 +msgid "" +"Click the “HTTPS” button to see what data is visible to observers when " +"you're using HTTPS. The button will turn green to indicate that HTTPS is on." +msgstr "" + +#: lego/templates/secure-connections.html:6 +#: templates/secure-connections.html:6 +msgid "" +"When both buttons are green, you see the data that is visible to observers " +"when you are using both tools." +msgstr "" + +#: lego/templates/secure-connections.html:7 +#: templates/secure-connections.html:7 +msgid "" +"When both buttons are grey, you see the data that is visible to observers " +"when you don't use either tool." +msgstr "" + +#: lego/templates/secure-connections.html:11 +#: templates/secure-connections.html:11 +msgid "HTTPS" +msgstr "" + +#: lego/templates/secure-connections.html:15 +#: lego/templates/secure-connections.html:65 +#: templates/secure-connections.html:15 templates/secure-connections.html:65 +msgid "Tor" +msgstr "" + +#: lego/templates/secure-connections.html:32 +#: templates/secure-connections.html:32 +msgid "POTENTIALLY VISIBLE DATA" +msgstr "" + +#: lego/templates/secure-connections.html:37 +#: templates/secure-connections.html:37 +msgid "Site.com" +msgstr "" + +#: lego/templates/secure-connections.html:40 +#: templates/secure-connections.html:40 +msgid "The site being visited." +msgstr "" + +#: lego/templates/secure-connections.html:44 +#: templates/secure-connections.html:44 +msgid "user / pw" +msgstr "" + +#: lego/templates/secure-connections.html:47 +#: templates/secure-connections.html:47 +msgid "Username and password used for authentication." +msgstr "" + +#: lego/templates/secure-connections.html:51 +#: templates/secure-connections.html:51 +msgid "data" +msgstr "" + +#: lego/templates/secure-connections.html:54 +#: templates/secure-connections.html:54 +msgid "Data being transmitted." +msgstr "" + +#: lego/templates/secure-connections.html:58 +#: templates/secure-connections.html:58 +msgid "location" +msgstr "" + +#: lego/templates/secure-connections.html:61 +#: templates/secure-connections.html:61 +msgid "" +"Network location of the computer used to visit the website (the public IP " +"address)." +msgstr "" + +#: lego/templates/secure-connections.html:68 +#: templates/secure-connections.html:68 +msgid "Whether or not Tor is being used." +msgstr "" + +#: templates/layout.html:5 +msgid "" +"Defend yourself against tracking and surveillance. Circumvent censorship." +msgstr "" + +#: templates/layout.html:11 +msgid "Tor Project | Tor Browser Manual" +msgstr "" + +#: templates/sidenav.html:4 templates/sidenav.html:35 +msgid "Topics" +msgstr "" + +#: templates/macros/topic.html:22 +msgid "Contributors to this page:" +msgstr "" + +#: templates/macros/topic.html:24 +msgid "Edit this page" +msgstr "" + +#: templates/macros/topic.html:25 +msgid "Suggest Feedback" +msgstr "" + +#: templates/macros/topic.html:26 +msgid "Permalink" +msgstr ""

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit c0d757fb19767c6403487d7dc5143c272ac57808 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 11:50:13 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ms.po | 122 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 102 insertions(+), 20 deletions(-) diff --git a/contents+ms.po b/contents+ms.po index 92ccb7fe6..116dec6bf 100644 --- a/contents+ms.po +++ b/contents+ms.po @@ -1314,6 +1314,14 @@ msgid "" " does not clear any private information or unlink your activity, nor does it" " affect your current connections to other websites." msgstr "" +"Pilihan ini berguna sekiranya [geganti keluar](/about/#how-tor-works) yang " +"anda guna tidak berupaya menyambung ke laman sesawang yang dikehendaki, atau" +" tidak dimuatkan dengan baik. Memilihnya akan menyebabkan tab atau tetingkap" +" aktif-semasa dimuat semula dengan litar Tor baharu. Lain-lain tab dan " +"tetingkap daripada laman sesawang yang sama akan menggunakan litar baharu " +"sebaik ia dimuatkan semula. Pilihan ini tidak mengosongkan apa-apa maklumat " +"peribadi atau menyahpaut aktiviti anda, juga tidak memberi kesan terhadap " +"sambungan semasa anda dengan laman sesawang lain." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1369,6 +1377,9 @@ msgid "" "so you do not need to worry about [connecting over HTTPS](/secure-" "connections)." msgstr "" +"* Semua trafik antara para pengguna Tor dengan perkhidmatan onion adalah " +"disulitkan dari awal hingga akhir, jadi anda tidak perlu risau berkenaan " +"[penyambungan melalui HTTPS](/secure-connections)." #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1386,7 +1397,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### BAGAIMANA HENDAK MENCAPAI PERKHIDMATAN ONION" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1419,7 +1430,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### TROUBLESHOOTING" -msgstr "" +msgstr "### PENCARISILAPAN" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1449,11 +1460,14 @@ msgid "" "You can also ensure that you're able to access other onion services by " "connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)." msgstr "" +"Anda boleh memastikan dapat mencapai lain-lain perkhidmatan onion dengan " +"menyambung ke [Perkhidmatan Onion " +"DuckDuckGo's](http://3g2upl4pq6kufc4m.onion/)." #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.title) msgid "SECURE CONNECTIONS" -msgstr "" +msgstr "SAMBUNGAN SELAMAT" #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.description) @@ -1483,7 +1497,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.title) msgid "SECURITY SETTINGS" -msgstr "" +msgstr "TETAPAN KESELAMATAN" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.description) @@ -1496,6 +1510,8 @@ msgid "" "By default, Tor Browser protects your security by encrypting your browsing " "data." msgstr "" +"Secara lalai, Pelayar Tor melindungi keselamatan anda dengan menyulitkan " +"data pelayaran anda." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1503,6 +1519,9 @@ msgid "" "You can further increase your security by choosing to disable certain web " "features that can be used to attack your security and anonymity." msgstr "" +"Anda boleh lanjutkan tahap keselamatan anda dengan melumpuhkan beberapa " +"fitur sesawang yang boleh digunakan untuk menyerang keselamatan dan " +"keawanamaan anda." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1510,6 +1529,8 @@ msgid "" "You can do this by increasing Tor Browser's Security Settings in the shield " "menu." msgstr "" +"Anda boleh membuatnya dengan tingkatkan Tetapan Keselamatan Pelayar Tor di " +"dalam menu perisai." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1518,11 +1539,14 @@ msgid "" "functioning properly, so you should weigh your security needs against the " "degree of usability you require." msgstr "" +"Apabila tahap keselamatan Pelayar Tor ditingkatkan, sesetengah laman " +"sesawang tidak akan berfungsi dengan baik, jadi anda perlu tentukan tahap " +"keselamatan yang sesuai dengan kadar kebolehgunaan yang diperlukan." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### ACCESSING THE SECURITY SETTINGS" -msgstr "" +msgstr "### MENCAPAI TETAPAN KESELAMATAN" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1530,6 +1554,8 @@ msgid "" "The Security Settings can be accessed by clicking the Shield icon next to " "the Tor Browser URL bar." msgstr "" +"Tetapan Keselamatan boleh dicapai dengan mengklik ikon Perisai di sebelah " +"palang URL Pelayar Tor." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1537,6 +1563,8 @@ msgid "" "To view and adjust your Security Settings, click the 'Advanced Security " "Settings...' button in the shield menu." msgstr "" +"Untuk melihat dan melaras Tetapan Keselamatan anda, klik butang 'Tetapan " +"Keselamatan Lanjutan...' dalam menu perisai." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1544,11 +1572,13 @@ msgid "" "<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" "anim.gif\">" msgstr "" +"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" +"anim.gif\">" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### SECURITY LEVELS" -msgstr "" +msgstr "### TAHAP-TAHAP KESELAMATAN" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1557,6 +1587,10 @@ msgid "" "disable or partially disable certain browser features to protect against " "possible attacks." msgstr "" +"Dengan meningkatkan Tahap Keselamatan di dalam Tetapan Keselamatan Pelayar " +"Tor akan lumpuhkan atau separa-lumpuhkan beberapa fitur pelayar. Ia " +"bertujuan untuk melindungi anda terhadap kemungkinan-kemungkinan serangan " +"yang boleh berlaku." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1564,6 +1598,8 @@ msgid "" "You can enable these settings again at any time by adjusting your Security " "Level." msgstr "" +"Anda boleh benarkan tetapan ini kembali pada bila-bila masa dengan melaras " +"Tahap Keselamatan anda." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1571,21 +1607,24 @@ msgid "" "<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" "safest.png\">" msgstr "" +"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-" +"safest.png\">" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "###### Standard" -msgstr "" +msgstr "###### Piawai" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "* At this level, all Tor Browser and website features are enabled." msgstr "" +"Pada tahap ini, semua fitur pelayar Tor dan laman sesawang dibenarkan." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "###### Safer" -msgstr "" +msgstr "###### Lebih Selamat" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1593,6 +1632,9 @@ msgid "" "* This level disables website features that are often dangerous. This may " "cause some sites to lose functionality." msgstr "" +"* Pada tahap ini fitur-fitur laman sesawang yang dilumpuhkan biasanya " +"merbahaya. Sebaliknya ia boleh menyebabkan beberapa laman kehilangan " +"kefungsiannya." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1601,11 +1643,14 @@ msgid "" "fonts and math symbols are disabled; audio and video (HTML5 media) are " "click-to-play." msgstr "" +"* Skrip Java dilumpuhkan pada semua laman bukan-[HTTPS](/security-settings);" +" sesetengah fon dan simbol matematik juga dilumpuhkan; audio dan video " +"(media HTML5 media) bersifat klik-untuk-dimainkan atau click-to-play." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "###### Safest" -msgstr "" +msgstr "###### Paling Selamat" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1613,11 +1658,14 @@ msgid "" "* This level only allows website features required for static sites and " "basic services." msgstr "" +"* Pada tahap ini hanya benarkan fitur-fitur laman sesawang yang diperlukan " +"untuk laman-laman statik dan perkhidmatan asas." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "These changes affect images, media, and scripts." msgstr "" +"Perubahan-perubahan ini akan memberi kesan terhadap imej, media, dan skrip." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1626,11 +1674,14 @@ msgid "" "symbols, and images are disabled; audio and video (HTML5 media) are click-" "to-play." msgstr "" +"* Skrip Java dilumpuhkan pada semua laman; sesetengah fon, simbol matematik " +"dan imej juga dilumpuhkan; audio dan video (media HTML5 media) bersifat " +"klik-untuk-dimainkan atau click-to-play." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.title) msgid "UPDATING" -msgstr "" +msgstr "PENGEMASKINIAN" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.description) @@ -1664,7 +1715,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER AUTOMATICALLY" -msgstr "" +msgstr "### MENGEMASKINI PELAYAR TOR SECARA AUTOMATIK" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1677,11 +1728,14 @@ msgid "" "When you are prompted to update Tor Browser, click on hamburger menu (main " "menu), then select “Restart to update Tor browser”." msgstr "" +"Ketika anda dimaklumkan untuk mengemaskini Pelayar Tor, klik pada menu " +"hamburger (menu utama), kemudian pilih \"Mula semula untuk mengemaskini " +"pelayar Tor\"." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "<img width=\"500\" src=\"../../static/images/update4.png\" />" -msgstr "" +msgstr "<img width=\"500\" src=\"../../static/images/update4.png\" />" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1689,11 +1743,14 @@ msgid "" "Wait for the update to download and install, then Tor Browser will restart " "itself. You will now be running the latest version." msgstr "" +"Tunggu sehingga kemaskini dimuat turun dan dipasangkan, kemudian Pelayar Tor" +" dimulakan semula sendiri. Kini anda boleh menjalankan versinya yang " +"terbaharu." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER MANUALLY" -msgstr "" +msgstr "### MENGEMASKINI PELAYAR TOR MANUAL" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1710,6 +1767,8 @@ msgid "" "Remove Tor Browser from your system by deleting the folder that contains it " "(see the [Uninstalling](/uninstalling) section for more information)." msgstr "" +"Buang Pelayar Tor dalam sistem anda dengan memadam folder yang dikandungnya " +"(sila rujuk seksyen [Menyahpasang](/uninstalling) untuk maklumat lanjut)." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1717,11 +1776,13 @@ msgid "" "Visit https://www.torproject.org/download/ and download a copy of the latest" " Tor Browser release, then install it as before." msgstr "" +"Lawati https://www.torproject.org/prdownload/ dan muat turun satu salinan " +"keluaran Pelayar Tor yang terkini, kemudian pasang ia seperti biasa." #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.title) msgid "TROUBLESHOOTING" -msgstr "" +msgstr "PENCARISILAPAN" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.description) @@ -1744,7 +1805,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### QUICK FIXES" -msgstr "" +msgstr "### PEMBAIKAN PANTAS" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1804,7 +1865,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### IS YOUR CONNECTION CENSORED?" -msgstr "" +msgstr "### ADAKAH SAMBUNGAN ANDA DITAPIS?" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1813,11 +1874,14 @@ msgid "" "censoring connections to the Tor network. Read the " "[Circumvention](/circumvention) section for possible solutions." msgstr "" +"Jika anda masih gagal bersambung, Penyedia Perkhidmatan Internet anda " +"mungkin telah menyekat sambungan ke rangkaian Tor. Sila rujuk seksyen " +"[Pemintasan](/circumvention) untuk mendapatkan penyelesaian lain." #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### KNOWN ISSUES" -msgstr "" +msgstr "### MASALAH-MASALAH YANG DIKETAHUI" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1826,11 +1890,15 @@ msgid "" "but not yet fixed. Please check the [Known Issues](/known-issues) page to " "see if the problem you are experiencing is already listed there." msgstr "" +"Pelayar Tor sentiasa dalam proses pembangunan, dan terdapat beberapa masalah" +" timbul yang dikenal pasti tetapi tidak sempat dibaiki. Sila periksa " +"[Masalah-Masalah Diketahui](/known-issues) untuk mengetahui sama ada masalah" +" yang anda hadapi sudah tercatat dalam senarai tersebut." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.title) msgid "PLUGINS, ADD-ONS AND JAVASCRIPT" -msgstr "" +msgstr "PEMALAM, TAMBAHAN DAN SKRIP JAVA" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.description) @@ -1841,7 +1909,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### FLASH PLAYER" -msgstr "" +msgstr "### PEMAIN FLASH" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1875,7 +1943,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### JAVASCRIPT" -msgstr "" +msgstr "### SKRIP JAVA" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1899,6 +1967,11 @@ msgid "" "control the JavaScript (and other scripts) that runs on individual web " "pages, or block it entirely." msgstr "" +"Pelayar Tor disertakan dengan tambahan yang dikenali sebagai NoScript. Ia " +"boleh dicapai melalui 'Keutamaan' pada menu hamburger (menu utama), kemudian" +" pilih 'Suai' dan seret ikon \"S\" ke bahagian kanan-atas tetingkap. Dengan " +"NoScript anda boleh mengawal Skrip Java (dan lain-lain skrip) yang ada pada " +"halaman sesawang secara individu, atau menyekatnya sepenuhnya." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1910,6 +1983,13 @@ msgid "" " displaying correctly, so Tor Browser’s default setting is to allow all " "websites to run scripts in \"Standard\" mode." msgstr "" +"Pengguna yang mahukan keselamatan tahap tinggi ketika melayari sesawang " +"boleh menetapkan [Pelungsur Keselamatan](/security-slider) ke tahap \"Lebih" +" Selamat\" (yang dapat melumpuhkan Skrip Java untuk laman sesawang bukan-" +"HTTPS) atau \"Paling Selamat\" (yang bertindak kepada semua laman sesawang " +"yang ada). Namun begitu, melumpuhkan Skrip Java akan menghalang banyak laman" +" sesawang dipaparkan dengan betul, jadi tetapan lalai Pelayar Tor " +"membenarkan semua laman sesawang menjalankan skripnya dalam mod \"Piawai\"." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -2185,6 +2265,8 @@ msgid "" "* BitTorrent in specific is [not anonymous over " "Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)." msgstr "" +"* BitTorrent sebenarnya [tidak diawanama melalui " +"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.title)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 00e30a68bce6ae630c56ba7f040ec6429c2fa604 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 11:23:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ms.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+ms.po b/contents+ms.po index 7e5b0a938..3e0c99087 100644 --- a/contents+ms.po +++ b/contents+ms.po @@ -2797,6 +2797,9 @@ msgid "" "* Note the Library folder is hidden on newer versions of macOS. To navigate " "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu." msgstr "" +"* Perhatian, folder Library disembunyikan pada versi terbaharu macOS. Untuk " +"menavigasi ke folder ini melalui Finder, pilih \"Go to Folder...\" dalam " +"menu \"Go\"." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit f4487c33faceed8b18ac39792935855d74b6f684 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 11:20:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ms.po | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/contents+ms.po b/contents+ms.po index d1b5056cc..92ccb7fe6 100644 --- a/contents+ms.po +++ b/contents+ms.po @@ -1327,7 +1327,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.title) msgid "ONION SERVICES" -msgstr "" +msgstr "PERKHIDMATAN ONION" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.description) @@ -2007,6 +2007,9 @@ msgid "" "* Note the Library folder is hidden on newer versions of macOS. To navigate " "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu." msgstr "" +"* Perhatian, folder Library disembunyikan pada versi terbaharu macOS. Untuk " +"menavigasi ke folder ini melalui Finder, pilih \"Go to Folder...\" dalam " +"menu \"Go\"." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2014,12 +2017,16 @@ msgid "" "<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go " "to folder menu option.\">" msgstr "" +"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go " +"to folder menu option.\">" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "" "* Then type \"~/Library/Application Support/\" in the window and click Go." msgstr "" +"* Kemudian taip \"~/Library/Application Support/\" dalam tetingkap dan klik" +" Go." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2027,11 +2034,14 @@ msgid "" "<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" " "alt=\"Go to folder window.\">" msgstr "" +"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" " +"alt=\"Go to folder window.\">" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "* Locate the TorBrowser-Data folder and move it to Trash." msgstr "" +"* Cari kedudukan folder TorBrowser-Data dan alih ia ke dalam Tong Sampah." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2041,11 +2051,15 @@ msgid "" "`~/Library/Application Support/` folder, but in the same folder where you " "installed Tor Browser." msgstr "" +"Perhatian jika anda tidak memasang Pelayar Tor dalam lokasi lalai (folder " +"Aplikasi), maka folder TorBrowser-Data tidak berada di dalam folder " +"~/Library/Application Support/`, tetapi ditempatkan dalam folder yang sama " +"dengan tempat asal Pelayar Tor dipasang." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "On Linux:" -msgstr "" +msgstr "Pada Linux:" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2054,11 +2068,14 @@ msgid "" "however the folder will be named \"tor-browser_en-US\" if you are running " "the English Tor Browser." msgstr "" +"1. Cari folder Pelayar Tor anda. Pada Linux, tiada lokasi lalai, oleh itu " +"folder berkenaan biasanya bernama \"tor-browser_en-US\" sekiranya anda " +"menggunakan Pelayar Tor dalam bahasa Inggeris." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "* Delete the Tor Browser folder." -msgstr "" +msgstr "* Padam folder Pelayar Tor." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2066,11 +2083,13 @@ msgid "" "Note that your operating system’s standard \"Uninstall\" utility is not " "used." msgstr "" +"Perhatian Utiliti 'Uninstall\" piawai sistem pengoperasian anda tidak " +"digunakan." #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.title) msgid "KNOWN ISSUES" -msgstr "" +msgstr "MASALAH-MASALAH YANG DIKETAHUI" #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.body)

1 0

[collector/master] Stop checking and reloading configuration file.
by karsten＠torproject.org 22 Nov '19

22 Nov '19

commit de10fcd5b3bc9d29c0e2a011728e34fbe9b0fd5d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 13:03:25 2019 +0100 Stop checking and reloading configuration file. Removes a deprecation warning and simplifies code. Implements #32554. --- CHANGELOG.md | 4 ++ .../org/torproject/metrics/collector/Main.java | 2 +- .../metrics/collector/conf/Configuration.java | 59 +++------------------- .../metrics/collector/cron/CollecTorMain.java | 28 +--------- src/main/resources/collector.properties | 9 ---- .../org/torproject/metrics/collector/MainTest.java | 6 +-- .../metrics/collector/conf/ConfigurationTest.java | 58 --------------------- 7 files changed, 16 insertions(+), 150 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5293207..b55d7a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 1.1?.? - 2019-1?-?? + * Medium changes + - Give up on periodically checking the configuration file for + updates and reloading it in case of changes. + # Changes in version 1.13.1 - 2019-11-11 diff --git a/src/main/java/org/torproject/metrics/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java index 3438bda..861567f 100644 --- a/src/main/java/org/torproject/metrics/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -85,7 +85,7 @@ public class Main { writeDefaultConfig(confPath); return; } else { - conf.setWatchableSourceAndLoad(confPath); + conf.loadAndCheckConfiguration(confPath); } Scheduler.getInstance().scheduleModuleRuns(collecTorMains, conf); } catch (ConfigurationException ce) { diff --git a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java index 4bb581b..cfdd9c8 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java @@ -3,85 +3,40 @@ package org.torproject.metrics.collector.conf; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.nio.file.attribute.FileTime; import java.util.EnumSet; -import java.util.Observable; import java.util.Properties; import java.util.Set; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; /** * Initialize configuration with defaults from collector.properties, * unless a configuration properties file is available. */ -public class Configuration extends Observable implements Cloneable { - - private static final Logger logger = LoggerFactory.getLogger( - Configuration.class); - - private final ScheduledExecutorService scheduler = - Executors.newScheduledThreadPool(1); +public class Configuration { public static final String FIELDSEP = ","; private final Properties props = new Properties(); - private Path configurationFile; - private FileTime ft; /** - * Load the configuration from the given path and start monitoring changes. - * If the file was changed, re-read and inform all observers. + * Load the configuration from the given path. */ - public void setWatchableSourceAndLoad(final Path confPath) throws + public void loadAndCheckConfiguration(Path confPath) throws ConfigurationException { - this.configurationFile = confPath; - try { - ft = Files.getLastModifiedTime(confPath); - reload(); + try (FileInputStream fis + = new FileInputStream(confPath.toFile())) { + this.props.load(fis); anythingActivated(); } catch (IOException e) { - throw new ConfigurationException("Cannot watch configuration file. " + throw new ConfigurationException("Cannot load configuration file. " + "Reason: " + e.getMessage(), e); } - if (this.getBool(Key.RunOnce)) { // no need to watch - return; - } - this.scheduler.scheduleAtFixedRate(() -> { - logger.trace("Check configuration file."); - try { - FileTime ftNow = Files.getLastModifiedTime(confPath); - if (ft.compareTo(ftNow) < 0) { - logger.info("Configuration file was changed."); - reload(); - setChanged(); - notifyObservers(null); - } - ft = ftNow; - } catch (Throwable th) { // Catch all and keep running. - logger.error("Cannot reload configuration file.", th); - } - }, 5, 5, TimeUnit.SECONDS); - } - - private void reload() throws IOException { - props.clear(); - try (FileInputStream fis - = new FileInputStream(configurationFile.toFile())) { - props.load(fis); - } } private void anythingActivated() throws ConfigurationException { diff --git a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java index cd8e0ee..09796e3 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java @@ -19,31 +19,24 @@ import java.nio.file.Path; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Observable; -import java.util.Observer; import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; public abstract class CollecTorMain extends SyncManager - implements Callable<Object>, Observer, Runnable { + implements Callable<Object>, Runnable { private static final Logger logger = LoggerFactory.getLogger( CollecTorMain.class); private static final long LIMIT_MB = 200; public static final String SOURCES = "Sources"; - private final AtomicBoolean newConfigAvailable = new AtomicBoolean(false); protected Configuration config = new Configuration(); - private Configuration newConfig; - protected final Map<String, Class<? extends Descriptor>> mapPathDescriptors = new HashMap<>(); public CollecTorMain(Configuration conf) { this.config.putAll(conf.getPropertiesCopy()); - conf.addObserver(this); } /** @@ -51,16 +44,6 @@ public abstract class CollecTorMain extends SyncManager */ @Override public final void run() { - synchronized (this) { - if (newConfigAvailable.get()) { - logger.info("Module {} is using the new configuration.", module()); - synchronized (newConfig) { - config.clear(); - config.putAll(newConfig.getPropertiesCopy()); - newConfigAvailable.set(false); - } - } - } try { if (!isSyncOnly()) { logger.info("Starting {} module of CollecTor.", module()); @@ -104,15 +87,6 @@ public abstract class CollecTorMain extends SyncManager return null; } - @Override - public synchronized void update(Observable obs, Object obj) { - newConfigAvailable.set(true); - if (obs instanceof Configuration) { - newConfig = (Configuration) obs; - logger.info("Module {} just received a new configuration.", module()); - } - } - /** * Module specific code goes here. */ diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 65e0f99..6422120 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -1,9 +1,6 @@ ######## Collector Properties # ######## Run Configuration ######## -## This part of the configuration cannot be updated at runtime! -## Changes require a restart in order to become effective. -## # If RunOnce=true, the activated modules below will only be # run one time and without any delay. # Make sure only to run non-interfering modules together. @@ -66,12 +63,6 @@ BridgedbMetricsPeriodMinutes = 480 # offset in minutes since the epoch and BridgedbMetricsOffsetMinutes = 340 -########################################## -## All below can be changed at runtime. -##### -## Every five secands the running CollecTor checks this file for changes. -## When the file was modified, all activated modules are informed and will -## use the new configuration in their next scheduled run. ######## General Properties ######## # The URL of this instance. This will be the base URL # written to index.json, i.e. please change this to the mirrors url! diff --git a/src/test/java/org/torproject/metrics/collector/MainTest.java b/src/test/java/org/torproject/metrics/collector/MainTest.java index 820cfb6..f3f2500 100644 --- a/src/test/java/org/torproject/metrics/collector/MainTest.java +++ b/src/test/java/org/torproject/metrics/collector/MainTest.java @@ -43,10 +43,10 @@ public class MainTest { Configuration conf = new Configuration(); thrown.expect(ConfigurationException.class); thrown.expectMessage(Matchers - .containsString("Cannot watch configuration file.")); + .containsString("Cannot load configuration file.")); // dir instead of file; the following should throw a ConfigurationException - conf.setWatchableSourceAndLoad(tmpFolder.toPath()); + conf.loadAndCheckConfiguration(tmpFolder.toPath()); } private void checkCleanEnv(File conf) { @@ -210,7 +210,7 @@ public class MainTest { thrown.expectMessage(Matchers.containsString("Nothing is activated!")); // no module activated; the following should throw a ConfigurationException - conf.setWatchableSourceAndLoad(confPath); + conf.loadAndCheckConfiguration(confPath); } } diff --git a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index e01aba2..6f5d16c 100644 --- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -8,25 +8,16 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.torproject.metrics.collector.MainTest; -import org.torproject.metrics.collector.cron.CollecTorMain; -import org.torproject.metrics.collector.cron.Dummy; - -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import java.io.ByteArrayInputStream; import java.io.File; -import java.lang.reflect.Field; import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.Arrays; import java.util.Random; import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; public class ConfigurationTest { @@ -167,53 +158,4 @@ public class ConfigurationTest { conf.setProperty(Key.BridgeDescriptorMappingsLimit.name(), "y7"); conf.getInt(Key.BridgeDescriptorMappingsLimit); } - - @Test(expected = ConfigurationException.class) - public void testSetWatchableSourceAndLoad() throws Exception { - Configuration conf = new Configuration(); - conf.setWatchableSourceAndLoad(Paths.get("/tmp/phantom.path")); - } - - @Ignore("This test takes 13 seconds, which is too long.") - @Test() - public void testConfigChange() throws Exception { - Configuration conf = new Configuration(); - final AtomicBoolean called = new AtomicBoolean(false); - conf.addObserver((obs, obj) -> called.set(true)); - File confFile = tmpf.newFile("empty"); - Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true") - .getBytes()); - conf.setWatchableSourceAndLoad(confFile.toPath()); - MainTest.waitSec(1); - confFile.setLastModified(System.currentTimeMillis()); - MainTest.waitSec(6); - assertTrue("Update was not called.", called.get()); - called.set(false); - MainTest.waitSec(6); - assertFalse("Update was called.", called.get()); - } - - @Test() - public void testConfigUnreadable() throws Exception { - Configuration conf = new Configuration(); - final AtomicBoolean called = new AtomicBoolean(false); - conf.addObserver((obs, obj) -> called.set(true)); - File confFile = tmpf.newFile("empty"); - Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true") - .getBytes()); - conf.setWatchableSourceAndLoad(confFile.toPath()); - MainTest.waitSec(1); - confFile.delete(); - conf.setProperty(Key.RunOnce.name(), "false"); - final Dummy dummy = new Dummy(conf); - tmpf.newFolder("empty"); - MainTest.waitSec(6); - assertFalse("Update was called.", called.get()); - assertEquals(0, conf.size()); - Field confField = CollecTorMain.class.getDeclaredField("config"); - confField.setAccessible(true); - int size = ((Configuration)(confField.get(dummy))).size(); - assertEquals(2, size); - } - }

1 0