tor-commits

Download

tor-commits@lists.torproject.org

April 2019

18 participants
3314 discussions

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 29 Apr '19

29 Apr '19

commit 83f10c77dabc242c3e28740a4336741ff564b22e Merge: 88d6c2568 593d29920 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 29 10:15:11 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 Makefile.am | 2 +- changes/bug30263 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 4d2673a752809ba04ab745d03e718afa37d272a8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 14:15:44 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index eff91532a..0be63f13a 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1017,8 +1017,8 @@ msgid "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." msgstr "" -"Le Projet Tor est un organisme états-unien sans but lucratif 501(c)(3) situé" -" à Boston, Massachusetts." +"Le Projet Tor est un organisme sans but lucratif 501(c)(3) situé à Boston, " +"Massachusetts." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:76 msgid "It was founded in 2006."

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 90afab867a739c9e8afc4e7ab1280dd1c49954f4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 14:15:37 2019 +0000 Update translations for donatepages-messagespot --- locale/fr/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index eff91532a..0be63f13a 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1017,8 +1017,8 @@ msgid "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." msgstr "" -"Le Projet Tor est un organisme états-unien sans but lucratif 501(c)(3) situé" -" à Boston, Massachusetts." +"Le Projet Tor est un organisme sans but lucratif 501(c)(3) situé à Boston, " +"Massachusetts." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:76 msgid "It was founded in 2006."

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 28369: stop shipping pingsender executable
by gk＠torproject.org 29 Apr '19

29 Apr '19

commit c1262822e77cf26780d240646bacd14a67e6c301 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 10 17:52:51 2019 +0200 Bug 28369: stop shipping pingsender executable --- browser/app/macbuild/Contents/MacOS-files.in | 1 - browser/installer/package-manifest.in | 4 ---- browser/installer/windows/nsis/shared.nsh | 1 - python/mozbuild/mozbuild/artifacts.py | 2 -- toolkit/components/telemetry/TelemetrySend.jsm | 17 +---------------- toolkit/components/telemetry/moz.build | 1 - 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in index bd87bc5116b7..cfa17eca813b 100644 --- a/browser/app/macbuild/Contents/MacOS-files.in +++ b/browser/app/macbuild/Contents/MacOS-files.in @@ -9,7 +9,6 @@ #if defined(MOZ_ASAN) || defined(MOZ_TSAN) /llvm-symbolizer #endif -/pingsender /pk12util /ssltunnel /webrtc-gtest diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ede92eca6e58..bc6082198b02 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -778,10 +778,6 @@ bin/libfreebl_32int64_3.so #endif #endif -; [ Ping Sender ] -; -@BINPATH@/pingsender@BIN_SUFFIX@ - @RESPATH@/components/dom_audiochannel.xpt ; Shutdown Terminator diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 4263f379db64..a0cd06cdae68 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -1337,7 +1337,6 @@ Push "xpcom.dll" Push "crashreporter.exe" Push "minidump-analyzer.exe" - Push "pingsender.exe" Push "updater.exe" Push "${FileMainEXE}" !macroend diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index 2afe9c43fcb0..b2d560a713c9 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -278,7 +278,6 @@ class LinuxArtifactJob(ArtifactJob): 'firefox/firefox', 'firefox/firefox-bin', 'firefox/minidump-analyzer', - 'firefox/pingsender', 'firefox/platform.ini', 'firefox/plugin-container', 'firefox/updater', @@ -363,7 +362,6 @@ class MacArtifactJob(ArtifactJob): 'libmozavutil.dylib', 'libmozavcodec.dylib', 'libsoftokn3.dylib', - 'pingsender', 'plugin-container.app/Contents/MacOS/plugin-container', 'updater.app/Contents/MacOS/org.mozilla.updater', # 'xpcshell', diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm index 00992ebaa786..249d142d82cf 100644 --- a/toolkit/components/telemetry/TelemetrySend.jsm +++ b/toolkit/components/telemetry/TelemetrySend.jsm @@ -1339,21 +1339,6 @@ var TelemetrySendImpl = { }, runPingSender(url, pingPath) { - if (AppConstants.platform === "android") { - throw Cr.NS_ERROR_NOT_IMPLEMENTED; - } - - const exeName = AppConstants.platform === "win" ? "pingsender.exe" - : "pingsender"; - - let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile); - exe.append(exeName); - - let process = Cc["@mozilla.org/process/util;1"] - .createInstance(Ci.nsIProcess); - process.init(exe); - process.startHidden = true; - process.noShell = true; - process.run(/* blocking */ false, [url, pingPath], 2); + throw Cr.NS_ERROR_NOT_IMPLEMENTED; }, }; diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index c36296a13cb7..3ddd8625def5 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -12,7 +12,6 @@ FINAL_LIBRARY = 'xul' DIRS = [ 'hybrid-content', - 'pingsender', ] DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 8147670012f5ba22f1eb22da52a2f3f84c733489 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 13:17:52 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+zh-CN.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 3fe11cb7b..1894223e1 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1630,14 +1630,14 @@ msgstr "如果 Tor 浏览器没有连接，那么可能比较简单。逐个尝 msgid "" "* Your computer’s system clock must be set correctly, or Tor will not be " "able to connect." -msgstr "* 您的计算机的系统始终必须正确设置，否则 Tor 无法连接。" +msgstr "* 您的计算机系统的时钟必须正确设置，否则洋葱路由无法连接。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.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 "* 确保没有 Tor 浏览器正在运行。如果您无法确认，请重启您的计算机。" +msgstr "* 确保没有其他 Tor 浏览器正在运行。如果您无法确认，请重启您的计算机。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1645,7 +1645,7 @@ 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 "* 请确认您电脑中所安装的杀毒软件不会干扰或阻挡洋葱路由的运行，若您不确定的话可能需要查阅杀毒软件的相关手册或说明文档。" +msgstr "* 请确认您电脑中所安装的杀毒软件不会阻挡洋葱路由的运行，若您不确定的话可能需要查阅杀毒软件的相关手册或说明文档。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1672,8 +1672,8 @@ msgid "" "censoring connections to the Tor network. Read the <a " "href=\"/circumvention\">Circumvention</a> section for possible solutions." msgstr "" -"* 如果您仍然无法连接上网，很有可能是因为您的网络服务供应商有使用会阻挡洋葱路由网络连接的网络过滤监控系统，请参考<a " -"href=\"circumvention\">回避</a>网页以了解可行的解决方式。" +"* 如果您仍然无法连接上网，很有可能是因为您的网络服务商有使用会阻挡洋葱路由网络连接的网络监控系统，请参考<a " +"href=\"circumvention\">规避</a>网页以了解可行的解决方法。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1747,7 +1747,7 @@ msgstr "* Tor 在已使用代理时无法使用一个网桥。" 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 "* Tor 浏览器的软件包日期被设定为 2000年1月1日00:00:00 UTC。这是为了确保软件包构建（编译）后的结果完全可重复。" +msgstr "* Tor 浏览器的软件包日期被设定为 2000年1月1日00:00:00 UTC。这是为了确保软件包构建后的结果完全可复建。" #: https//tb-manual.torproject.org/en-US/known-issues/ #: (content/known-issues/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 391e13b4a75b62c8434c616face1bd2946c3e05c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 13:17:45 2019 +0000 Update translations for tbmanual-contentspot --- contents+zh-CN.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 3fe11cb7b..1894223e1 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1630,14 +1630,14 @@ msgstr "如果 Tor 浏览器没有连接，那么可能比较简单。逐个尝 msgid "" "* Your computer’s system clock must be set correctly, or Tor will not be " "able to connect." -msgstr "* 您的计算机的系统始终必须正确设置，否则 Tor 无法连接。" +msgstr "* 您的计算机系统的时钟必须正确设置，否则洋葱路由无法连接。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.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 "* 确保没有 Tor 浏览器正在运行。如果您无法确认，请重启您的计算机。" +msgstr "* 确保没有其他 Tor 浏览器正在运行。如果您无法确认，请重启您的计算机。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1645,7 +1645,7 @@ 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 "* 请确认您电脑中所安装的杀毒软件不会干扰或阻挡洋葱路由的运行，若您不确定的话可能需要查阅杀毒软件的相关手册或说明文档。" +msgstr "* 请确认您电脑中所安装的杀毒软件不会阻挡洋葱路由的运行，若您不确定的话可能需要查阅杀毒软件的相关手册或说明文档。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1672,8 +1672,8 @@ msgid "" "censoring connections to the Tor network. Read the <a " "href=\"/circumvention\">Circumvention</a> section for possible solutions." msgstr "" -"* 如果您仍然无法连接上网，很有可能是因为您的网络服务供应商有使用会阻挡洋葱路由网络连接的网络过滤监控系统，请参考<a " -"href=\"circumvention\">回避</a>网页以了解可行的解决方式。" +"* 如果您仍然无法连接上网，很有可能是因为您的网络服务商有使用会阻挡洋葱路由网络连接的网络监控系统，请参考<a " +"href=\"circumvention\">规避</a>网页以了解可行的解决方法。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1747,7 +1747,7 @@ msgstr "* Tor 在已使用代理时无法使用一个网桥。" 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 "* Tor 浏览器的软件包日期被设定为 2000年1月1日00:00:00 UTC。这是为了确保软件包构建（编译）后的结果完全可重复。" +msgstr "* Tor 浏览器的软件包日期被设定为 2000年1月1日00:00:00 UTC。这是为了确保软件包构建后的结果完全可复建。" #: https//tb-manual.torproject.org/en-US/known-issues/ #: (content/known-issues/contents+en-US.lrtopic.body)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 36767382bceb15dd5c083443f13b42441202ed7b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 12:52:55 2019 +0000 Update translations for support-portal_completed --- contents+de.po | 86 +++++++++----------------------------------------- contents+es.po | 90 ++++++++++------------------------------------------ contents+ka.po | 90 ++++++++++------------------------------------------ contents+pt-BR.po | 94 +++++++++++-------------------------------------------- contents+tr.po | 90 +++++++++------------------------------------------- contents.pot | 88 +++++++++------------------------------------------ 6 files changed, 94 insertions(+), 444 deletions(-) diff --git a/contents+de.po b/contents+de.po index ada4d1a49..f8f2334df 100644 --- a/contents+de.po +++ b/contents+de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" @@ -2235,20 +2235,17 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Bitte beweist eine Position zugunsten digitaler Privatsphäre und " "Internetfreiheit und erlaubt den Zugang zu xyz.com über Tor." #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Danke.\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -2264,12 +2261,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Bei Verbindungsschwierigkeiten zu einem onion-Dienst, siehe <a " -"href=\"#onionservices-3\">Ich kann einen onion-Dienst nicht erreichen</a>" +"href=\"/#onionservices-3\">Ich kann einen onion-Dienst nicht erreichen</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2448,6 +2447,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "Wie kann ich den Tor-Browser herunterladen, wenn torproject.org blockiert " @@ -2455,6 +2456,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2903,6 +2906,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2992,69 +2997,6 @@ msgstr "" "z.B. der <a href=\"http://3g2upl4pq6kufc4m.onion\">Onion-Dienst von " "DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Bitte beweist eine Position zugunsten digitaler Privatsphäre und " -"Internetfreiheit und erlaubt den Zugang zu xyz.com über Tor." - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Bei Verbindungsschwierigkeiten zu einem onion-Dienst, siehe <a " -"href=\"/#onionservices-3\">Ich kann einen onion-Dienst nicht erreichen</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Wie kann ich Tor herunterladen, wenn torproject.org blockiert ist?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Wenn du Tor nicht über unsere <a " -"href=\"https://www.torproject.org\">Webseite</a> herunterladen " -"kannst, versuche mittels GetTor eine Kopie zu bekommen." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Damit Tor funktioniert, benötigt es eine korrekt eingestellte Uhr: Bitte " -"überprüfe deine Uhrzeit, Zeitzone und Datumseinstellungen." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+es.po b/contents+es.po index 3380856d2..a9f231fce 100644 --- a/contents+es.po +++ b/contents+es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -2248,17 +2248,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Por favor, ten una postura firme a favor de la privacidad digital y la " -"libertad de Internet, y permite a los usuarios de Tor acceder a xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Gracias.\"" +"Por favor, actúa en favor de la privacidad digital y la libertad de " +"Internet, y permite a los usuarios de Tor acceder a xyz.com. Gracias.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2279,12 +2276,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Si no puedes conectarte a un servicio cebolla, por favor mira <a " -"href=\"#onionservices-3\">¡no puedo entrar en X.onion!</a>" +"href=\"/#onionservices-3\">¡no puedo entrar en X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2464,11 +2463,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "¿Cómo descargo Tor Browser si torproject.org está bloqueada?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2918,6 +2921,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -3008,69 +3013,6 @@ msgstr "" "conectando al <a href=\"http://3g2upl4pq6kufc4m.onion\">servicio cebolla de " "DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Por favor, actúa en favor de la privacidad digital y la libertad de " -"Internet, y permite a los usuarios de Tor acceder a xyz.com. Gracias.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Si no puedes conectarte a un servicio cebolla, por favor mira <a " -"href=\"/#onionservices-3\">¡no puedo entrar en X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "¿Cómo descargo Tor si torproject.org está bloqueada?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Si no puedes descargar Tor a través de nuestro <a " -"href=\"https://www.torproject.org\">sitio web</a>, puedes obtener una" -" copia de Tor que se te entregará vía GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Recibida la celda NETINFO con tiempo sesgado " -"(OR:xxx.xx.x.xx:xxxx): Parece que nuestro reloj está atrasado 1 día, 0 " -"horas, 1 minutos, o que el suyo está adelantado." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor necesita un reloj preciso para funcionar: por favor, comprueba tus " -"ajustes de hora, zona horaria y fecha." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ka.po b/contents+ka.po index e9cdd9d3e..b755b9eaf 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Georgianization, 2019\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" @@ -2215,17 +2215,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "გთხოვთ, მხარი დაუჭიროთ პირადი მონაცემების ხელშეუხებლობასა და ინტერნეტის " -"თავისუფლებას და დართოთ Tor-ის მომხმარებლებს xyz.com საიტთან წვდომის ნება." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "გმადლობთ.“" +"თავისუფლებას და დართოთ Tor-ის მომხმარებლებს xyz.com საიტთან წვდომის ნება. " +"გმადლობთ.“" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2246,12 +2244,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "თუ ვერ ახერხებთ onion-მომსახურებასთან დაკავშირებას, გთხოვთ იხილოთ <a " -"href=\"#onionservices-3\">ვერ ვუკავშირდები X.onion-ს!</a>" +"href=\"/#onionservices-3\">ვერ ვუკავშირდები X.onion-ს!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2434,11 +2434,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "როგორ ჩამოვტვირთო Tor-ბრაუზერი თუ torproject.org შეზღუდულია?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2887,6 +2891,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2976,70 +2982,6 @@ msgstr "" " href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo</a>-ს Onion-" "მომსახურებასთან დაკავშირების მეშვეობით." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"გთხოვთ, მხარი დაუჭიროთ პირადი მონაცემების ხელშეუხებლობასა და ინტერნეტის " -"თავისუფლებას და დართოთ Tor-ის მომხმარებლებს xyz.com საიტთან წვდომის ნება. " -"გმადლობთ.“" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"თუ ვერ ახერხებთ onion-მომსახურებასთან დაკავშირებას, გთხოვთ იხილოთ <a " -"href=\"/#onionservices-3\">ვერ ვუკავშირდები X.onion-ს!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "როგორ ჩამოვტვირთო Tor თუ torproject.org შეზღუდულია?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"თუ ვერ ახერხებთ Tor-ის ჩამოტვირთვას ჩვენი <a " -"href=\"https://www.torproject.org\">ვებსაიტიდან</a>, მისი ასლის " -"მიღება შეგიძლიათ GetTor-ით." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor-ის მუშაობისთვის საჭიროა საათი გასწორებული იყოს: გთხოვთ, შეამოწმოთ თქვენი" -" დროის, სასაათე სარტყელისა და თარიღის პარამეტრები." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+pt-BR.po b/contents+pt-BR.po index fb442afbe..dc43ab85c 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Chacal E., 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" @@ -2233,17 +2233,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Por favor tenha uma posição forte em favor da privacidade digital e " -"liberdade na internet, e permita aos usuários do Tor acessarem xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Obrigado.\"" +"Por favor, mantenha uma posição firme em favor da privacidade digital e " +"liberdade na internet, e permita aos usuários do Tor acessarem xyz.com. " +"Agradeço.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2264,12 +2262,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" -"Se você está inabilitado de se conectar a um serviço onion, por favor veja " -"<a href=\"#onionservices-3\"> Eu não consigo acessar X.onion </a> " +"Se você não estiver conseguindo se conectar a um serviço onion, por favor " +"veja <a href=\"/#onionservices-3\"> Eu não consigo acessar X.onion </a> " #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2446,12 +2446,16 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "Como faço para baixar o Tor Browser se o torproject.org estiver bloqueado?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2894,6 +2898,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2984,70 +2990,6 @@ msgstr "" "onion conectando-se ao <a href=\"http://3g2upl4pq6kufc4m.onion\">serviço " "onion do DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Por favor, mantenha uma posição firme em favor da privacidade digital e " -"liberdade na internet, e permita aos usuários do Tor acessarem xyz.com. " -"Agradeço.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Se você não estiver conseguindo se conectar a um serviço onion, por favor " -"veja <a href=\"/#onionservices-3\"> Eu não consigo acessar X.onion </a> " - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Como eu baixo Tor caso torproject.org esteja bloqueado?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Se não estiver conseguindo baixar o Tor no nosso <a " -"href=\"https://www.torproject.org\">site</a>, você pode obter uma " -"cópia do Tor através do seu GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor requer uma hora precisa para funcionar: por favor verifique sua hora, " -"zona de tempo e configurações de data." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+tr.po b/contents+tr.po index 93fdae666..67f3ace1e 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" @@ -2248,18 +2248,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Lütfen sayısal dünyada kişisel gizliliğin ve İnternet özgürlüğünün " "korunmasını önemsediğinizi göstermek için Tor kullanıcılarının xyz.com " -"sitesine erişmesine izin verin." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Teşekkürler.\"" +"sitesine erişmesine izin verin. Teşekkürler.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2279,12 +2276,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Bir onion hizmeti ile bağlantı kuramıyorsanız <a " -"href=\"#onionservices-3\">X.onion üzerine ulaşamıyorum</a> bölümüne " +"href=\"/#onionservices-3\">X.onion üzerine ulaşamıyorum</a> bölümüne " "bakabilirsiniz." #: https//support.torproject.org/tbb/tbb-9/ @@ -2473,6 +2472,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "torproject.org sitesi engelleniyorsa Tor Browser paketini nasıl " @@ -2480,6 +2481,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2928,6 +2931,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -3015,71 +3020,6 @@ msgstr "" "hizmetine</a> bağlanarak diğer onion hizmetlerine erişebileceğinizden emin " "olabilirsiniz." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Lütfen sayısal dünyada kişisel gizliliğin ve İnternet özgürlüğünün " -"korunmasını önemsediğinizi göstermek için Tor kullanıcılarının xyz.com " -"sitesine erişmesine izin verin. Teşekkürler.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Bir onion hizmeti ile bağlantı kuramıyorsanız <a " -"href=\"/#onionservices-3\">X.onion üzerine ulaşamıyorum</a> bölümüne " -"bakabilirsiniz." - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" -"torproject.org sitesi engelleniyorsa Tor paketini nasıl indirebilirim?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Tor paketini <a href=\"https://www.torproject.org\">web " -"sitemizden</a> indiremiyorsanız GetTor kullanarak size gönderilmesini" -" sağlayabilirsiniz." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")\n" -"2017-10-29 09:24:08.900 [UYARI] Vekil Sunucu İstemcisi: xx..xxx..xxx.xx:xxxxx ile bağlantı kurulamadı (\"genel SOCKS sunucusu sorunu\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead.\n" -"19.11.2017 00:04:48.800 [UYARI] NETINFO hücresi zamanı sapmış olarak alındı (OR:xxx.xx.x.xx:xxxx): Bizim saatimiz 1 gün, 0 saat, 1 dakika geride ya da onların saati ileride gibi görünüyor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor için saat ayarının tam olarak doğru olması gereklidir. Lütfen saat, saat" -" dilimi ve tarih ayarlarınızı denetleyin." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents.pot b/contents.pot index 04208739d..0455b78d3 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -2183,17 +2183,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2214,12 +2211,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2399,11 +2398,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "How do I download Tor Browser if the torproject.org is blocked?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2843,6 +2846,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2933,69 +2938,6 @@ msgstr "" "connecting to <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo's onion " "service</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "How do I download Tor if the torproject.org is blocked?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?"

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit e47e60c9437bb953d7a717a52f8862c64644a079 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 12:52:39 2019 +0000 Update translations for support-portal --- contents+ar.po | 72 ++++++++--------------------------------- contents+bn.po | 91 +++++++++------------------------------------------ contents+ca.po | 90 +++++++++------------------------------------------ contents+cs.po | 70 ++++++++------------------------------- contents+da.po | 70 ++++++++------------------------------- contents+de.po | 86 ++++++++---------------------------------------- contents+el.po | 91 +++++++++------------------------------------------ contents+es-AR.po | 90 +++++++++------------------------------------------ contents+es.po | 90 +++++++++------------------------------------------ contents+fa.po | 72 ++++++++--------------------------------- contents+fo.po | 70 ++++++++------------------------------- contents+fr.po | 89 +++++++++----------------------------------------- contents+ga.po | 90 +++++++++------------------------------------------ contents+gu.po | 70 ++++++++------------------------------- contents+he.po | 73 ++++++++--------------------------------- contents+hi.po | 70 ++++++++------------------------------- contents+hu.po | 76 ++++++++----------------------------------- contents+id.po | 88 +++++++++---------------------------------------- contents+is.po | 84 ++++++++--------------------------------------- contents+it.po | 97 +++++++++++++------------------------------------------ contents+ja.po | 70 ++++++++------------------------------- contents+ka.po | 90 +++++++++------------------------------------------ contents+ko.po | 72 ++++++++--------------------------------- contents+mk.po | 70 ++++++++------------------------------- contents+my.po | 70 ++++++++------------------------------- contents+nb.po | 70 ++++++++------------------------------- contents+nl.po | 70 ++++++++------------------------------- contents+pl.po | 70 ++++++++------------------------------- contents+pt-BR.po | 94 +++++++++++------------------------------------------ contents+pt-PT.po | 93 ++++++++++------------------------------------------ contents+ro.po | 75 ++++++++---------------------------------- contents+ru.po | 92 ++++++++++------------------------------------------ contents+sv.po | 70 ++++++++------------------------------- contents+sw.po | 70 ++++++++------------------------------- contents+th.po | 70 ++++++++------------------------------- contents+tr.po | 90 +++++++++------------------------------------------ contents+uk.po | 70 ++++++++------------------------------- contents+zh-CN.po | 83 +++++++++-------------------------------------- contents+zh-TW.po | 70 ++++++++------------------------------- contents.pot | 88 +++++++++---------------------------------------- 40 files changed, 574 insertions(+), 2602 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 16d8c90c5..a5ea2ffd1 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" @@ -1822,18 +1822,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "شكرا لك .\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -1846,9 +1843,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1996,11 +1995,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2407,6 +2410,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2484,57 +2489,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "كيف يمكنني تنزيل تور إن كان موقع torproject.org محجوبًا؟" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+bn.po b/contents+bn.po index 4dea373f2..424047827 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n" @@ -2132,17 +2132,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "অনুগ্রহ করে ডিজিটাল গোপনীয়তা এবং ইন্টারনেট স্বাধীনতার অনুগ্রহে শক্তিশালী " -"অবস্থান গ্রহণ করুন এবং টর ব্যবহারকারীদের xyz.com প্রবেশ করতে দিন ।" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "ধন্যবাদ । \"" +"অবস্থান গ্রহণ করুন এবং টর ব্যবহারকারীদের xyz.com প্রবেশ করতে দিন । ধন্যবাদ ।" +" \"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2162,12 +2160,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "আপনি যদি কোন পেঁয়াজের সেবায় সংযোগ করতে না পারেন, তাহলে দেখে নিন <a " -"href=\"#onionservices-3\">আমি X-এ পৌঁছাতে পারছি না</a> ।" +"href=\"/#onionservices-3\">আমি X-এ পৌঁছাতে পারছি না</a> ।" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2344,11 +2344,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2786,6 +2790,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2874,71 +2880,6 @@ msgstr "" "আপনি DuckDuckGo-এর পেঁয়াজের সেবায় যুক্ত হয়ে অন্যান্য পেঁয়াজের সেবায় " "প্রবেশ করতে পারবেন কিনা তা নিশ্চিত করতে পারবেন ।" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"অনুগ্রহ করে ডিজিটাল গোপনীয়তা এবং ইন্টারনেট স্বাধীনতার অনুগ্রহে শক্তিশালী " -"অবস্থান গ্রহণ করুন এবং টর ব্যবহারকারীদের xyz.com প্রবেশ করতে দিন । ধন্যবাদ ।" -" \"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"আপনি যদি কোন পেঁয়াজের সেবায় সংযোগ করতে না পারেন, তাহলে দেখে নিন <a " -"href=\"/#onionservices-3\">আমি X-এ পৌঁছাতে পারছি না</a> ।" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Torproject.org ব্লক করলে আমি কিভাবে টর ডাউনলোড করব?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"যদি আপনি আমাদের <a " -"href=\"https://www.torproject.org\">ওয়েবসাইটের</a> মাধ্যমে টর " -"ডাউনলোড করতে না পারেন, তাহলে আপনি জেটটি মাধ্যমে আপনার কাছে পাঠানো টর এর একটি" -" কপি পাবেন ।" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"টর কাজ করার জন্য একটি সঠিক ঘড়ি প্রয়োজন: আপনার সময়, টাইমজোন, এবং তারিখ " -"সেটিংস চেক করুন।" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ca.po b/contents+ca.po index 8c4ae5f64..9d0e96857 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" @@ -2149,17 +2149,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Si us plau, prengui una posició forta a favor de la privadesa digital i la " -"llibertat d'internet i permeti als usuaris de Tor accedir a xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Gràcies.\"" +"llibertat d'internet i permeti als usuaris de Tor accedir a " +"xyz.com.Gràcies\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2179,12 +2177,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Si no podeu connectar-vos a un servei de onion, consulteu <a " -"href=\"#onionservices-3\">No puc accedir a X.onion!</a>" +"href=\"/#onionservices-3\">No puc accedir a X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2358,11 +2358,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2797,6 +2801,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2887,70 +2893,6 @@ msgstr "" "connectant-vos al <a href=\"http://3g2upl4pq6kufc4m.onion\">servei de onion " "de DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Si us plau, prengui una posició forta a favor de la privadesa digital i la " -"llibertat d'internet i permeti als usuaris de Tor accedir a " -"xyz.com.Gràcies\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Si no podeu connectar-vos a un servei de onion, consulteu <a " -"href=\"/#onionservices-3\">No puc accedir a X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Com puc baixar el Tor si el torproject.org està blocat?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Si no podeu baixar Tor a través del nostre <a " -"href=\"https://www.torproject.org\">lloc web</a>, podeu obtenir una " -"còpia de Tor lliurat a través de GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor requereix un rellotge precís per treballar: comproveu la vostra hora, " -"zona horària i configuració de data." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+cs.po b/contents+cs.po index ef892f51c..ccc3c144c 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n" @@ -1957,14 +1957,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1981,9 +1978,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2131,11 +2130,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2510,6 +2513,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2581,55 +2586,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+da.po b/contents+da.po index a070ac071..1ab826c91 100644 --- a/contents+da.po +++ b/contents+da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: scootergrisen, 2019\n" "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n" @@ -1812,14 +1812,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1836,9 +1833,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1986,11 +1985,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2367,6 +2370,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2438,55 +2443,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+de.po b/contents+de.po index ada4d1a49..f8f2334df 100644 --- a/contents+de.po +++ b/contents+de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" @@ -2235,20 +2235,17 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Bitte beweist eine Position zugunsten digitaler Privatsphäre und " "Internetfreiheit und erlaubt den Zugang zu xyz.com über Tor." #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Danke.\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -2264,12 +2261,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Bei Verbindungsschwierigkeiten zu einem onion-Dienst, siehe <a " -"href=\"#onionservices-3\">Ich kann einen onion-Dienst nicht erreichen</a>" +"href=\"/#onionservices-3\">Ich kann einen onion-Dienst nicht erreichen</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2448,6 +2447,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "Wie kann ich den Tor-Browser herunterladen, wenn torproject.org blockiert " @@ -2455,6 +2456,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2903,6 +2906,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2992,69 +2997,6 @@ msgstr "" "z.B. der <a href=\"http://3g2upl4pq6kufc4m.onion\">Onion-Dienst von " "DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Bitte beweist eine Position zugunsten digitaler Privatsphäre und " -"Internetfreiheit und erlaubt den Zugang zu xyz.com über Tor." - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Bei Verbindungsschwierigkeiten zu einem onion-Dienst, siehe <a " -"href=\"/#onionservices-3\">Ich kann einen onion-Dienst nicht erreichen</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Wie kann ich Tor herunterladen, wenn torproject.org blockiert ist?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Wenn du Tor nicht über unsere <a " -"href=\"https://www.torproject.org\">Webseite</a> herunterladen " -"kannst, versuche mittels GetTor eine Kopie zu bekommen." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Damit Tor funktioniert, benötigt es eine korrekt eingestellte Uhr: Bitte " -"überprüfe deine Uhrzeit, Zeitzone und Datumseinstellungen." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+el.po b/contents+el.po index 50e6eda04..3cda2170b 100644 --- a/contents+el.po +++ b/contents+el.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" @@ -2117,18 +2117,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Παρακαλώ να λάβετε μια ισχυρή θέση υπέρ της ψηφιακής ιδιωτικότητας και της " "ελευθερίας του διαδικτύου, και να επιτρέψετε στους χρήστες του Tor να έχουν " -"πρόσβαση στο xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Ευχαριστώ.\"" +"πρόσβαση στο xyz.com. Ευχαριστώ.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2149,12 +2146,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Αν δεν μπορείτε να συνδεθείτε με υπηρεσία onion, παρακαλούμε δείτε το <a " -"href=\"#onionservices-3\">Δεν μπορώ να αποκτήσω πρόσβαση στο X.onion!</a>" +"href=\"/#onionservices-3\">Δεν μπορώ να αποκτήσω πρόσβαση στο X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2333,6 +2332,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "Πώς μπορώ να κατεβάσω το Tor Browser αν το torbrowser.org είναι " @@ -2340,6 +2341,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2780,6 +2783,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2871,72 +2876,6 @@ msgstr "" " με σύνδεση στο <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo's Onion" " Service</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Παρακαλώ να λάβετε μια ισχυρή θέση υπέρ της ψηφιακής ιδιωτικότητας και της " -"ελευθερίας του διαδικτύου, και να επιτρέψετε στους χρήστες του Tor να έχουν " -"πρόσβαση στο xyz.com. Ευχαριστώ.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Αν δεν μπορείτε να συνδεθείτε με υπηρεσία onion, παρακαλούμε δείτε το <a " -"href=\"/#onionservices-3\">Δεν μπορώ να αποκτήσω πρόσβαση στο X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" -"Πώς μπορώ να κατεβάσω το Tor Browser αν το torbrowser.org είναι " -"μπλοκαρισμένο;" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Αν δεν μπορείτε να κατεβάσετε τον Tor μέσω της <a " -"href=\"https://www.torproject.org\">ιστοσελίδας μας</a>, μπορείτε να " -"πάρετε ένα αντίγραφο του Tor μέσω του GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"To Tor απαιτεί ένα ακριβές ρολόι για να λειτουργήσει: παρακαλώ ελέγξτε την " -"ώρα, την ζώνη ώρας, και τις ρυθμίσεις ημερομηνίας." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+es-AR.po b/contents+es-AR.po index 5253b50ab..95697f8d9 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" @@ -2141,17 +2141,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Por favor, plantate firme en favor de la privacidad digital y la libertad de" -" Internet, y permití a los usuarios de Tor acceder a xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Gracias.\"" +"\"Por favor, plantate firme en favor de la privacidad digital y la libertad " +"de Internet, y permití a los usuarios de Tor acceder a xyz.com. Gracias.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2172,12 +2169,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Si no sos capaz de conectar a un servicio onion, por favor mirá <a " -"href=\"#onionservices-3\">¡No puedo alcanzar X.onion!</a>" +"href=\"/#onionservices-3\">¡No puedo alcanzar X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2350,11 +2349,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2797,6 +2800,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2888,69 +2893,6 @@ msgstr "" "conectándote al <a href=\"http://3g2upl4pq6kufc4m.onion\">servicio onion de " "DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"\"Por favor, plantate firme en favor de la privacidad digital y la libertad " -"de Internet, y permití a los usuarios de Tor acceder a xyz.com. Gracias.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Si no sos capaz de conectar a un servicio onion, por favor mirá <a " -"href=\"/#onionservices-3\">¡No puedo alcanzar X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "¿Como descargo Tor si torproject.org está bloqueado?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Si no podés descargar Tor a través de nuestro <a " -"href=\"https://www.torproject.org\">sitio web</a>, podés obtener una " -"copia de Tor que te será entregada via GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [ADVERTENCIA] Se recibió una llamada NETINFO con " -"tiempo dispar (OR:xxx.xx.x.xx:xxxx): Parece que nuestro reloj está atrasado " -"en 1 día, 0 horas, 1 minuto, o que el de ellos está adelantado." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor requiere un reloj preciso para trabajar: por favor revisá tus ajustes de" -" tiempo, huso horario y fecha." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+es.po b/contents+es.po index 3380856d2..a9f231fce 100644 --- a/contents+es.po +++ b/contents+es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -2248,17 +2248,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Por favor, ten una postura firme a favor de la privacidad digital y la " -"libertad de Internet, y permite a los usuarios de Tor acceder a xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Gracias.\"" +"Por favor, actúa en favor de la privacidad digital y la libertad de " +"Internet, y permite a los usuarios de Tor acceder a xyz.com. Gracias.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2279,12 +2276,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Si no puedes conectarte a un servicio cebolla, por favor mira <a " -"href=\"#onionservices-3\">¡no puedo entrar en X.onion!</a>" +"href=\"/#onionservices-3\">¡no puedo entrar en X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2464,11 +2463,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "¿Cómo descargo Tor Browser si torproject.org está bloqueada?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2918,6 +2921,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -3008,69 +3013,6 @@ msgstr "" "conectando al <a href=\"http://3g2upl4pq6kufc4m.onion\">servicio cebolla de " "DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Por favor, actúa en favor de la privacidad digital y la libertad de " -"Internet, y permite a los usuarios de Tor acceder a xyz.com. Gracias.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Si no puedes conectarte a un servicio cebolla, por favor mira <a " -"href=\"/#onionservices-3\">¡no puedo entrar en X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "¿Cómo descargo Tor si torproject.org está bloqueada?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Si no puedes descargar Tor a través de nuestro <a " -"href=\"https://www.torproject.org\">sitio web</a>, puedes obtener una" -" copia de Tor que se te entregará vía GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Recibida la celda NETINFO con tiempo sesgado " -"(OR:xxx.xx.x.xx:xxxx): Parece que nuestro reloj está atrasado 1 día, 0 " -"horas, 1 minutos, o que el suyo está adelantado." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor necesita un reloj preciso para funcionar: por favor, comprueba tus " -"ajustes de hora, zona horaria y fecha." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+fa.po b/contents+fa.po index 7e006d392..9500e91e2 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" @@ -1916,14 +1916,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1940,9 +1937,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2090,11 +2089,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2478,6 +2481,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2549,57 +2554,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "اگر torproject.org مسدود باشد، چگونه Tor را دانلود کنم؟" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+fo.po b/contents+fo.po index a8f497953..590d0b398 100644 --- a/contents+fo.po +++ b/contents+fo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)\n" @@ -1873,14 +1873,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1897,9 +1894,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2047,11 +2046,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2428,6 +2431,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2499,55 +2504,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+fr.po b/contents+fr.po index 08686cab5..f32a65321 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" @@ -2188,18 +2188,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Veuillez adopter une position ferme privilégiant la confidentialité " "numérique et la liberté sur Internet, et permettre aux utilisateurs de Tor " -"d’accéder à xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Merci. »" +"d’accéder à xyz.com. Merci. »" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2221,12 +2218,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Si vous ne pouvez pas vous connecter à un service onion, veuillez consulter " -"« <a href=\"#onionservices-3\">Je ne peux pas accéder à X.onion !</a> »" +"« <a href=\"/#onionservices-3\">Je ne peux pas accéder à X.onion !</a> »" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2405,11 +2404,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2856,6 +2859,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2946,70 +2951,6 @@ msgstr "" "services onion en vous connectant au <a " "href=\"http://3g2upl4pq6kufc4m.onion\">service onion de DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Veuillez adopter une position ferme privilégiant la confidentialité " -"numérique et la liberté sur Internet, et permettre aux utilisateurs de Tor " -"d’accéder à xyz.com. Merci. »" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Si vous ne pouvez pas vous connecter à un service onion, veuillez consulter " -"« <a href=\"/#onionservices-3\">Je ne peux pas accéder à X.onion !</a> »" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Comment puis-je télécharger Tor si torproject.org est bloqué ?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Si vous ne pouvez pas télécharger Tor à partir de notre <a " -"href=\"https://www.torproject.org\">site Web</a>, une exemplaire de " -"Tor peut vous être livré par GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor exige une horloge exacte pour fonctionner : veuillez vérifier vos " -"paramètres d’heure, de fuseau horaire et de date." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ga.po b/contents+ga.po index 930c808a0..b2d13174a 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n" @@ -2145,17 +2145,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Iarraim ort an fód a sheasamh ar son príobháideachais dhigitigh agus ar son " -"saoirse Idirlín, trí chead a thabhairt d'úsáideoirí Tor xyz.com a úsáid." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Go raibh maith agat.\"" +"saoirse Idirlín, trí chead a thabhairt d'úsáideoirí Tor xyz.com a úsáid. Go " +"raibh míle maith agat.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2176,12 +2174,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Mura bhfuil tú in ann ceangal a bhunú le seirbhís onion, féach <a " -"href=\"#onionservices-3\">Nílim in ann teacht ar X.onion!</a>" +"href=\"/#onionservices-3\">Nílim in ann teacht ar X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2357,11 +2357,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2805,6 +2809,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2895,70 +2901,6 @@ msgstr "" "rochtain trí cheangal a bhunú le <a " "href=\"http://3g2upl4pq6kufc4m.onion\">Seirbhís Onion DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Iarraim ort an fód a sheasamh ar son príobháideachais dhigitigh agus ar son " -"saoirse Idirlín, trí chead a thabhairt d'úsáideoirí Tor xyz.com a úsáid. Go " -"raibh míle maith agat.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Mura bhfuil tú in ann ceangal a bhunú le seirbhís onion, féach <a " -"href=\"/#onionservices-3\">Nílim in ann teacht ar X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Conas is féidir Tor a íoslódáil má tá cosc ar torproject.org?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Mura bhfuil tú in ann Tor a íoslódáil ónár <a " -"href=\"https://www.torproject.org\">suíomh Gréasáin</a>, is féidir " -"leat Tor a fháil trí sheirbhís GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Teastaíonn clog beacht ó Tor le feidhmiú mar is ceart; deimhnigh go bhfuil " -"an t-am, an crios ama, agus an dáta socraithe i gceart." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+gu.po b/contents+gu.po index 668fd291c..6253fd3ba 100644 --- a/contents+gu.po +++ b/contents+gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Gujarati (https://www.transifex.com/otf/teams/1519/gu/)\n" @@ -1812,14 +1812,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1836,9 +1833,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1986,11 +1985,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2365,6 +2368,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2436,55 +2441,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+he.po b/contents+he.po index fcaf7149a..c93acc3c7 100644 --- a/contents+he.po +++ b/contents+he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" @@ -1856,14 +1856,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1880,9 +1877,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2036,11 +2035,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2420,6 +2423,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2491,58 +2496,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "כיצד אני מוריד את Tor אם torproject.org חסום?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"אם אתה לא יכול להוריד את Tor באמצעות <a " -"href=\"https://www.torproject.org\">האתר</a> שלנו, אתה יכול לקבל עותק" -" של Tor שיישלח אליך דרך GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+hi.po b/contents+hi.po index 5e0dd8b65..5ec5d3551 100644 --- a/contents+hi.po +++ b/contents+hi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n" @@ -1811,14 +1811,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1835,9 +1832,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1985,11 +1984,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2364,6 +2367,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2435,55 +2440,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+hu.po b/contents+hu.po index bb33eddfb..d8f118ece 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" @@ -1842,18 +1842,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Köszönjük.\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -1866,9 +1863,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2016,11 +2015,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2421,6 +2424,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2496,61 +2501,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" -"Hogyan lehet letölteni a Tor-t, ha a torproject.org weboldal blokkolva van?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+id.po b/contents+id.po index a04ed065c..df196fb81 100644 --- a/contents+id.po +++ b/contents+id.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n" @@ -2149,17 +2149,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Mohon dukungan penuh terhadap privasi digital dan kebebasan Internet, dan " -"izinkan pengguna Tor untuk melakukan akses ke xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Terima kasih!" +"izinkan pengguna Tor untuk melakukan akses ke xyz.com. Terima kasih!" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2180,12 +2177,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Jika Anda tidak dapat terhubung ke sebuah onion service, silakan lihat <a " -"href=\"#onionservices-3\\\">Saya tidak dapat menghubungi X.onion!</a>" +"href=\"/#onionservices-3\\\">Saya tidak dapat menghubungi X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2363,11 +2362,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "Bagaimana cara mengunduh Tor Browser jika torproject.org diblokir?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2809,6 +2812,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2894,69 +2899,6 @@ msgstr "" "dengan tersambung ke <link " "href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion Service</link>" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Mohon dukungan penuh terhadap privasi digital dan kebebasan Internet, dan " -"izinkan pengguna Tor untuk melakukan akses ke xyz.com. Terima kasih!" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Jika Anda tidak dapat terhubung ke sebuah onion service, silakan lihat <a " -"href=\"/#onionservices-3\\\">Saya tidak dapat menghubungi X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Bagaimana cara mengunduh Tor jika torproject.org diblokir?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Jika Anda tidak dapat mengunduh Tor dari <a " -"href=\\\"https://www.torproject.org\\\">situs web kami</a>, Tor dapat" -" dikirim kepada Anda melalui GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " -"xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead. " - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor memerlukan sebuah jam yang akurat untuk bekerja: Periksa waktu, zona " -"waktu, dan pengaturan tanggal." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+is.po b/contents+is.po index a8aa0bfd3..6f743a3bd 100644 --- a/contents+is.po +++ b/contents+is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>, 2019\n" "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n" @@ -2115,18 +2115,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Takk fyrir.\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -2139,12 +2136,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Ef þér tekst ekki að tengjast onion-þjónustu, ættirðu að skoða <a " -"href=\"#onionservices-3\">Ég næ ekki að tengjast X.onion!</a>" +"href=\"/#onionservices-3\">Ég næ ekki að tengjast X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2315,12 +2314,16 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "Hvernig fer ég að því að ná í Tor-vafrann ef lokað er á torproject.org?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2752,6 +2755,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2841,67 +2846,6 @@ msgstr "" "þjónustur með því að tengjast við <a " "href=\"http://3g2upl4pq6kufc4m</a>.onion/\">onion-þjónustu DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Ef þér tekst ekki að tengjast onion-þjónustu, ættirðu að skoða <a " -"href=\"/#onionservices-3\">Ég næ ekki að tengjast X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Hvernig fer ég að því að ná í Tor ef lokað er á torproject.org?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Ef þú getur ekki nálgast Tor af [vefsíðunni " -"okkar](https://wwwtorprojectorg), geturðu fengið eintak af Tor afhent í " -"gegnum GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor þarfnast nákvæmrar klukku til að virka: athugaðu stillingarnar þínar " -"fyrir tíma, tímabelti og dagsetningu." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+it.po b/contents+it.po index 460125d1d..4edb7c82c 100644 --- a/contents+it.po +++ b/contents+it.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: francesco ercolani <erco99(a)live.it>, 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" @@ -1886,6 +1886,11 @@ msgid "" "working to add more. Want to help us translate? [See here](https://tb-" "manual.torproject.org/becoming-tor-translator/)" msgstr "" +"Vogliamo che tutti possano godere di Tor Broswer nella loro lingua. Tor " +"Broswer è ora [disponibile in 25 lingue " +"diverse](https://www.torproject.org/it/download/languages/), e stiamo " +"lavorando per aggiungerne altre. Vuoi aiutarci a tradurre? [vedi di " +"più](https://tb-manual.torproject.org/it/becoming-tor-translator/)." #: https//support.torproject.org/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -2229,17 +2234,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Per favore, prendi una posizione forte a favore della privacy digitale e " -"della libertà su internet, e permetti agli utenti Tor di accedere a xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Grazie.\"" +"Per favore prendi una posizione forte a favore della privacy digitale e " +"della libertà su internet e permetti agli utenti Tor di accedere a xyz.com. " +"Grazie\"." #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2260,12 +2263,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Se non riesci a connetterti ad un servizio onion, per favore consulta <a " -"href=\"#onionservices-3\">Non riesco a raggiungere X.onion!</a>" +"href=\"/#onionservices-3\">Non riesco a raggiungere X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2446,11 +2451,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "Come scarico il Browser Tor se il sito torproject.org è bloccato?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2902,6 +2911,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2993,70 +3004,6 @@ msgstr "" "onion connettendoti al <a href=\"http://3g2upl4pq6kufc4m.onion\">servizio " "onion di DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Per favore prendi una posizione forte a favore della privacy digitale e " -"della libertà su internet e permetti agli utenti Tor di accedere a xyz.com. " -"Grazie\"." - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Se non riesci a connetterti ad un servizio onion, per favore consulta <a " -"href=\"/#onionservices-3\">Non riesco a raggiungere X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Come posso scaricare Tor se torproject.org viene bloccato?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Se non riesci a scaricare Tor dal nostro <a " -"href=\"https://www.torproject.org\">sito web</a>, puoi ottenere una " -"copia di Tor tramite GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Per funzionare Tor richiede un orologio preciso: per favore controlla l'ora," -" il tuo fuso oraio e le impostazioni della data." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ja.po b/contents+ja.po index 086c891a3..191a44172 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" @@ -1820,14 +1820,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1845,9 +1842,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1995,11 +1994,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2374,6 +2377,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2445,55 +2450,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "torproject.orgがブロックされている場合、どのようにTorをダウンロードできますか？" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ka.po b/contents+ka.po index e9cdd9d3e..b755b9eaf 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Georgianization, 2019\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" @@ -2215,17 +2215,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "გთხოვთ, მხარი დაუჭიროთ პირადი მონაცემების ხელშეუხებლობასა და ინტერნეტის " -"თავისუფლებას და დართოთ Tor-ის მომხმარებლებს xyz.com საიტთან წვდომის ნება." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "გმადლობთ.“" +"თავისუფლებას და დართოთ Tor-ის მომხმარებლებს xyz.com საიტთან წვდომის ნება. " +"გმადლობთ.“" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2246,12 +2244,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "თუ ვერ ახერხებთ onion-მომსახურებასთან დაკავშირებას, გთხოვთ იხილოთ <a " -"href=\"#onionservices-3\">ვერ ვუკავშირდები X.onion-ს!</a>" +"href=\"/#onionservices-3\">ვერ ვუკავშირდები X.onion-ს!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2434,11 +2434,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "როგორ ჩამოვტვირთო Tor-ბრაუზერი თუ torproject.org შეზღუდულია?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2887,6 +2891,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2976,70 +2982,6 @@ msgstr "" " href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo</a>-ს Onion-" "მომსახურებასთან დაკავშირების მეშვეობით." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"გთხოვთ, მხარი დაუჭიროთ პირადი მონაცემების ხელშეუხებლობასა და ინტერნეტის " -"თავისუფლებას და დართოთ Tor-ის მომხმარებლებს xyz.com საიტთან წვდომის ნება. " -"გმადლობთ.“" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"თუ ვერ ახერხებთ onion-მომსახურებასთან დაკავშირებას, გთხოვთ იხილოთ <a " -"href=\"/#onionservices-3\">ვერ ვუკავშირდები X.onion-ს!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "როგორ ჩამოვტვირთო Tor თუ torproject.org შეზღუდულია?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"თუ ვერ ახერხებთ Tor-ის ჩამოტვირთვას ჩვენი <a " -"href=\"https://www.torproject.org\">ვებსაიტიდან</a>, მისი ასლის " -"მიღება შეგიძლიათ GetTor-ით." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor-ის მუშაობისთვის საჭიროა საათი გასწორებული იყოს: გთხოვთ, შეამოწმოთ თქვენი" -" დროის, სასაათე სარტყელისა და თარიღის პარამეტრები." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ko.po b/contents+ko.po index 01488e014..d37da08d5 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n" @@ -1834,18 +1834,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "감사합니다.\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -1860,9 +1857,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2012,11 +2011,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2396,6 +2399,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2467,57 +2472,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "Tor가 작동하려면 정확한 시간 정보가 필요합니다. 시간, 시간대 및 날짜 설정을 확인하십시오." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+mk.po b/contents+mk.po index 5a6722ee3..6a9a283fe 100644 --- a/contents+mk.po +++ b/contents+mk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n" @@ -1813,14 +1813,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1837,9 +1834,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1987,11 +1986,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2366,6 +2369,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2437,55 +2442,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+my.po b/contents+my.po index ecbe17677..5a7e93e95 100644 --- a/contents+my.po +++ b/contents+my.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n" @@ -1810,14 +1810,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1834,9 +1831,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1984,11 +1983,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2363,6 +2366,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2434,55 +2439,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+nb.po b/contents+nb.po index 2a5ac63df..b65427364 100644 --- a/contents+nb.po +++ b/contents+nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/otf/teams/1519/nb/)\n" @@ -1873,18 +1873,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Takk skal du ha.\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -1897,9 +1894,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2047,11 +2046,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2426,6 +2429,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2497,55 +2502,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Hvordan kan jeg laste ned Tor hvis torproject.org er blokkert?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+nl.po b/contents+nl.po index 5673f418a..db5a8a85a 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" @@ -1860,14 +1860,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1888,9 +1885,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2040,11 +2039,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2422,6 +2425,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2493,55 +2498,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Hoe kan ik Tor downloaden als het torproject.org is geblokkeerd?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+pl.po b/contents+pl.po index 2aa89a894..e2e4bd447 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Dawid Potocki <dpot(a)disroot.org>, 2019\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" @@ -1934,18 +1934,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Dziękuję.\"" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" @@ -1962,9 +1959,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2114,11 +2113,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2497,6 +2500,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2568,55 +2573,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Jak pobrać Tor-a, kiedy strona torproject.org jest zablokowana?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+pt-BR.po b/contents+pt-BR.po index fb442afbe..dc43ab85c 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Chacal E., 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" @@ -2233,17 +2233,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Por favor tenha uma posição forte em favor da privacidade digital e " -"liberdade na internet, e permita aos usuários do Tor acessarem xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Obrigado.\"" +"Por favor, mantenha uma posição firme em favor da privacidade digital e " +"liberdade na internet, e permita aos usuários do Tor acessarem xyz.com. " +"Agradeço.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2264,12 +2262,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" -"Se você está inabilitado de se conectar a um serviço onion, por favor veja " -"<a href=\"#onionservices-3\"> Eu não consigo acessar X.onion </a> " +"Se você não estiver conseguindo se conectar a um serviço onion, por favor " +"veja <a href=\"/#onionservices-3\"> Eu não consigo acessar X.onion </a> " #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2446,12 +2446,16 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "Como faço para baixar o Tor Browser se o torproject.org estiver bloqueado?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2894,6 +2898,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2984,70 +2990,6 @@ msgstr "" "onion conectando-se ao <a href=\"http://3g2upl4pq6kufc4m.onion\">serviço " "onion do DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Por favor, mantenha uma posição firme em favor da privacidade digital e " -"liberdade na internet, e permita aos usuários do Tor acessarem xyz.com. " -"Agradeço.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Se você não estiver conseguindo se conectar a um serviço onion, por favor " -"veja <a href=\"/#onionservices-3\"> Eu não consigo acessar X.onion </a> " - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Como eu baixo Tor caso torproject.org esteja bloqueado?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Se não estiver conseguindo baixar o Tor no nosso <a " -"href=\"https://www.torproject.org\">site</a>, você pode obter uma " -"cópia do Tor através do seu GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor requer uma hora precisa para funcionar: por favor verifique sua hora, " -"zona de tempo e configurações de data." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+pt-PT.po b/contents+pt-PT.po index bea072f00..80ae0220d 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>, 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" @@ -2194,18 +2194,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Por favor, tome uma posição forte em favor da privacidade digital e da " -"liberdade da Internet, e permita que os utilizadores do Tor acedam a " -"xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Obrigado.\"" +"Por favor tome uma posição forte a favor da privacidade digital e liberdade " +"na internet, e permita que os utilizadores do Tor acedam ao vosso site. " +"Obrigado.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2226,12 +2223,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Se não consegue aceder a um serviço onion, por favor veja a página <a " -"href=\"#onionservices-3\">Eu não consigo aceder a um site onion!</a> " +"href=\"/#onionservices-3\">Eu não consigo aceder a um site onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2405,11 +2404,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2846,6 +2849,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2936,70 +2941,6 @@ msgstr "" "conectando-se ao <a href=\"http://3g2upl4pq6kufc4m.onion\">serviço onion do " "DuckDuckGo</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Por favor tome uma posição forte a favor da privacidade digital e liberdade " -"na internet, e permita que os utilizadores do Tor acedam ao vosso site. " -"Obrigado.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Se não consegue aceder a um serviço onion, por favor veja a página <a " -"href=\"/#onionservices-3\">Eu não consigo aceder a um site onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Como é que eu transfiro o Tor se o torproject.org estiver bloqueado?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Se não conseguir transferir o Tor através do nosso <a " -"href=\"https://www.torproject.org\">site da Web</a>, pode obter uma " -"cópia do Tor, enviada para si via GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"O Tor necessita de um relógio correto para funcionar: por favor verifique a " -"hora, o fuso horário e as configurações de datas." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ro.po b/contents+ro.po index 8608fc9fb..9bd4e68ce 100644 --- a/contents+ro.po +++ b/contents+ro.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n" @@ -1827,14 +1827,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1851,9 +1848,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2005,11 +2004,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "Cum descarc Tor Browser dacă torproject.org e blocat?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2394,6 +2397,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2465,60 +2470,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Cum descarc Tor dacă torproject.org e blocat?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Dacă nu puteți descărca Tor prin <a href=\"https://www.torproject.org" -"\">website-ul nostru</a>, puteți obține o copie Tor trimisă către " -"dvs. prin GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor necesită un ceas precis pentru a funcționa: te rog verifică ceasul, " -"fusul orar, și data." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+ru.po b/contents+ru.po index baf668364..75c5351cc 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" @@ -2138,17 +2138,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" -"Пожалуйста, займите твердую позицию в пользу цифровой приватности и свободы " -"Интернета, и предоставьте пользователям Tor доступ к xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Спасибо.\"" +"Пожалуйста, будьте на стороне защитников цифровой приватности и онлайновых " +"свобод. Разрешите пользователям Tor доступ к xyz.com. Спасибо\"." #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2169,12 +2166,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" -"Если вы не можете подключиться к сайту .onion , см. раздел <a " -"href=\"#onionservices-3\">Я не могу связаться с X.onion!</a>" +"Если вы не можете подключиться к onion-сервису, пожалуйста, см. страницу <a " +"href=\"/#onionservices-3\">Не удается подключиться к X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2345,11 +2344,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2786,6 +2789,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2875,69 +2880,6 @@ msgstr "" "подключившись к <a href=\"http://3g2upl4pq6kufc4m.onion\">луковому сервису " "DuckDuckGo</a>" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Пожалуйста, будьте на стороне защитников цифровой приватности и онлайновых " -"свобод. Разрешите пользователям Tor доступ к xyz.com. Спасибо\"." - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Если вы не можете подключиться к onion-сервису, пожалуйста, см. страницу <a " -"href=\"/#onionservices-3\">Не удается подключиться к X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Как загрузить Tor, если torproject.org заблокирован?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Если вы не можете скачать тор через наш <a " -"href=\"https://www.torproject.org\">веб-сайт</a>, мы можем доставить " -"вам копию через GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Для работы Tor должен знать точное время. Пожалуйста, проверьте свои " -"настройки времени, часового пояса и даты." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+sv.po b/contents+sv.po index 8b356a880..15a2405ea 100644 --- a/contents+sv.po +++ b/contents+sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" @@ -1817,14 +1817,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1841,9 +1838,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1991,11 +1990,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2372,6 +2375,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2443,55 +2448,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Hur laddar jag ner Tor om torproject.org är spärrad?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+sw.po b/contents+sw.po index cc5a2c1e3..566518f75 100644 --- a/contents+sw.po +++ b/contents+sw.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>, 2019\n" "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)\n" @@ -1813,14 +1813,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1837,9 +1834,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1992,11 +1991,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2371,6 +2374,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2442,55 +2447,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+th.po b/contents+th.po index 16ef7a73d..9944477c8 100644 --- a/contents+th.po +++ b/contents+th.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n" @@ -1812,14 +1812,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1836,9 +1833,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1986,11 +1985,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2365,6 +2368,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2436,55 +2441,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+tr.po b/contents+tr.po index 93fdae666..67f3ace1e 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" @@ -2248,18 +2248,15 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Lütfen sayısal dünyada kişisel gizliliğin ve İnternet özgürlüğünün " "korunmasını önemsediğinizi göstermek için Tor kullanıcılarının xyz.com " -"sitesine erişmesine izin verin." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Teşekkürler.\"" +"sitesine erişmesine izin verin. Teşekkürler.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2279,12 +2276,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "Bir onion hizmeti ile bağlantı kuramıyorsanız <a " -"href=\"#onionservices-3\">X.onion üzerine ulaşamıyorum</a> bölümüne " +"href=\"/#onionservices-3\">X.onion üzerine ulaşamıyorum</a> bölümüne " "bakabilirsiniz." #: https//support.torproject.org/tbb/tbb-9/ @@ -2473,6 +2472,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" "torproject.org sitesi engelleniyorsa Tor Browser paketini nasıl " @@ -2480,6 +2481,8 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2928,6 +2931,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -3015,71 +3020,6 @@ msgstr "" "hizmetine</a> bağlanarak diğer onion hizmetlerine erişebileceğinizden emin " "olabilirsiniz." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Lütfen sayısal dünyada kişisel gizliliğin ve İnternet özgürlüğünün " -"korunmasını önemsediğinizi göstermek için Tor kullanıcılarının xyz.com " -"sitesine erişmesine izin verin. Teşekkürler.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"Bir onion hizmeti ile bağlantı kuramıyorsanız <a " -"href=\"/#onionservices-3\">X.onion üzerine ulaşamıyorum</a> bölümüne " -"bakabilirsiniz." - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" -"torproject.org sitesi engelleniyorsa Tor paketini nasıl indirebilirim?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"Tor paketini <a href=\"https://www.torproject.org\">web " -"sitemizden</a> indiremiyorsanız GetTor kullanarak size gönderilmesini" -" sağlayabilirsiniz." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")\n" -"2017-10-29 09:24:08.900 [UYARI] Vekil Sunucu İstemcisi: xx..xxx..xxx.xx:xxxxx ile bağlantı kurulamadı (\"genel SOCKS sunucusu sorunu\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead.\n" -"19.11.2017 00:04:48.800 [UYARI] NETINFO hücresi zamanı sapmış olarak alındı (OR:xxx.xx.x.xx:xxxx): Bizim saatimiz 1 gün, 0 saat, 1 dakika geride ya da onların saati ileride gibi görünüyor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor için saat ayarının tam olarak doğru olması gereklidir. Lütfen saat, saat" -" dilimi ve tarih ayarlarınızı denetleyin." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+uk.po b/contents+uk.po index fcbd70574..ab8e8a116 100644 --- a/contents+uk.po +++ b/contents+uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n" @@ -1826,14 +1826,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1855,9 +1852,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -2005,11 +2004,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2386,6 +2389,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2457,55 +2462,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "Як завантажити Tor, якщо torproject.org заблокований?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 11c0f3192..23c517af3 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: ciaran <ciaranchen(a)qq.com>, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" @@ -1923,15 +1923,12 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "请采取强硬立场支持数字隐私和互联网自由，以及允许 Tor 用户访问 xyz.com。”" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "谢谢你。\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" +msgstr "请采取强硬立场支持数字隐私和互联网自由，以及允许 Tor 用户访问 xyz.com，谢谢。”" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -1948,12 +1945,12 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"如果你平时只在某个特定的国家使用他们的服务，从其他国家进行访问时你的账号可能就会被冻结。如无法连接 onion 服务，请参阅 <a " -"href=\"/#onionservices-3\">无法连接 x.onion！</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" +msgstr "如果你无法连接洋葱服务，请参阅 <a href=\"/#onionservices-3\">我无法访问 x.onion！</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2117,11 +2114,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "torproject.org 被屏蔽了，怎么下载 Tor Browser？" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2532,6 +2533,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2611,62 +2614,6 @@ msgstr "" "你也可以通过连接 <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo " "的洋葱服务</a>确认你可以访问其他的洋葱服务。" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "请采取强硬立场支持数字隐私和互联网自由，以及允许 Tor 用户访问 xyz.com，谢谢。”" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "如果你无法连接洋葱服务，请参阅 <a href=\"/#onionservices-3\">我无法访问 x.onion！</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "torproject.org 被屏蔽了，怎么下载 Tor？" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"如果无法通过我们的<a href=\"https://www.torproject.org\">网站</a>下载 " -"Tor，你可以通过 GetTor 获取 Tor。" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "Tor 需要准确的时间设置：请检查你的时间，时区和日期设置是否正确。" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents+zh-TW.po b/contents+zh-TW.po index e9c310826..98268a26b 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" @@ -1811,14 +1811,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." -msgstr "" - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" #: https//support.torproject.org/tbb/tbb-7/ @@ -1835,9 +1832,11 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" #: https//support.torproject.org/tbb/tbb-9/ @@ -1985,11 +1984,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2366,6 +2369,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2441,55 +2446,6 @@ msgid "" "service</a>." msgstr "" -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?" diff --git a/contents.pot b/contents.pot index 04208739d..0455b78d3 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-29 13:10+CET\n" +"POT-Creation-Date: 2019-04-29 14:45+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -2183,17 +2183,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." +"freedom, and allow Tor users access to xyz.com. Thank you.\"" msgstr "" "Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com." - -#: https//support.torproject.org/tbb/tbb-7/ -#: (content/tbb/tbb-7/contents+en.lrquestion.description) -msgid "Thank you.\"" -msgstr "Thank you.\"" +"freedom, and allow Tor users access to xyz.com. Thank you.\"" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2214,12 +2211,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) msgid "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" "If you are unable to connect to an onion service, please see <a " -"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.title) @@ -2399,11 +2398,15 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" msgstr "How do I download Tor Browser if the torproject.org is blocked?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) msgid "" "If you can't download Tor Browser through our " "[website](https://www.torproject.org), you can get a copy of Tor Browser " @@ -2843,6 +2846,8 @@ msgstr "" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: https//support.torproject.org/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," @@ -2933,69 +2938,6 @@ msgstr "" "connecting to <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo's onion " "service</a>." -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" -msgstr "" -"Please take a strong stance in favor of digital privacy and internet " -"freedom, and allow Tor users access to xyz.com. Thank you.\"" - -#: https//support.torproject.org/censorship/censorship-2/ -#: (content/censorship/censorship-2/contents+en.lrquestion.description) -msgid "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" -msgstr "" -"If you are unable to connect to an onion service, please see <a " -"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.title) -msgid "How do I download Tor if the torproject.org is blocked?" -msgstr "How do I download Tor if the torproject.org is blocked?" - -#: https//support.torproject.org/censorship/censorship-3/ -#: (content/censorship/censorship-3/contents+en.lrquestion.description) -msgid "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." -msgstr "" -"If you can't download Tor through our <a " -"href=\"https://www.torproject.org\">website</a>, you can get a copy " -"of Tor delivered to you via GetTor." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" -msgstr "" -"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " -"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." -msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead." - -#: https//support.torproject.org/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." -msgstr "" -"Tor requires an accurate clock to work: please check your time, timezone, " -"and date settings." - #: https//support.torproject.org/censorship/censorship-7/ #: (content/censorship/censorship-7/contents+en.lrquestion.title) msgid "What is a bridge?"

1 0

[metrics-lib/master] Add BandwidthFile for parsed bandwidth files.
by karsten＠torproject.org 29 Apr '19

29 Apr '19

commit 25072720b90f5f725c50ee7b645efc4777d68da6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Apr 20 11:04:14 2019 +0200 Add BandwidthFile for parsed bandwidth files. Implements #30216. --- CHANGELOG.md | 6 + .../org/torproject/descriptor/BandwidthFile.java | 249 +++++++++ .../descriptor/impl/BandwidthFileImpl.java | 431 +++++++++++++++ .../descriptor/impl/DescriptorParserImpl.java | 9 + .../descriptor/impl/BandwidthFileImplTest.java | 596 +++++++++++++++++++++ .../descriptor/impl/TestDescriptorBuilder.java | 120 +++++ 6 files changed, 1411 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3353a4c..d9cb62a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 2.6.0 - 2019-04-?? + + * Medium changes + - Add new BandwidthFile descriptor for parsed bandwidth files. + + # Changes in version 2.5.0 - 2018-09-25 * Medium changes diff --git a/src/main/java/org/torproject/descriptor/BandwidthFile.java b/src/main/java/org/torproject/descriptor/BandwidthFile.java new file mode 100644 index 0000000..34b9414 --- /dev/null +++ b/src/main/java/org/torproject/descriptor/BandwidthFile.java @@ -0,0 +1,249 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.descriptor; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +/** + * A bandwidth file contains information on relays' bandwidth capacities and is + * produced by bandwidth generators, previously known as bandwidth scanners. + * + * @since 2.6.0 + */ +public interface BandwidthFile extends Descriptor { + + /** + * Time of the most recent generator bandwidth result. + * + * @since 2.6.0 + */ + LocalDateTime timestamp(); + + /** + * Document format version. + * + * @since 2.6.0 + */ + String version(); + + /** + * Name of the software that created the document. + * + * @since 2.6.0 + */ + String software(); + + /** + * Version of the software that created the document. + * + * @since 2.6.0 + */ + Optional<String> softwareVersion(); + + /** + * Timestamp in UTC time zone when the file was created. + * + * @since 2.6.0 + */ + Optional<LocalDateTime> fileCreated(); + + /** + * Timestamp in UTC time zone when the generator was started. + * + * @since 2.6.0 + */ + Optional<LocalDateTime> generatorStarted(); + + /** + * Timestamp in UTC time zone when the first relay bandwidth was obtained. + * + * @since 2.6.0 + */ + Optional<LocalDateTime> earliestBandwidth(); + + /** + * Timestamp in UTC time zone of the most recent generator bandwidth result. + * + * @since 2.6.0 + */ + Optional<LocalDateTime> latestBandwidth(); + + /** + * Number of relays that have enough measurements to be included in the + * bandwidth file. + * + * @since 2.6.0 + */ + Optional<Integer> numberEligibleRelays(); + + /** + * Percentage of relays in the consensus that should be included in every + * generated bandwidth file. + * + * @since 2.6.0 + */ + Optional<Integer> minimumPercentEligibleRelays(); + + /** + * Number of relays in the consensus. + * + * @since 2.6.0 + */ + Optional<Integer> numberConsensusRelays(); + + /** + * The number of eligible relays, as a percentage of the number of relays in + * the consensus. + * + * @since 2.6.0 + */ + Optional<Integer> percentEligibleRelays(); + + /** + * Minimum number of relays that should be included in the bandwidth file. + * + * @since 2.6.0 + */ + Optional<Integer> minimumNumberEligibleRelays(); + + /** + * Country, as in political geolocation, where the generator is run. + * + * @since 2.6.0 + */ + Optional<String> scannerCountry(); + + /** + * Country, as in political geolocation, or countries where the destination + * web server(s) are located. + * + * @since 2.6.0 + */ + Optional<String[]> destinationsCountries(); + + /** + * Number of the different consensuses seen in the last data period. + * + * @since 2.6.0 + */ + Optional<Integer> recentConsensusCount(); + + /** + * Number of times that a list with a subset of relays prioritized to be + * measured has been created in the last data period. + * + * @since 2.6.0 + */ + Optional<Integer> recentPriorityListCount(); + + /** + * Number of relays that has been in in the list of relays prioritized to be + * measured in the last data period. + * + * @since 2.6.0 + */ + Optional<Integer> recentPriorityRelayCount(); + + /** + * Number of times that any relay has been queued to be measured in the last + * data period. + * + * @since 2.6.0 + */ + Optional<Integer> recentMeasurementAttemptCount(); + + /** + * Number of times that the scanner attempted to measure a relay in the last + * data period, but the relay has not been measured because of system, network + * or implementation issues. + * + * @since 2.6.0 + */ + Optional<Integer> recentMeasurementFailureCount(); + + /** + * Number of relays that have no successful measurements in the last data + * period. + * + * @since 2.6.0 + */ + Optional<Integer> recentMeasurementsExcludedErrorCount(); + + /** + * Number of relays that have some successful measurements in the last data + * period, but all those measurements were performed in a period of time that + * was too short. + * + * @since 2.6.0 + */ + Optional<Integer> recentMeasurementsExcludedNearCount(); + + /** + * Number of relays that have some successful measurements, but all those + * measurements are too old. + * + * @since 2.6.0 + */ + Optional<Integer> recentMeasurementsExcludedOldCount(); + + /** + * Number of relays that don't have enough recent successful measurements. + * + * @since 2.6.0 + */ + Optional<Integer> recentMeasurementsExcludedFewCount(); + + /** + * Time that it would take to report measurements about half of the network, + * given the number of eligible relays and the time it took in the last days. + * + * @since 2.6.0 + */ + Optional<Duration> timeToReportHalfNetwork(); + + /** + * List of zero or more {@link RelayLine}s containing relay identities and + * bandwidths in the order as they are contained in the bandwidth file. + * + * @since 2.6.0 + */ + List<RelayLine> relayLines(); + + interface RelayLine { + + /** + * Fingerprint for the relay's RSA identity key. + * + * @since 2.6.0 + */ + Optional<String> nodeId(); + + /** + * Relays's master Ed25519 key, base64 encoded, without trailing "="s. + * + * @since 2.6.0 + */ + Optional<String> masterKeyEd25519(); + + /** + * Bandwidth of this relay in kilobytes per second. + * + * @since 2.6.0 + */ + int bw(); + + /** + * Additional relay key-value pairs, excluding the key value pairs already + * parsed for relay identities and bandwidths. + * + * @since 2.6.0 + */ + Map<String, String> additionalKeyValues(); + } +} + diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java new file mode 100644 index 0000000..5d661e4 --- /dev/null +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java @@ -0,0 +1,431 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.descriptor.impl; + +import org.torproject.descriptor.BandwidthFile; +import org.torproject.descriptor.DescriptorParseException; + +import java.io.File; +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeParseException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Scanner; + +public class BandwidthFileImpl extends DescriptorImpl implements BandwidthFile { + + private enum KeyWithStringValue { + version, software, software_version + } + + private enum KeyWithLocalDateTimeValue { + file_created, generator_started, earliest_bandwidth, latest_bandwidth + } + + private enum KeyWithIntValue { + number_eligible_relays, minimum_percent_eligible_relays, + number_consensus_relays, percent_eligible_relays, + minimum_number_eligible_relays, recent_consensus_count, + recent_priority_list_count, recent_priority_relay_count, + recent_measurement_attempt_count, recent_measurement_failure_count, + recent_measurements_excluded_error_count, + recent_measurements_excluded_near_count, + recent_measurements_excluded_old_count, + recent_measurements_excluded_few_count + } + + BandwidthFileImpl(byte[] rawDescriptorBytes, File descriptorfile) + throws DescriptorParseException { + super(rawDescriptorBytes, new int[] { 0, rawDescriptorBytes.length }, + descriptorfile, false); + Scanner scanner = this.newScanner().useDelimiter("\n"); + this.parseTimestampLine(scanner.nextLine()); + boolean haveFinishedParsingHeader = false; + while (scanner.hasNext()) { + String line = scanner.nextLine(); + if (!haveFinishedParsingHeader) { + if (line.startsWith("bw=") || line.contains(" bw=")) { + haveFinishedParsingHeader = true; + } else if ("====".equals(line) || "=====".equals(line)) { + haveFinishedParsingHeader = true; + continue; + } + } + if (!haveFinishedParsingHeader) { + this.parseHeaderLine(line); + } else { + this.parseRelayLine(line); + } + } + } + + private void parseTimestampLine(String line) throws DescriptorParseException { + try { + this.timestamp = LocalDateTime.ofInstant(Instant.ofEpochSecond( + Long.parseLong(line)), ZoneOffset.UTC); + } catch (NumberFormatException | DateTimeParseException e) { + throw new DescriptorParseException(String.format( + "Unable to parse timestamp in first line: '%s'.", line), e); + } + } + + private void parseHeaderLine(String line) throws DescriptorParseException { + String[] keyValueParts = line.split("=", 2); + if (keyValueParts.length != 2) { + throw new DescriptorParseException(String.format( + "Unrecognized line '%s' without '=' character.", line)); + } + String key = keyValueParts[0]; + if (key.length() < 1) { + throw new DescriptorParseException(String.format( + "Unrecognized line '%s' starting with '=' character.", line)); + } + String value = keyValueParts[1]; + switch (key) { + case "version": + case "software": + case "software_version": + this.parsedStrings.put(KeyWithStringValue.valueOf(key), value); + break; + case "file_created": + case "generator_started": + case "earliest_bandwidth": + case "latest_bandwidth": + try { + this.parsedLocalDateTimes.put(KeyWithLocalDateTimeValue.valueOf(key), + LocalDateTime.parse(value)); + } catch (DateTimeParseException e) { + throw new DescriptorParseException(String.format( + "Unable to parse date-time string: '%s'.", value), e); + } + break; + case "number_eligible_relays": + case "minimum_percent_eligible_relays": + case "number_consensus_relays": + case "percent_eligible_relays": + case "minimum_number_eligible_relays": + case "recent_consensus_count": + case "recent_priority_list_count": + case "recent_priority_relay_count": + case "recent_measurement_attempt_count": + case "recent_measurement_failure_count": + case "recent_measurements_excluded_error_count": + case "recent_measurements_excluded_near_count": + case "recent_measurements_excluded_old_count": + case "recent_measurements_excluded_few_count": + try { + this.parsedInts.put(KeyWithIntValue.valueOf(key), + Integer.parseInt(value)); + } catch (NumberFormatException e) { + throw new DescriptorParseException(String.format( + "Unable to parse int: '%s'.", value), e); + } + break; + case "scanner_country": + if (!value.matches("[A-Z]{2}")) { + throw new DescriptorParseException(String.format( + "Invalid country code '%s'.", value)); + } + this.scannerCountry = value; + break; + case "destinations_countries": + if (!value.matches("[A-Z]{2}(,[A-Z]{2})*")) { + throw new DescriptorParseException(String.format( + "Invalid country code list '%s'.", value)); + } + this.destinationsCountries = value.split(","); + break; + case "time_to_report_half_network": + try { + this.timeToReportHalfNetwork + = Duration.ofSeconds(Long.parseLong(value)); + } catch (NumberFormatException | DateTimeParseException e) { + throw new DescriptorParseException(String.format( + "Unable to parse duration: '%s'.", value), e); + } + break; + case "node_id": + case "master_key_ed25519": + case "bw": + throw new DescriptorParseException(String.format( + "Either additional header line must not use keywords specified in " + + "relay lines, or relay line is missing required keys: '%s'.", + line)); + default: + /* Ignore additional header lines. */ + } + } + + private class RelayLineImpl implements RelayLine { + + private String nodeId; + + @Override + public Optional<String> nodeId() { + return Optional.ofNullable(this.nodeId); + } + + private String masterKeyEd25519; + + @Override + public Optional<String> masterKeyEd25519() { + return Optional.ofNullable(this.masterKeyEd25519); + } + + private int bw; + + @Override + public int bw() { + return this.bw; + } + + private Map<String, String> additionalKeyValues; + + @Override + public Map<String, String> additionalKeyValues() { + return null == this.additionalKeyValues ? Collections.emptyMap() + : Collections.unmodifiableMap(this.additionalKeyValues); + } + + private RelayLineImpl(String nodeId, String masterKeyEd25519, int bw, + Map<String, String> additionalKeyValues) { + this.nodeId = nodeId; + this.masterKeyEd25519 = masterKeyEd25519; + this.bw = bw; + this.additionalKeyValues = additionalKeyValues; + } + } + + private void parseRelayLine(String line) throws DescriptorParseException { + String[] spaceSeparatedLineParts = line.split(" "); + String nodeId = null; + String masterKeyEd25519 = null; + Integer bw = null; + Map<String, String> additionalKeyValues = new LinkedHashMap<>(); + for (String spaceSeparatedLinePart : spaceSeparatedLineParts) { + String[] keyValueParts = spaceSeparatedLinePart.split("=", 2); + if (keyValueParts.length != 2) { + throw new DescriptorParseException(String.format( + "Unrecognized space-separated line part '%s' without '=' " + + "character in line '%s'.", spaceSeparatedLinePart, line)); + } + String key = keyValueParts[0]; + if (key.length() < 1) { + throw new DescriptorParseException(String.format( + "Unrecognized space-separated line part '%s' starting with '=' " + + "character in line '%s'.", spaceSeparatedLinePart, line)); + } + String value = keyValueParts[1]; + switch (key) { + case "node_id": + nodeId = value; + break; + case "master_key_ed25519": + masterKeyEd25519 = value; + break; + case "bw": + try { + bw = Integer.parseInt(value); + } catch (NumberFormatException e) { + throw new DescriptorParseException(String.format( + "Unable to parse bw '%s' in line '%s'.", value, line), e); + } + break; + default: + additionalKeyValues.put(key, value); + } + } + if (null == nodeId && null == masterKeyEd25519) { + throw new DescriptorParseException(String.format( + "Expected relay line, but line contains neither node_id nor " + + "master_key_ed25519: '%s'.", line)); + } + if (null == bw) { + throw new DescriptorParseException(String.format( + "Expected relay line, but line does not contain bw: '%s'.", line)); + } + this.relayLines.add(new RelayLineImpl(nodeId, masterKeyEd25519, bw, + additionalKeyValues.isEmpty() ? null : additionalKeyValues)); + } + + private LocalDateTime timestamp; + + @Override + public LocalDateTime timestamp() { + return this.timestamp; + } + + private EnumMap<KeyWithStringValue, String> parsedStrings + = new EnumMap<>(KeyWithStringValue.class); + + @Override + public String version() { + return this.parsedStrings.getOrDefault(KeyWithStringValue.version, + "1.0.0"); + } + + @Override + public String software() { + return this.parsedStrings.getOrDefault(KeyWithStringValue.software, + "torflow"); + } + + @Override + public Optional<String> softwareVersion() { + return Optional.ofNullable( + this.parsedStrings.get(KeyWithStringValue.software_version)); + } + + private EnumMap<KeyWithLocalDateTimeValue, LocalDateTime> parsedLocalDateTimes + = new EnumMap<>(KeyWithLocalDateTimeValue.class); + + @Override + public Optional<LocalDateTime> fileCreated() { + return Optional.ofNullable(this.parsedLocalDateTimes.get( + KeyWithLocalDateTimeValue.file_created)); + } + + @Override + public Optional<LocalDateTime> generatorStarted() { + return Optional.ofNullable(this.parsedLocalDateTimes.get( + KeyWithLocalDateTimeValue.generator_started)); + } + + @Override + public Optional<LocalDateTime> earliestBandwidth() { + return Optional.ofNullable(this.parsedLocalDateTimes.get( + KeyWithLocalDateTimeValue.earliest_bandwidth)); + } + + @Override + public Optional<LocalDateTime> latestBandwidth() { + return Optional.ofNullable(this.parsedLocalDateTimes.get( + KeyWithLocalDateTimeValue.latest_bandwidth)); + } + + private EnumMap<KeyWithIntValue, Integer> parsedInts + = new EnumMap<>(KeyWithIntValue.class); + + @Override + public Optional<Integer> numberEligibleRelays() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.number_eligible_relays)); + } + + @Override + public Optional<Integer> minimumPercentEligibleRelays() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.minimum_percent_eligible_relays)); + } + + @Override + public Optional<Integer> numberConsensusRelays() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.number_consensus_relays)); + } + + @Override + public Optional<Integer> percentEligibleRelays() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.percent_eligible_relays)); + } + + @Override + public Optional<Integer> minimumNumberEligibleRelays() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.minimum_number_eligible_relays)); + } + + private String scannerCountry; + + @Override + public Optional<String> scannerCountry() { + return Optional.ofNullable(this.scannerCountry); + } + + private String[] destinationsCountries; + + @Override + public Optional<String[]> destinationsCountries() { + return Optional.ofNullable(this.destinationsCountries); + } + + @Override + public Optional<Integer> recentConsensusCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_consensus_count)); + } + + @Override + public Optional<Integer> recentPriorityListCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_priority_list_count)); + } + + @Override + public Optional<Integer> recentPriorityRelayCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_priority_relay_count)); + } + + @Override + public Optional<Integer> recentMeasurementAttemptCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_measurement_attempt_count)); + } + + @Override + public Optional<Integer> recentMeasurementFailureCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_measurement_failure_count)); + } + + @Override + public Optional<Integer> recentMeasurementsExcludedErrorCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_measurements_excluded_error_count)); + } + + @Override + public Optional<Integer> recentMeasurementsExcludedNearCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_measurements_excluded_near_count)); + } + + @Override + public Optional<Integer> recentMeasurementsExcludedOldCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_measurements_excluded_old_count)); + } + + @Override + public Optional<Integer> recentMeasurementsExcludedFewCount() { + return Optional.ofNullable(this.parsedInts.get( + KeyWithIntValue.recent_measurements_excluded_few_count)); + } + + private Duration timeToReportHalfNetwork; + + @Override + public Optional<Duration> timeToReportHalfNetwork() { + return Optional.ofNullable(this.timeToReportHalfNetwork); + } + + private List<RelayLine> relayLines = new ArrayList<>(); + + @Override + public List<RelayLine> relayLines() { + return this.relayLines.isEmpty() ? Collections.emptyList() + : Collections.unmodifiableList(this.relayLines); + } +} + diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index e8b8b08..119fe09 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -132,6 +132,15 @@ public class DescriptorParserImpl implements DescriptorParser { sourceFile); } else if (fileName.contains(LogDescriptorImpl.MARKER)) { return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, fileName); + } else if (firstLines.matches("^[0-9]{10}\\n")) { + /* Identifying bandwidth files by a 10-digit timestamp in the first line + * breaks with files generated before 2002 or after 2286 and when the next + * descriptor identifier starts with just a timestamp in the first line + * rather than a document type identifier. */ + List<Descriptor> parsedDescriptors = new ArrayList<>(); + parsedDescriptors.add(new BandwidthFileImpl(rawDescriptorBytes, + sourceFile)); + return parsedDescriptors; } else { throw new DescriptorParseException("Could not detect descriptor " + "type in descriptor starting with '" + firstLines + "'."); diff --git a/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java b/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java new file mode 100644 index 0000000..d19b7e7 --- /dev/null +++ b/src/test/java/org/torproject/descriptor/impl/BandwidthFileImplTest.java @@ -0,0 +1,596 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.descriptor.impl; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import org.torproject.descriptor.BandwidthFile; +import org.torproject.descriptor.DescriptorParseException; + +import org.hamcrest.Matchers; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; + +public class BandwidthFileImplTest { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + /** + * Example from bandwidth-file-spec.txt: Version 1.0.0, generated by Torflow. + */ + private static final String[] specExample100 = new String[] { + "1523911758", + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=760 nick=Test " + + "measured_at=1523911725 updated_at=1523911725 " + + "pid_error=4.11374090719 pid_error_sum=4.11374090719 " + + "pid_bw=57136645 pid_delta=2.12168374577 circ_fail=0.2 " + + "scanner=/filepath", + "node_id=$96C15995F30895689291F455587BD94CA427B6FC bw=189 nick=Test2 " + + "measured_at=1523911623 updated_at=1523911623 " + + "pid_error=3.96703337994 pid_error_sum=3.96703337994 " + + "pid_bw=47422125 pid_delta=2.65469736988 circ_fail=0.0 " + + "scanner=/filepath" }; + + @Test + public void testSpecExample100() throws DescriptorParseException { + BandwidthFile bandwidthFile = new BandwidthFileImpl( + new TestDescriptorBuilder(specExample100).build(), null); + assertEquals(LocalDateTime.of(2018, 4, 16, 20, 49, 18), + bandwidthFile.timestamp()); + assertEquals("1.0.0", bandwidthFile.version()); + assertEquals("torflow", bandwidthFile.software()); + assertFalse(bandwidthFile.softwareVersion().isPresent()); + assertFalse(bandwidthFile.fileCreated().isPresent()); + assertFalse(bandwidthFile.generatorStarted().isPresent()); + assertFalse(bandwidthFile.earliestBandwidth().isPresent()); + assertFalse(bandwidthFile.latestBandwidth().isPresent()); + assertFalse(bandwidthFile.numberEligibleRelays().isPresent()); + assertFalse(bandwidthFile.minimumPercentEligibleRelays().isPresent()); + assertFalse(bandwidthFile.numberConsensusRelays().isPresent()); + assertFalse(bandwidthFile.percentEligibleRelays().isPresent()); + assertFalse(bandwidthFile.minimumNumberEligibleRelays().isPresent()); + assertFalse(bandwidthFile.scannerCountry().isPresent()); + assertFalse(bandwidthFile.destinationsCountries().isPresent()); + assertFalse(bandwidthFile.recentConsensusCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityListCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityRelayCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementAttemptCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementFailureCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedErrorCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedNearCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedOldCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedFewCount().isPresent()); + assertFalse(bandwidthFile.timeToReportHalfNetwork().isPresent()); + assertEquals(2, bandwidthFile.relayLines().size()); + BandwidthFile.RelayLine firstRelayLine = bandwidthFile.relayLines().get(0); + assertEquals(Optional.of("$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80"), + firstRelayLine.nodeId()); + assertFalse(firstRelayLine.masterKeyEd25519().isPresent()); + assertEquals(760, firstRelayLine.bw()); + Map<String, String> expectedFirstAdditionalKeyValues + = new LinkedHashMap<>(); + expectedFirstAdditionalKeyValues.put("nick", "Test"); + expectedFirstAdditionalKeyValues.put("measured_at", "1523911725"); + expectedFirstAdditionalKeyValues.put("updated_at", "1523911725"); + expectedFirstAdditionalKeyValues.put("pid_error", "4.11374090719"); + expectedFirstAdditionalKeyValues.put("pid_error_sum", "4.11374090719"); + expectedFirstAdditionalKeyValues.put("pid_bw", "57136645"); + expectedFirstAdditionalKeyValues.put("pid_delta", "2.12168374577"); + expectedFirstAdditionalKeyValues.put("circ_fail", "0.2"); + expectedFirstAdditionalKeyValues.put("scanner", "/filepath"); + assertEquals(expectedFirstAdditionalKeyValues, + firstRelayLine.additionalKeyValues()); + } + + @Test + public void testTimestampAsKeyValue() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Unable to parse timestamp in first line")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample100) + .replaceLineStartingWith("1523911758", "timestamp=1523911758") + .build(), null); + } + + @Test + public void testEmptyLine() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Blank lines are not allowed.")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample100) + .appendLines("") + .build(), null); + } + + @Test + public void testHeaderLineAtEnd() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Expected relay line, but line contains neither node_id nor " + + "master_key_ed25519")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample100) + .appendLines("version=1.0.0") + .build(), null); + } + + @Test + public void testRelayLineWithoutRelayId() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Either additional header line must not use keywords specified in " + + "relay lines, or relay line is missing required keys")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample100) + .replaceLineStartingWith( + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80", + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80") + .build(), null); + } + + @Test + public void testRelayLineWithoutBw() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Expected relay line, but line contains neither node_id nor " + + "master_key_ed25519")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample100) + .replaceLineStartingWith( + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80", "bw=760") + .build(), null); + } + + @Test + public void testBwNotANumber() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Unable to parse bw 'slow' in line")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample100) + .replaceLineStartingWith( + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80", + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=slow") + .build(), null); + } + + @Test + public void testRelayLineTrailingSpace() throws DescriptorParseException { + BandwidthFile bandwidthFile = new BandwidthFileImpl( + new TestDescriptorBuilder(specExample100) + .replaceLineStartingWith( + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80", + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=760 ") + .build(), null); + /* It's okay that this line ends with a space, we're parsing it anyway. */ + assertEquals(2, bandwidthFile.relayLines().size()); + BandwidthFile.RelayLine firstRelayLine = bandwidthFile.relayLines().get(0); + assertEquals(Optional.of("$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80"), + firstRelayLine.nodeId()); + assertEquals(760, firstRelayLine.bw()); + } + + /** + * Example from bandwidth-file-spec.txt: Version 1.1.0, generated by sbws + * version 0.1.0. + */ + private static final String[] specExample110 = new String[] { + "1523911758", + "version=1.1.0", + "software=sbws", + "software_version=0.1.0", + "latest_bandwidth=2018-04-16T20:49:18", + "file_created=2018-04-16T21:49:18", + "generator_started=2018-04-16T15:13:25", + "earliest_bandwidth=2018-04-16T15:13:26", + "====", + "bw=380 error_circ=0 error_misc=0 error_stream=1 " + + "master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ " + + "nick=Test node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 " + + "rtt=380 success=1 time=2018-05-08T16:13:26", + "bw=189 error_circ=0 error_misc=0 error_stream=0 " + + "master_key_ed25519=a6a+dZadrQBtfSbmQkP7j2ardCmLnm5NJ4ZzkvDxbo0I " + + "nick=Test2 node_id=$96C15995F30895689291F455587BD94CA427B6FC " + + "rtt=378 success=1 time=2018-05-08T16:13:36" }; + + @Test + public void testSpecExample110() throws DescriptorParseException { + BandwidthFile bandwidthFile = new BandwidthFileImpl( + new TestDescriptorBuilder(specExample110).build(), null); + assertEquals(LocalDateTime.of(2018, 4, 16, 20, 49, 18), + bandwidthFile.timestamp()); + assertEquals("1.1.0", bandwidthFile.version()); + assertEquals("sbws", bandwidthFile.software()); + assertEquals(Optional.of("0.1.0"), bandwidthFile.softwareVersion()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 21, 49, 18)), + bandwidthFile.fileCreated()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 25)), + bandwidthFile.generatorStarted()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 26)), + bandwidthFile.earliestBandwidth()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 20, 49, 18)), + bandwidthFile.latestBandwidth()); + assertFalse(bandwidthFile.numberEligibleRelays().isPresent()); + assertFalse(bandwidthFile.minimumPercentEligibleRelays().isPresent()); + assertFalse(bandwidthFile.numberConsensusRelays().isPresent()); + assertFalse(bandwidthFile.percentEligibleRelays().isPresent()); + assertFalse(bandwidthFile.minimumNumberEligibleRelays().isPresent()); + assertFalse(bandwidthFile.scannerCountry().isPresent()); + assertFalse(bandwidthFile.destinationsCountries().isPresent()); + assertFalse(bandwidthFile.recentConsensusCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityListCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityRelayCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementAttemptCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementFailureCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedErrorCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedNearCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedOldCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedFewCount().isPresent()); + assertFalse(bandwidthFile.timeToReportHalfNetwork().isPresent()); + } + + @Test + public void testTerminatorLineTooShort() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Unrecognized line '===' starting with '=' character")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample110) + .replaceLineStartingWith("====", "===").build(), null); + } + + @Test + public void testDateTimeContainingSpace() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Unable to parse date-time string")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample110) + .replaceLineStartingWith("earliest_bandwidth", + "earliest_bandwidth=2018-04-16 15:13:26") + .build(), null); + } + + /** + * Example from bandwidth-file-spec.txt: Version 1.2.0, generated by sbws + * version 1.0.3. + */ + private static final String[] specExample120 = new String[] { + "1523911758", + "version=1.2.0", + "latest_bandwidth=2018-04-16T20:49:18", + "file_created=2018-04-16T21:49:18", + "generator_started=2018-04-16T15:13:25", + "earliest_bandwidth=2018-04-16T15:13:26", + "minimum_number_eligible_relays=3862", + "minimum_percent_eligible_relays=60", + "number_consensus_relays=6436", + "number_eligible_relays=6000", + "percent_eligible_relays=93", + "software=sbws", + "software_version=1.0.3", + "=====", + "bw=38000 bw_mean=1127824 bw_median=1180062 desc_avg_bw=1073741824 " + + "desc_obs_bw_last=17230879 desc_obs_bw_mean=14732306 error_circ=0 " + + "error_misc=0 error_stream=1 " + + "master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ " + + "nick=Test node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 " + + "rtt=380 success=1 time=2018-05-08T16:13:26", + "bw=1 bw_mean=199162 bw_median=185675 desc_avg_bw=409600 " + + "desc_obs_bw_last=836165 desc_obs_bw_mean=858030 error_circ=0 " + + "error_misc=0 error_stream=0 " + + "master_key_ed25519=a6a+dZadrQBtfSbmQkP7j2ardCmLnm5NJ4ZzkvDxbo0I " + + "nick=Test2 node_id=$96C15995F30895689291F455587BD94CA427B6FC " + + "rtt=378 success=1 time=2018-05-08T16:13:36" }; + + @Test + public void testSpecExample120() throws DescriptorParseException { + BandwidthFile bandwidthFile = new BandwidthFileImpl( + new TestDescriptorBuilder(specExample120).build(), null); + assertEquals(LocalDateTime.of(2018, 4, 16, 20, 49, 18), + bandwidthFile.timestamp()); + assertEquals("1.2.0", bandwidthFile.version()); + assertEquals("sbws", bandwidthFile.software()); + assertEquals(Optional.of("1.0.3"), bandwidthFile.softwareVersion()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 21, 49, 18)), + bandwidthFile.fileCreated()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 25)), + bandwidthFile.generatorStarted()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 26)), + bandwidthFile.earliestBandwidth()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 20, 49, 18)), + bandwidthFile.latestBandwidth()); + assertEquals(Optional.of(6000), bandwidthFile.numberEligibleRelays()); + assertEquals(Optional.of(60), bandwidthFile.minimumPercentEligibleRelays()); + assertEquals(Optional.of(6436), bandwidthFile.numberConsensusRelays()); + assertEquals(Optional.of(93), bandwidthFile.percentEligibleRelays()); + assertEquals(Optional.of(3862), + bandwidthFile.minimumNumberEligibleRelays()); + assertFalse(bandwidthFile.scannerCountry().isPresent()); + assertFalse(bandwidthFile.destinationsCountries().isPresent()); + assertFalse(bandwidthFile.recentConsensusCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityListCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityRelayCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementAttemptCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementFailureCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedErrorCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedNearCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedOldCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedFewCount().isPresent()); + assertFalse(bandwidthFile.timeToReportHalfNetwork().isPresent()); + } + + @Test + public void testNumberEligibleRelaysNotAnInt() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Unable to parse int")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample120) + .replaceLineStartingWith("number_eligible_relays=6000", + "number_eligible_relays=sixthousand").build(), null); + } + + /** + * Example from bandwidth-file-spec.txt: Version 1.2.0, generated by sbws + * version 1.0.3 when there are not enough eligible measured relays. + */ + private static final String[] specExample120NotEnough = new String[] { + "1540496079", + "version=1.2.0", + "earliest_bandwidth=2018-10-20T19:35:52", + "file_created=2018-10-25T19:35:03", + "generator_started=2018-10-25T11:42:56", + "latest_bandwidth=2018-10-25T19:34:39", + "minimum_number_eligible_relays=3862", + "minimum_percent_eligible_relays=60", + "number_consensus_relays=6436", + "number_eligible_relays=2960", + "percent_eligible_relays=46", + "software=sbws", + "software_version=1.0.3", + "=====" }; + + @Test + public void testSpecExample120NotEnough() throws DescriptorParseException { + BandwidthFile bandwidthFile = new BandwidthFileImpl( + new TestDescriptorBuilder(specExample120NotEnough).build(), null); + assertEquals(LocalDateTime.of(2018, 10, 25, 19, 34, 39), + bandwidthFile.timestamp()); + assertEquals("1.2.0", bandwidthFile.version()); + assertEquals("sbws", bandwidthFile.software()); + assertEquals(Optional.of("1.0.3"), bandwidthFile.softwareVersion()); + assertEquals(Optional.of(LocalDateTime.of(2018, 10, 25, 19, 35, 3)), + bandwidthFile.fileCreated()); + assertEquals(Optional.of(LocalDateTime.of(2018, 10, 25, 11, 42, 56)), + bandwidthFile.generatorStarted()); + assertEquals(Optional.of(LocalDateTime.of(2018, 10, 20, 19, 35, 52)), + bandwidthFile.earliestBandwidth()); + assertEquals(Optional.of(LocalDateTime.of(2018, 10, 25, 19, 34, 39)), + bandwidthFile.latestBandwidth()); + assertEquals(Optional.of(2960), bandwidthFile.numberEligibleRelays()); + assertEquals(Optional.of(60), bandwidthFile.minimumPercentEligibleRelays()); + assertEquals(Optional.of(6436), bandwidthFile.numberConsensusRelays()); + assertEquals(Optional.of(46), bandwidthFile.percentEligibleRelays()); + assertEquals(Optional.of(3862), + bandwidthFile.minimumNumberEligibleRelays()); + assertFalse(bandwidthFile.scannerCountry().isPresent()); + assertFalse(bandwidthFile.destinationsCountries().isPresent()); + assertFalse(bandwidthFile.recentConsensusCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityListCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityRelayCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementAttemptCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementFailureCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedErrorCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedNearCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedOldCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedFewCount().isPresent()); + assertFalse(bandwidthFile.timeToReportHalfNetwork().isPresent()); + } + + /** + * Example from bandwidth-file-spec.txt: Version 1.3.0 headers generated by + * sbws version 1.0.4. + */ + private static final String[] specExample130Headers = new String[] { + "1523911758", + "version=1.3.0", + "latest_bandwidth=2018-04-16T20:49:18", + "destinations_countries=TH,ZZ", + "file_created=2018-04-16T21:49:18", + "generator_started=2018-04-16T15:13:25", + "earliest_bandwidth=2018-04-16T15:13:26", + "minimum_number_eligible_relays=3862", + "minimum_percent_eligible_relays=60", + "number_consensus_relays=6436", + "number_eligible_relays=6000", + "percent_eligible_relays=93", + "scanner_country=SN", + "software=sbws", + "software_version=1.0.4", + "=====" }; + + @Test + public void testSpecExample130Headers() throws DescriptorParseException { + BandwidthFile bandwidthFile = new BandwidthFileImpl( + new TestDescriptorBuilder(specExample130Headers).build(), null); + assertEquals(LocalDateTime.of(2018, 4, 16, 20, 49, 18), + bandwidthFile.timestamp()); + assertEquals("1.3.0", bandwidthFile.version()); + assertEquals("sbws", bandwidthFile.software()); + assertEquals(Optional.of("1.0.4"), bandwidthFile.softwareVersion()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 21, 49, 18)), + bandwidthFile.fileCreated()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 25)), + bandwidthFile.generatorStarted()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 26)), + bandwidthFile.earliestBandwidth()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 20, 49, 18)), + bandwidthFile.latestBandwidth()); + assertEquals(Optional.of(6000), bandwidthFile.numberEligibleRelays()); + assertEquals(Optional.of(60), bandwidthFile.minimumPercentEligibleRelays()); + assertEquals(Optional.of(6436), bandwidthFile.numberConsensusRelays()); + assertEquals(Optional.of(93), bandwidthFile.percentEligibleRelays()); + assertEquals(Optional.of(3862), + bandwidthFile.minimumNumberEligibleRelays()); + assertEquals(Optional.of("SN"), bandwidthFile.scannerCountry()); + assertArrayEquals(new String[] { "TH", "ZZ" }, + bandwidthFile.destinationsCountries().orElse(null)); + assertFalse(bandwidthFile.recentConsensusCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityListCount().isPresent()); + assertFalse(bandwidthFile.recentPriorityRelayCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementAttemptCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementFailureCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedErrorCount().isPresent()); + assertFalse( + bandwidthFile.recentMeasurementsExcludedNearCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedOldCount().isPresent()); + assertFalse(bandwidthFile.recentMeasurementsExcludedFewCount().isPresent()); + assertFalse(bandwidthFile.timeToReportHalfNetwork().isPresent()); + } + + @Test + public void testScannerCountryLowerCase() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Invalid country code 'sn'.")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample130Headers) + .replaceLineStartingWith("scanner_country", "scanner_country=sn") + .build(), null); + } + + @Test + public void testDestinationsCountriesLowerCase() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Invalid country code list 'th,zz'.")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample130Headers) + .replaceLineStartingWith("destinations_countries", + "destinations_countries=th,zz") + .build(), null); + } + + @Test + public void testDestinationsCountriesEndingWithComma() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers.containsString( + "Invalid country code list 'TH,'.")); + new BandwidthFileImpl(new TestDescriptorBuilder(specExample130Headers) + .replaceLineStartingWith("destinations_countries", + "destinations_countries=TH,") + .build(), null); + } + + /** + * Example from bandwidth-file-spec.txt: Version 1.4.0 generated by sbws + * version 1.1.0. + */ + private static final String[] specExample140 = new String[] { + "1523911758", + "version=1.4.0", + "latest_bandwidth=2018-04-16T20:49:18", + "destinations_countries=TH,ZZ", + "file_created=2018-04-16T21:49:18", + "generator_started=2018-04-16T15:13:25", + "earliest_bandwidth=2018-04-16T15:13:26", + "minimum_number_eligible_relays=3862", + "minimum_percent_eligible_relays=60", + "number_consensus_relays=6436", + "number_eligible_relays=6000", + "percent_eligible_relays=93", + "recent_measurement_attempt_count=6243", + "recent_measurement_failure_count=732", + "recent_measurements_excluded_error_count=969", + "recent_measurements_excluded_few_count=3946", + "recent_measurements_excluded_near_count=90", + "recent_measurements_excluded_old_count=0", + "recent_priority_list_count=20", + "recent_priority_relay_count=6243", + "scanner_country=SN", + "software=sbws", + "software_version=1.1.0", + "time_to_report_half_network=57273", + "=====", + "bw=1 error_circ=1 error_destination=0 error_misc=0 error_second_relay=0 " + + "error_stream=0 " + + "master_key_ed25519=J3HQ24kOQWac3L1xlFLp7gY91qkb5NuKxjj1BhDi+m8 " + + "nick=snap269 node_id=$DC4D609F95A52614D1E69C752168AF1FCAE0B05F " + + "relay_recent_measurement_attempt_count=3 " + + "relay_recent_measurements_excluded_error_count=1 " + + "relay_recent_measurements_excluded_near_count=3 " + + "relay_recent_consensus_count=3 relay_recent_priority_list_count=3 " + + "success=3 time=2019-03-16T18:20:57 unmeasured=1 vote=0", + "bw=1 error_circ=0 error_destination=0 error_misc=0 error_second_relay=0 " + + "error_stream=2 " + + "master_key_ed25519=h6ZB1E1yBFWIMloUm9IWwjgaPXEpL5cUbuoQDgdSDKg " + + "nick=relay node_id=$C4544F9E209A9A9B99591D548B3E2822236C0503 " + + "relay_recent_measurement_attempt_count=3 " + + "relay_recent_measurements_excluded_error_count=2 " + + "relay_recent_measurements_excluded_few_count=1 " + + "relay_recent_consensus_count=3 relay_recent_priority_list_count=3 " + + "success=1 time=2019-03-17T06:50:58 unmeasured=1 vote=0" }; + + @Test + public void testSpecExample140() throws DescriptorParseException { + BandwidthFile bandwidthFile = new BandwidthFileImpl( + new TestDescriptorBuilder(specExample140).build(), null); + assertEquals(LocalDateTime.of(2018, 4, 16, 20, 49, 18), + bandwidthFile.timestamp()); + assertEquals("1.4.0", bandwidthFile.version()); + assertEquals("sbws", bandwidthFile.software()); + assertEquals(Optional.of("1.1.0"), bandwidthFile.softwareVersion()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 21, 49, 18)), + bandwidthFile.fileCreated()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 25)), + bandwidthFile.generatorStarted()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 15, 13, 26)), + bandwidthFile.earliestBandwidth()); + assertEquals(Optional.of(LocalDateTime.of(2018, 4, 16, 20, 49, 18)), + bandwidthFile.latestBandwidth()); + assertEquals(Optional.of(6000), bandwidthFile.numberEligibleRelays()); + assertEquals(Optional.of(60), bandwidthFile.minimumPercentEligibleRelays()); + assertEquals(Optional.of(6436), bandwidthFile.numberConsensusRelays()); + assertEquals(Optional.of(93), bandwidthFile.percentEligibleRelays()); + assertEquals(Optional.of(3862), + bandwidthFile.minimumNumberEligibleRelays()); + assertEquals(Optional.of("SN"), bandwidthFile.scannerCountry()); + assertArrayEquals(new String[] { "TH", "ZZ" }, + bandwidthFile.destinationsCountries().orElse(null)); + assertFalse(bandwidthFile.recentConsensusCount().isPresent()); + assertEquals(Optional.of(20), + bandwidthFile.recentPriorityListCount()); + assertEquals(Optional.of(6243), + bandwidthFile.recentPriorityRelayCount()); + assertEquals(Optional.of(6243), + bandwidthFile.recentMeasurementAttemptCount()); + assertEquals(Optional.of(732), + bandwidthFile.recentMeasurementFailureCount()); + assertEquals(Optional.of(969), + bandwidthFile.recentMeasurementsExcludedErrorCount()); + assertEquals(Optional.of(90), + bandwidthFile.recentMeasurementsExcludedNearCount()); + assertEquals(Optional.of(0), + bandwidthFile.recentMeasurementsExcludedOldCount()); + assertEquals(Optional.of(3946), + bandwidthFile.recentMeasurementsExcludedFewCount()); + assertEquals(Optional.of(Duration.ofSeconds(57273L)), + bandwidthFile.timeToReportHalfNetwork()); + } +} + diff --git a/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java b/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java new file mode 100644 index 0000000..a596c9d --- /dev/null +++ b/src/test/java/org/torproject/descriptor/impl/TestDescriptorBuilder.java @@ -0,0 +1,120 @@ +/* Copyright 2016--2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.descriptor.impl; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Builds a test descriptor by concatenating the given lines with newlines and + * writing the output to a byte array. + */ +class TestDescriptorBuilder extends ArrayList<String> { + + /** + * Initializes a new test descriptor builder with the given lines. + */ + TestDescriptorBuilder(String ... lines) { + this.addAll(Arrays.asList(lines)); + } + + /** + * Appends the given line or lines. + */ + TestDescriptorBuilder appendLines(String ... lines) { + this.addAll(Arrays.asList(lines)); + return this; + } + + /** + * Removes the given line, or fails if that line cannot be found. + */ + TestDescriptorBuilder removeLine(String line) { + if (!this.remove(line)) { + fail("Line not contained: " + line); + } + return this; + } + + /** + * Removes all but the given line, or fails if that line cannot be found. + */ + TestDescriptorBuilder removeAllExcept(String line) { + assertTrue("Line not contained: " + line, this.contains(line)); + this.retainAll(Arrays.asList(line)); + return this; + } + + /** + * Finds the first line that starts with the given line start and inserts the + * given lines before it, or fails if no line can be found with that line + * start. + */ + TestDescriptorBuilder insertBeforeLineStartingWith(String lineStart, + String ... linesToInsert) { + for (int i = 0; i < this.size(); i++) { + if (this.get(i).startsWith(lineStart)) { + this.addAll(i, Arrays.asList(linesToInsert)); + return this; + } + } + fail("Line start not found: " + lineStart); + return this; + } + + /** + * Finds the first line that starts with the given line start and replaces + * that line and possibly subsequent lines, or fails if no line can be found + * with that line start or there are not enough lines left to replace. + */ + TestDescriptorBuilder replaceLineStartingWith(String lineStart, + String ... linesToReplace) { + for (int i = 0; i < this.size(); i++) { + if (this.get(i).startsWith(lineStart)) { + for (int j = 0; j < linesToReplace.length; j++) { + assertTrue("Not enough lines left to replace.", + this.size() > i + j); + this.set(i + j, linesToReplace[j]); + } + return this; + } + } + fail("Line start not found: " + lineStart); + return this; + } + + /** + * Finds the first line that starts with the given line start and truncates + * that line and possibly subsequent lines, or fails if no line can be found + * with that line start. + */ + TestDescriptorBuilder truncateAtLineStartingWith(String lineStart) { + for (int i = 0; i < this.size(); i++) { + if (this.get(i).startsWith(lineStart)) { + while (this.size() > i) { + this.remove(i); + } + return this; + } + } + fail("Line start not found: " + lineStart); + return this; + } + + /** + * Concatenates all descriptor lines with newlines and returns the raw + * descriptor bytes as byte array. + */ + byte[] build() { + StringBuilder sb = new StringBuilder(); + for (String line : this) { + sb.append(line).append('\n'); + } + return sb.toString().getBytes(); + } +} +

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 5e58d7a84bacd93d6001cbeb9ce7720d7da1d0db Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 12:48:15 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+zh-CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 028b56478..3fe11cb7b 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1512,8 +1512,8 @@ msgid "" "operators, or to an outside observer. For this reason, Flash is disabled by " "default in Tor Browser, and enabling it is not recommended." msgstr "" -"某些如 Vimeo 等视频网站使用 Flash Player 插件来播放内容。而非常遗憾地，此插件程序是独立运行的软件，件且完全不遵循 Tor " -"浏览器之代理服务器设置。因此若启用此插件程序，您的真实网络地址将会直接公开给网站的管理员以及任何正在网络上监听的恶意人士所知，故在 Tor 浏览器中 " +"某些如 Vimeo 等视频网站使用 Flash Player 插件来播放内容。而非常遗憾地，此插件程序是独立运行的软件，且完全不遵循 Tor " +"浏览器之代理服务器设置。因此若启用此插件程序，您的真实网络地址将会直接公开给网站的管理员以及任何正在网络上监听的恶意人士，故在 Tor 浏览器中 " "Flash Player 为默认关闭，在此也不建议您去启用它。" #: https//tb-manual.torproject.org/en-US/plugins/ @@ -1611,7 +1611,7 @@ 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 "理论上来说，当 Tor 浏览器启动后您应该可以直接开始浏览网页，若是首次启动的话，顶多只需要再点击“连接”按钮即可开始上网。" +msgstr "理论上来说，当 Tor 浏览器启动后您应该可以直接开始浏览网页，若是首次启动的话只需要再点击“连接”按钮即可开始上网。" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body)

1 0

Jump to page: