tor-commits
Threads by month
- ----- 2026 -----
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 215231 discussions
commit b366bb4af8786ca06437f7f7ce5e340c69f0f6e4
Author: Philipp Winter <phw(a)nymity.ch>
Date: Mon Oct 14 20:49:03 2019 -0700
Remove PGP support.
---
.gnupg/TESTING.pub | Bin 4622 -> 0 bytes
.gnupg/TESTING.subkeys.sec | Bin 7212 -> 0 bytes
.gnupg/bridgedb-offline-key.pub.asc | 113 ----------
.gnupg/bridgedb-online-key.pub.asc | 100 ---------
.gnupg/gpg.conf | 96 ---------
.gnupg/pubring.gpg | Bin 4634 -> 0 bytes
.gnupg/secring.gpg | Bin 7224 -> 0 bytes
.travis.requirements.txt | 1 -
CHANGELOG | 6 +
README.rst | 29 +--
bridgedb.conf | 45 ----
bridgedb/configure.py | 3 +-
bridgedb/crypto.py | 99 +--------
bridgedb/distributors/email/autoresponder.py | 41 +---
bridgedb/distributors/email/distributor.py | 6 +-
bridgedb/distributors/email/request.py | 22 --
bridgedb/distributors/email/server.py | 10 -
bridgedb/distributors/email/templates.py | 7 -
bridgedb/distributors/https/server.py | 2 -
bridgedb/distributors/https/templates/base.html | 2 -
bridgedb/i18n/templates/bridgedb.pot | 84 ++++----
bridgedb/strings.py | 268 +-----------------------
bridgedb/test/email_helpers.py | 23 +-
bridgedb/test/test_crypto.py | 137 ------------
bridgedb/test/test_email_autoresponder.py | 15 --
bridgedb/test/test_email_request.py | 36 +---
bridgedb/test/test_email_templates.py | 11 -
bridgedb/test/test_main.py | 5 -
requirements.txt | 1 -
scripts/setup-tests | 2 +-
30 files changed, 63 insertions(+), 1101 deletions(-)
diff --git a/.gnupg/TESTING.pub b/.gnupg/TESTING.pub
deleted file mode 100644
index 764bf47..0000000
Binary files a/.gnupg/TESTING.pub and /dev/null differ
diff --git a/.gnupg/TESTING.subkeys.sec b/.gnupg/TESTING.subkeys.sec
deleted file mode 100644
index 688f7e9..0000000
Binary files a/.gnupg/TESTING.subkeys.sec and /dev/null differ
diff --git a/.gnupg/bridgedb-offline-key.pub.asc b/.gnupg/bridgedb-offline-key.pub.asc
deleted file mode 100644
index 47d1310..0000000
--- a/.gnupg/bridgedb-offline-key.pub.asc
+++ /dev/null
@@ -1,113 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQgNBFJZB+QBQADcx7laikgZOZXLm6WH2mClm7KrRChmQAHOmzvRYTElk+hVZJ6g
-qSUTdl8fvfhifZPCd3g7nJBtOhQAGlrHmJRXfdf4cTRuD73nggbYQ0NRR9VZ3MIK
-ToJDELBhgmWeNKpLcPsTpi2t9qrHf3xxM06OdxOs9lCGtW7XVYnKx3vaRNk6c0ln
-De82ZWnZr1eMoPzcjslw7AxI94hIgV1GDwTSpBndv/VwgLeBC5XNCKv0adhO/RSt
-fuZOHGT/HfI0U0C3fSTiIu4lJqEd9Qe8LUFQ7wRMrf3KSWwyWNb/OtyMfZ52PEg9
-SMWEfpr6aGwQu6yGPsE4SeHsiew5IqCMi64TZ9IcgY0fveiDzMSIAqnWQcxSL0SH
-YbwQPxuOc4Rxj/b1umjigBG/Y4rkrxCKIw6M+CRaz203zs9ntOsWfnary/w+hepA
-XLjC0yb0cP/oBB6qRyaCk2UTdqq1uWmJ2R/XhZHdZIDabxby6mvQbUQA/NEMOE/B
-VrDonP1HNo1xpnY8lltbxdFD/jDikdjIazckMWl/0fri0pyPSdiJdAK2JrUniP9Q
-eNbgcx3XvNnfjYjiQjTdqfxCTKpSmnsBNyYng6c4viOr5weBFXwEJq2Nl7+rP5pm
-TF1PeiF769z4l2Mrx3X5sQqavTzd2VBMQ6/Kmk9Emxb8e1zyQD6odqJyTi1BBAes
-F2BuKLMCVgZWOFSNGDOMoAUMZh0c6sRQtwz3KRBAuxUYm3wQPqG3XpDDcNM5YXgF
-wVU8SYVwdFpPYT5XJIv2J2u45XbPma5aR0ynGuAmNptzELHta5cgeWIMVsKQbnPN
-M6YTOy5auxLts3FZvKpTDyjBd/VRK6ihkKNKFY3gbP6RbwEK3ws/zOxqFau7sA5i
-NGv4siQTWMG++pClz/exbgHPgs3f8yO34ZbocEBdS1sDl1Lsq4qJYo2Kn5MMHCGs
-dqd7Y+E+ep6b74njb1m2UsySEE2cjj/FAFH91jfFy5PedNb/2Hx6BsPJVb7+N4eI
-pehKQQ46XAbsMq6vUtI4Y0rFiBnqvpERqATQ2QhnEh0UmH7wKVQc4MREZfeEqazV
-G/JFt5Qnt3jq8p6/qbWlOPKTLGUqGq3RXiJgEy/5i22R2ZDjafiGoG1KsZIVZg39
-N25fT8abjPWme6JI3Jv+6gKY8tURoePZcMp/rw0NFs1HtCKUAU6FEOh6uJO7KNie
-eE8qG8ItRXVYnP4f8MFyFkHZcJw27d0PT3IrCM1vJwjqgb2j2xWM/8GJDDuUyims
-jvLDH1E7ek600H3FT5c9xPcgwfMM8BOdBNu0Evm9sdZBZFket+ytXo6GKyS/d91D
-FWE+YL+25+sZJS71dnvSUWVneJrTLFasefvPfIR9/aLJoLVFHnN9sUHfVMj0KlGl
-8AuxL7QfNQawvyjoV8rw/sJOQOwwhof1gZz0ZyjuTKj0WekjmDxcRzVY0eX6BzTm
-o7r4jrHl1Mi75svnKCpXi0Vu/1ZqSnKjCjhRTXDLm7tb8b18jogsgDfs7UkUNwD/
-XF8EfTTU4KotLOODAZIW+soFJZgf8rXQZLRShQmre+PUJfADEUd3yyE9h0JIunPQ
-CxR8R8hVhK4yqFn662Ou7fEl3q8FYBBi1Ahn+263S7+WaZGo7ElwzfRb97gP1e77
-eYd8JwY7UBIQku83CxQdahdGOpAfyvhYW2mxCHVZLXObwc18VgRMa7vjCbkGRPSN
-5NecU5KGW6jU1dXuZk0jRt/9mqtYPjJ7K/EVJD9Yxmz+UdxH+BtsSRp3/5fDmHtW
-CB39a7fetp0ixN503FXPKQUvKAKykETwevmWOzHH3t6BpY/ZSjDCC35Y3dWeB54H
-qNta1r0pSWV6IARUoVteAOcuOU/l3HNzY80rL+iR0HiaszioBsd8k8u0rWXzM3BP
-3vhTzccaldSWfqoT86Jfx0YLX6EoocVS8Ka5KUA8VlJWufnPPXDlF3dULrb+ds/l
-zLazt9hF49HCpU1rZc3doRgmBYxMjYyrfK/3uarDefpfdnjbAVIoP26VpVXhLTEM
-oaD+WoTpIyLYfJQUDn1Q06Nu393JqZb8nRngyMeTs73MDJTzqdL4rZXyweeTrtYe
-4yy+Kc3CZdPlZqpkbuxP0cO0ivaTLdXsTCHDnpk16u4sDukcsmlaTF5d75nu/KIQ
-o3nk0g9NvoschDcQiExuqCUOXCkKcUvYVHsuglAuT+AqK692562JrDOVoGwkUVvm
-Qfo0AQvBvXUzHY4YuBUdWbjWsC4sj6B+MW/TIs/OlKIbPE3MHeDhEGLl/8uBceVo
-kM36xm4F8wDwPK4GPyi/D+3piqBsrsjkgRlodQIUS7A9V19b8TWbUFeH4JGJ+5EH
-9WErBlrsQrnosojLchGGp7HxSxWLBiwdnltu6+/hwbBwydJT8ZxPUANIwTdB+mOE
-ILUXBkpIDfVSoZD7qWlntai53BDQr5pfMJhv15di4XAhtqv43vAmA57ifd+QJS2U
-AfYc4CdX0lk2BZ4jRD8jCZ4Uxw15E3RqhnXsWDRxtD4fwsb2ZFi0DDuPlwBdGgh5
-Rm2Bz9JjSV6gDEuXr/JtAzjSz1Jdh8wPkSofiHGTfxysVhlGlg+YPRziRlzML8A2
-0xY+9mPxEEin5ZQ9wmrDyiiOBvPTbG3O9+Sp5VZDuD4ivW/DHumPWGVSRdjcAQDe
-HMXUVGjhBDnj06XNrgJPhODdJeYq0EnGTt15ofZQSswD7TTTRPDOn0Cz/QARAQAB
-tDpCcmlkZ2VEQiAoT2ZmbGluZSBJRCBLZXkpIDxicmlkZ2VzQGJyaWRnZXMudG9y
-cHJvamVjdC5vcmc+iQkfBBMBCgEJBQJSWQfkSBSAAAAAABcAKHZlcmlmaWVkQHRv
-cnByb2plY3Qub3JnN0I3ODQzNzAxNUU2M0RGNDdCQjEyNzBBQ0JEOTdBQTI0RThF
-NDcyRU8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmc3Qjc4
-NDM3MDE1RTYzREY0N0JCMTI3MEFDQkQ5N0FBMjRFOEU0NzJFKhpodHRwczovL2Jy
-aWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAIbAQMLDQkEFQoJCAQWAgEA
-Ah4BAheAJxhodHRwczovL2JyaWRnZXMudG9ycHJvamVjdC5vcmcva2V5LmFzYwAK
-CRDL2XqiTo5HLoqEP/48rFpJCVStn8xo+KkHSVvsqpxDRlb/nNheI+ov2UxILdwl
-NIU6kLsvKECKPe1AHKdS/MzANbkTF35Y4QgZsNpVXaCVL7adGBSzOdPFupDJJVOu
-wa+uFRc/FuNJyH/TIn56/+R5J5C54OxIYNxvW3WF4eHKLJYk/JZOMMfy4iWm7Sql
-0nDC5O435nK4F4Jb4GLPlUIzioIy2OWqGoFHXymbGhL1tWaqasYmED4n3AMqlYw6
-xnNhdWOc/KZelPl9nanybyh0IIdZqUKZleRt4BxSgIT8FqC2sZuZ8z7O9s987Naz
-Q32SKaP4i2M9lai/Y2QYfKo+wlG+egmxtujz7etQMGlpgBZzFLdJ8/w4U11ku1ai
-om74RIn8zl/LHjMQHnCKGoVlscTI1ZPt+p+p8hO2/9vOwTR8y8O/3DQSOfTSipwc
-a3obRkp5ndjfjefOoAnuYapLw72fhJ9+Co09miiHQu7vq4j5k05VpDQd0yxOAZnG
-vodPPhq7/zCG1K9Sb1rS9GvmQxGmgMBWVn+keTqJCZX7TSVgtgua9YjTJNVSiSLv
-rLslNkeRfvkfbAbU8379MDB+Bax04HcYTC4syf0uqUXYq6jRtX37Dfq5XkLCk2Bt
-WusH2NSpHuzZRWODM9PZb6U3vuBmU1nqY77DciuaeBqGGyrC/6UKrS0DrmVvF/0Z
-Sft3BY6Zb3q7Qm7xpzsfrhVlhlyQqZPhr6o7QnGuvwRr+gDwhRbpISKYo89KYwjK
-4Qr7sg/CyU2hWBCDOFPOcv/rtE0aD88M+EwRG/LCfEWU34Dc43Jk+dH56/3eVR58
-rISHRUcU0Y603Uc+/WM31iJmR/1PvGeal+mhI9YSWUIgIY8Mxt3cM2gYl/OErGbN
-4hWAPIFn4sM9Oo4BHpN7J2vkUatpW6v4Mdh+pNxzgE/V5S21SGaAldvM1SzCRz52
-xRt642Mhf6jqfrwzXf7kq7jpOlu1HkG1XhCZQPw7qyIKnX4tjaRd9HXhn9Jb2vA5
-Av+EOPoAx6Yii5X1RkDILOijvgVfSIFXnflHzs58AhwHztQOUWXDkfS5jVxbenbV
-X4DwgtrpzpdPBgBYNtCGBy9pqhWA2XnkH2vjchZy+xIAoaJNIVBfNkR8tflJWEfm
-i/2U0jJnhY8dEClbu3KQnbwKe5E9mTz1VmBsdWaK5rBVZamD/wssQzzyf3SXXXIU
-W6DUXOCzgWvxvqC09lc4izEAxwUktMY+aapplNs/kjOqHYVkW4zpWGp4PDAT/DW9
-/727CeoqY29HePaeGl0/PpR37CkquP69oQeJSU9CNeyAKnQtvaqxLBcEOohSaPtK
-Iy1q6yQgT4j+gVAsFDVyobCNkA8B0GfemDcEXA5dfriTHN72Br0koS0nvv6P5k7T
-7aaSNX++zdEnPauAZXPPjVt7R1sEvx0Oj+l1pu9hNX0nldaNs13bPU5DIOYv+5fN
-En6pqzYGj/0v8Qeb53Qv5de+lo7ZAu/truVa+GOT3ay4jZBaFh2mDZbA+t1V3GmB
-FtYGoVfou4iBQpx6tJLg3PKvtPj9g5B4LTxZVKrdfHXWyNNQOLzWSIgFj44+SmhU
-LVCXofEvJ0sOX2wtqy54Q4lMIc6BK1IB+hsFV6sSnIeI7YmrRXusWEG0wnroNlbq
-FiWg5+oeI1CnnCyj4FmDX/A/Bo0RxD0x3yqDximkOpcHMtLLfFjK3d5ltwBgDOOe
-pvgabxID01mZxh3OYKdGpW3Z1VKEhHjF5e9BhhEKQ8mG3raaDs2hQ2iuEqTzNLif
-aQdRCYd62jS14qSy2Dd+oZ0FbgzJNigWldvuwWzJCO2toF29pvfWtYRuqV/Vt3CK
-iO7en9bhOMRynPlCkAR7ZiZvT9dzStiMKf1v8mzgRjCIiLIwM1v/xNZWEZ/TOfSR
-E7dBMbDzaNjtCsMmNiyplqCjWbaj4irdIhKbtKJ02a1Jopo1/XNK0Y8AbK1xEHV0
-+mjBYU/Pfqnf0WFhkJgha+J17wqrUxf2/Y1b/pdDMGqVWe9+p8tvSP5FNddNyecZ
-0pojFH0jAzHpQen7eeIA3XupVe6cTEhNz4OjHBlZE6dN0q8UDdeG75yPunwShQiO
-kRXA/qxkID/2OLIInWJP0HG05hncGfWZKCLBc/dFg3dNo8VKpw/Q6uMBj2iGi8iB
-lnQGmHQa3j1ANPbcl3ljdJQDEnxk5TEVxNPYUw/BI58l3p+Z3vAZqC0Io7EgpuZ8
-qPuV6hJ2c/7VuFAXVs2mUExtWAjbgnYAfsJtn1yk3sphl65TjPnZwaBlP/ls/W/j
-mVjAx9d5b3mmMBJmNZDvY1QvcftDgfL5vYG5g7UwsbojuNxeM4rwn8qCKk5wC1/a
-Zl6Rh2DG4xS3/ef5tQWw28grjRRwv5phYKtedsKpYRscKAMhiOsChAiSYuCRczmI
-ErdO8ryK8QNzcpE4qVzFQMEtkG6V0RYYjMJzJuY5BW3hKt1UNNaqiGBpNKuf0GoO
-zK/vMgxoo+iFmOuaBdQEjlPLbK+3k+7j14KKVI655AXVKyAsOoSYPzOqfkdiu9W8
-34fOanH7S+lclkXwxTbXko9Jt6Ml64H4QKwd8ak2nCcX9FuMge7XP9VL/pBBMXcB
-WHUKdoqMJExcg5A4H2cyxZ6QgHzNFgqV/4+MGGP+TMc9owzrT3PBadVrMxnHnjc/
-/XYv48p2rRkjyjrtH+ZO9rlOsw0OmGgh9yoQPZn2tiNhG9piyvVxFKZflJm8I4kC
-4AQTAQoAygUCUlkPIkgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZzdC
-Nzg0MzcwMTVFNjNERjQ3QkIxMjcwQUNCRDk3QUEyNEU4RTQ3MkVPFIAAAAAAHgAo
-YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0
-QjVFRUI2OERDNDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2pl
-Y3Qub3JnL3BvbGljeS50eHQACgkQjcQ6KEiCHjIaqBAA0BuEs7horx6iCq4cjAhv
-YPLrxuC4fKEfVyhAjCJMJSFFCPAlGgU+BjyPNDD57wzKAmUkdJG+Ss25mwWXa53w
-5R2kDqDnHocOdZGtxZ7zx/uUd2eWLNBfVuK7nHOk1d1Hs0OZBnckc+MCqnLtuYe5
-68pa9+jW6cNIjAnzMIListmoXWgYYWJvMKeBMG4DGtYJ8w7CJQjOHc5yar12DrX3
-wnQ7hXtFuuqQblpEUnLnZGvHf2NKMZfBBMcP96h9OmLGNa+vmNYsMyPKU7n5hPgX
-nTgmQ4xrv1G7JukjppZRA8SFoxupcaQeTixyWERGBhBiAbwZsbQz8L/TVZKierzg
-sdNngHcFzE8MyjuJDvTos7qXPmgSRXFqJLRn0ZxpR5V1V8BVZUqCGuSZT89TizsD
-z5vyv8c9r7HKD4pRjw32P2dgcEqyGRkqERAgSuFpObP+juty+kxYyfnadBNCyjgP
-s7u0GmsTt4CZi7BbowNRL6bynrwrmQI9LJI1bPhgqfdDUbqG3HXwHz80oRFfKou8
-JTYKxK4Iumfw2l/uAACma5ZyrwIDBX/H5XEQqch4sORzQnuhlTmZRf6ldVIIWjdJ
-ef+DpOt12s+cS2F4D5g8G6t9CprCLYyrXiHwM/U8N5ywL9IeYKSWJxa7si3l9A6o
-ZxOds8F/UJYDSIB97MQFzBo=
-=JdC7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/.gnupg/bridgedb-online-key.pub.asc b/.gnupg/bridgedb-online-key.pub.asc
deleted file mode 100644
index a848a2b..0000000
--- a/.gnupg/bridgedb-online-key.pub.asc
+++ /dev/null
@@ -1,100 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFIv8YABEADRqvfLB4xWj3Fz+HEmUUt/qbJnZhqIjo5WBHaBJOmrzx1c9fLN
-aYG36Hgo6A7NygI1oQmFnDinSrZAtrPaT63d1Jg49yZwr/OhMaxHYJElMFHGJ876
-kLZHmQTysquYKDHhv+fH51t7UVaZ9NkP5cI+V3pqck0DW5DwMsVJXNaU317kk9me
-mPJUDMb5FM4d2Vtk1N+54bHJgpgmnukNtpJmRyHRbZBqNMln5nWF7vdZ4u5PGPWj
-bA0rPZhayeE3FQ0MHiGL12kHAy30pfg54QfPJDQBCywjABetRE+xaM9TcS+R31Pf
-2VbLeb+Km7QpHMwOXI5xZLss9BAWm9EBbmXxuqaRBHyi830jjCrK9UYuzzOqKoUV
-Mk1BRelZTFnGPWeVTE+Ps+pwJ0Dwx4ghppJBCoArmEbkNliblxR/2wYOOFi/ZVA4
-Zc2ok9T3rBLVg07b7ezFUScGiTnc7ac7hp6r8Qsh09ZbhRr9erK/n194aEvkXTfr
-qepwrAE7YeF4YuR206UOFFWDhxWDLbRu0gIWgrevEQu/cvQPrO9uH5fL6Gw/+mNP
-Q/NIteejhkDyvyTUKyBu7x+Gls71zT2u/X13eOAJ8IxBkSVRKQ8tRD+oqJkWplOf
-+BpaGU+g6u4kT2AzFDxTOupfrYcPvORTAV/V3suys2YQE4x422GASXDivQARAQAB
-tClCcmlkZ2VEQiA8YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnPokDJQQT
-AQoBD0gUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3
-QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJpZGdlc0Bi
-cmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERD
-NDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL3Bv
-bGljeS50eHQCGwEDCw0JBBUKCQgEFgIBAAIeAQIXgCcYaHR0cHM6Ly9icmlkZ2Vz
-LnRvcnByb2plY3Qub3JnL2tleS5hc2MFAlSKBKIFCQPDTiIACgkQjcQ6KEiCHjIs
-jg//bJ12eRnBMfIGzOGh+T4wz7/YyKLfARAMnqDnSxhTxuE+M5hWm3QbxP03R6eY
-x+PKwQaDJSmm7HhRhltb7QXUe8dqjnocFwwagpoLZ/81mBLxByqg5TKHGGIGy+DX
-omIzCq5ijx1IUkHlgh708a5alG7bjRTqedT4Wxxyl6psGzDhGQdS8bqx/f32nQaE
-h41l+A/EY1g2HVqky63ZHAP3S2v+mWCrk5DnkElc0229MXqaBuEr4nbYMXRkahMb
-E2gnCmdSoeD21AY6bNyz7IcJGpyKCx9+hVgPjpm3J23JEYyPL+s48jn6QcI/Q2gD
-yAtgU65y6IrdYn8SwkABI1FIq9WAwG7DaInxvkqkYqyBQLaZJEMyX8NTBvFoT5JS
-jnkxG0xu61Vxq0BLYBIOJE0VFHAJ40/jOvSxQJkQhu9G4BK7htnADbtstmMDMM3q
-xuuO5pcj2rl7YthNunyZ1yhPHXijUUyKrwR9piENpptztFBVN6+ijqU/TmWMOtbH
-X7p9F+3tXCHHqwO5U/JMtsb/9M39MR8BrdcLc7m6dCpeuSUuR2LLroh+MoMJGviI
-iesxHF95kFqkJAecW1Z3eKL9vrlbfO3waeuCi18k1TePnZuG5lmf2KjKDW5vHK4O
-WFqvvfK2kxkCUjvGdLeTOAVOV+X+PQ23jvBJO2bS7YbOb9C5Ag0EUi/ygQEQALZ/
-p7xRINHY7MMf3/bo/I0WRxWHd1AE9tRToyEg1S2u1YrWWL5M9D8saRsp9cpnpGEu
-hW3vu7G4nasY27qOz4bSKu1YMAVIC58v1tEnBqdo1zErNjhs38PrmJKbbs9tDfYY
-Oi2x0GlhMbIrNStcZpnCdLa6U6NLMbggDL1GxjMPYBMi4TtLgcIeRDUSjsZscZkg
-Kxs5QkSVc3SrYyraayIc8WtIpDLcxPt6/g90rbatZzBfO+93Rz7qUXHmgzuM0hy1
-Fvn619o3I5DsWrfOz9t/QuznoOBw4PfzDPNT7VlzZN4xHAcr5+7B+DH9IsvlCt5N
-kQFuYpFZCpXNaD2XOtmIqjTCeLNfcgTEj0qoUIEKyKbBIgfP+7S2tLXy8JKUTy5g
-9kxXQeHueLykQ4Mt18JH0nMHbHbQl0K3LGT4ucRDOmjNtlQCltVLkIk3GimyqKs/
-vdZ9c+dm4Akx1qsJcwvveX+imJe2e9RUodcxWXxWrYnuPa5b5nfR1i+GfV0on/Pt
-AQ8gc9CkJpMiq5TQDOFhFP6yQcq77sXuUkEl5qamptedz28E0I693ulnfwcsE80p
-xkpIG6n33DZJSEyqgtWjE1P2pnsVfO5ILs3mKLe7bO1v3qMXcCkMCGH/kwzvtowq
-YvY4gaZMDZtQFY8U7lI9FdRUvVdeHAB24y291nhzABEBAAGJBYMEGAEKANNIFIAA
-AAAAFwAodmVyaWZpZWRAdG9ycHJvamVjdC5vcmdERjgxMTEwOUUxN0M4QkYxMzRC
-NUVFQjY4REM0M0EyODQ4ODIxRTMyTxSAAAAAAB4AKGJyaWRnZXNAYnJpZGdlcy50
-b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4
-MjFFMzIqGmh0dHBzOi8vYnJpZGdlcy50b3Jwcm9qZWN0Lm9yZy9wb2xpY3kudHh0
-AhsCBQJUigTTBQkDw01SAqTB2CAEGQEKAIEFAlIv8oFPFIAAAAAAHgAoYnJpZGdl
-c0BicmlkZ2VzLnRvcnByb2plY3Qub3JnOUZFMzlEMUE3NDM4OTIyMzNCM0Y2NkYy
-MjFCNTU0RTk1OTM4RjREMCoaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3Jn
-L3BvbGljeS50eHQACgkQIbVU6Vk49NDbPw/5ATe/T8+eaToC3v0TYNRH5nveQvzA
-WdnshD3lnvfsgDhbilwifKpc5LHKXU3rvb42HH2cu0ckuksdDTvICZD9cJjRq/F+
-Mzm0pNCAJg0pQnHaaWFQjw+CHYEoizai3S+iYxhNHeSdA6Ty7xm4+bHNf0Aqblbd
-6dKwq9EvjwAI6zZsAHtsmHRUMdrFwGdKae6CSchUT2JQFBPEWMhvzdpDGACWVaSP
-sxYKuYg9LgpswGcof+tprRjKRl8MtSh0ufjbVBlTeSKpL5Y+fcTRD3PI8w7Ocr3z
-jr6XpYG4SUNHsWwxyu/DTXg76Lk1/+BdaH25hDOAasLUOU7yRL8zD/c7M0FkGXdj
-r5I2DEEqwzJ9cPHWjpgb8N9fZLoPFP9JOmKGHINqxNe7TfwiTdD6uDKs/u/QK1U+
-o3iYBXBTREdopPUdBTM9wYRUhyGXTEKLhUP3MGpXYlgeYPrSdp76VyN3BzLTbMv+
-+7rxyKxL9cWYU0pnXHgPC5nyHX5nqXmhMnkxAD3Bnm8n9XDfgiyTDExqksEh2VXt
-yhVfLezylEP2fwtd8/mABBCsTjzZW6FRfRRAjUZWZGFpFg8no1x5JS9uiswRP5g1
-qHijNFWpGyTtJWl5VNd0d9+LtVUX1jRpDUpsjZcxqs3fsvw2p+H/zQ1wFvDrsoav
-hqOTq+AEnJc7ZG8JEI3EOihIgh4ych8P/3GTyWb29+43YVibbSPPvEv4gFqziC+9
-1p92FJ0V4XdaT7TW3qaZVp5edUNwB/jjF0SxBybwaMX2ZIGXOjnjF6/Zby4ynuTX
-vZkS1mKRA0KWupB3e9PSMY3ZtssnqpGna/+3qlpxtunW7HcW4nCF/f59WHhlVjaO
-MXjtuWj59yB56Dd1sNjwhcNCyp4/NpzGnRW97ZV3Pp4oqIOqcGzCQXkVPcnaqcOh
-Cs9vIDJlMtn/IWBzUGimuRllDSSVSWkYkyJcG2NUHUwgXYpLwQz7sScvmCPchf4K
-qarpX0FpkUDfqaVVuQ7A2XbPUAVFzIk930G1WzgOuOdg9vhWSEjou+SKrAoMz90w
-3xHwEvmPDTTVJQft9ytoRbwZkIPfzzhII3mr4agbORAfzDaj5g/f6CVRdg6D3ME1
-Etg9ZrfLgRY993g/arfIME6OOsiNcy5+PunN96Rw0o1xoD+97NmZuQrs/p4Mfn5o
-8EwXHutREhahin+3/SV3hz9ReeLYmClq+OVhjPzPdtwZsFoyQyUJoFVHPTuSdChZ
-FPaqN68FjlNMugmxnvski3ZDVT7pw3B6otjjaL3rr6q0PC2yhEb2ntb3IFUizHjn
-80SmfE1Bqwit7ZHu8r/Gt/0iecGk5h84VzSgiGZGF/7m1i5UMVlNSeWnsInGa5Su
-7HSzfMq+YmkzuQINBFIv8p4BEADTOLR5e5NKKRPpjCb4B/8YYkWh+orb70EogIZ6
-j5v8d/djLyhjqZ9BIkh41/hYKMwnsa4KkDkTaX0eNu3BFB2zGgZ1GSd7525ESxiq
-suXIlAg2pex7bysaFfua0nUx64tmaQm2XArdkj/wI0pbg+idWym3WQQmZLyTTbzl
-8rpTEtTt+S2m6z3EeAhEHuNFH16hEDUywlef3EotX3njuFiLqaNvnzUYDxhUvKd2
-2K1es1ggispgP+eb1bkMApxecf2rqmSUEcvsuTWip4oGZPBLGDQeNKHkCUVbj4wT
-yWDIRtto3wi+4CFPEVzw+htj1cQfTstPqUdG7NSOmLQggedoUdv7AJm4MJJiyEax
-l+IAf6Afwrrm3eOSv0PgoUxOrUb9vhIoL8ih8gtiqvQ9qYaRQfQA/w3Z0Su2Yfoc
-fQS8Uw99qG+oTgieG6F6ud8+hMZAYVZFqbU+ztzMyDE6h4Hflkt6VNJ0Hk0VoF38
-TTs77pHXXBbLD6SzR6tbNuR9r/lbmC8Qf2A1ZAThR0iuGhNRFtUPo28GxakxGdLZ
-9kHIxjl7EN/gsmYTwuEhr+yfNtLwtSH0ojeqbDmgufvgh+SITCtyNDAUspjrZYEt
-F0NHRpSom2NFVELMqMRydU/ncph1rGZgVp6/zVj6xIlhKmqj5P1y/9B0c4Tu1CzJ
-pkJ5wwARAQABiQLpBBgBCgDTSBSAAAAAABcAKHZlcmlmaWVkQHRvcnByb2plY3Qu
-b3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNBMjg0ODgyMUUzMk8UgAAA
-AAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmdERjgxMTEwOUUxN0M4
-QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyKhpodHRwczovL2JyaWRnZXMudG9y
-cHJvamVjdC5vcmcvcG9saWN5LnR4dAIbDAUCVIoE4QUJA8NNQwAKCRCNxDooSIIe
-Mo7JEADDBtQpYxPhbj3MT0xpk96EDlon/5yHVf+cnk1pNisc+HkJsVe1nh7gAWOz
-wJKdeqOVpgxiJTxIQdl6mipKwwFi0DreP7h56s1WQkuSSWJzqssAwWHfVAsX13fV
-zWd0XyxN/OF9ZKQjX4qwpJ/na631PSwZLvHYhMaZnb9pjNwC5/PEKRmFqLbQT6Px
-12miZT6ToPDCczHxJ4BxbEGVU+PtRsHwmTRT3JhxFNDfeVd+uwsQIMidJbUoqVW7
-fe2zNd0TaWyz4Rw087oZE2OXdctjvtsu8fzXx6d/tkazI6cUOqoaMTR41KEu5X0T
-BpWSAMADBYjNs9QRWXX7ZlsJRUSCX1EKbMhgoL6KIGceIkjH61M/LF6HqDgSgSWt
-h+LIYGa+LrB/6819o32QSOSHHJ5+NJrbCSaLgKE/LKnf92V2QbZE8IGY6EOSjHqn
-n1+j+CLRKY/kUyvk+1TumTghjg/aDs/8Jv8PvgSWLQ0q1rxHYbX7q9ZJhYC/4LdR
-ya/Cho6w2l0N3tV/IMAwvFNHsaiIiiwfoOQbkBUvkyzBwjKt96Ai4I0QKt/63uH0
-drQhlJEgIyGkOrorBByVqZAQdnoLENYIu6tDUj0bTbGObKqua4iPlSK3/g40zCm4
-9OgcN7A8kFuNpgp2EHqj1/jrwd7mZYKsWTuGiR/7fwXf+4xbvg==
-=raCx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf
deleted file mode 100644
index d4a9913..0000000
--- a/.gnupg/gpg.conf
+++ /dev/null
@@ -1,96 +0,0 @@
-##
-## Options for GnuPG
-##
-## :author: isis <isis(a)patternsinthevoid.net>
-
-no-greeting
-no-emit-version
-charset utf-8
-display-charset utf-8
-utf8-strings
-keyid-format long
-default-key 8DC43A2848821E32
-trusted-key CBD97AA24E8E472E
-
-# When outputting certificates, view user IDs distinctly from keys:
-fixed-list-mode
-
-verify-options no-show-photos show-uid-validity show-notations show-user-notations show-policy-urls show-keyserver-urls no-pka-lookups no-pka-trust-increase
-
-list-options no-show-photos show-uid-validity no-show-unusable-uids show-unusable-subkeys show-notations show-user-notations show-policy-urls show-keyserver-urls show-sig-expire show-sig-subpackets
-
-export-options no-export-attributes
-
-# Because some mailers change lines starting with "From " to ">From "
-# it is good to handle such lines in a special way when creating
-# cleartext signatures; all other PGP versions do it this way too.
-#no-escape-from-lines
-
-## Indymedia Keyservers:
-##----------------------
-keyserver hkps://2eghzlv2wwcq7u7y.onion
-keyserver hkp://2eghzlv2wwcq7u7y.onion
-keyserver hkps://keys.indymedia.org
-keyserver hkp://keys.indymedia.org
-keyserver https://keys.indymedia.org
-keyserver http://keys.indymedia.org
-keyserver https://qtt2yl5jocgrk7nu.onion
-keyserver http://qtt2yl5jocgrk7nu.onion
-keyserver-options ca-cert-file=~/scripts/certs/keys.indymedia.org
-
-## Normal keyservers:
-##--------------------
-keyserver hkp://subkeys.pgp.net
-keyserver mailto:pgp-public-keys@keys.pgp.net
-keyserver pgp.mit.edu
-
-keyserver-options verbose verbose verbose no-include-revoked no-include-disabled no-auto-key-retrieve no-honor-keyserver-url no-honor-pka-record include-subkeys no-include-attributes
-
-#keyserver-options http-proxy=socks://127.0.0.1:59050
-
-expert
-allow-freeform-uid
-cert-digest-algo SHA512
-digest-algo SHA512
-default-preference-list SHA512 SHA384 SHA256 CAMELLIA256 AES256 ZLIB ZIP Uncompressed
-personal-cipher-preferences CAMELLIA256 AES256
-personal-digest-preferences SHA512 SHA384 SHA256
-personal-compress-preferences ZLIB ZIP
-compress-level 9
-default-cert-expire 2y
-ask-cert-expire
-ask-cert-level
-default-sig-expire 1y
-no-ask-sig-expire
-
-## algorithm to protect the key in memory:
-s2k-cipher-algo AES256
-
-## use this one to mangle the passphrases:
-s2k-digest-algo SHA512
-
-## passphrase mangling mode:
-## 0=plaintest
-## 1=salt
-## 3=salt+iteration
-s2k-mode 3
-
-## how mangly should we mangle it? 1024 < mangle < 65011712
-##
-## try "python -c'import random;a=random.randint(32505856, 65011712);print a'
-s2k-count 48454407
-
-## Don't run if we can't secure mempages
-require-secmem
-
-## Check the back sig on subkey which has made a signature
-require-cross-certification
-
-## The notation on certifications we make:
-## see http://thread.gmane.org/gmane.mail.notmuch.general/3721/focus=7234
-sig-notation bridges(a)bridges.torproject.org=%g
-cert-notation bridges(a)bridges.torproject.org=%g
-cert-notation verified(a)torproject.org=%f
-set-policy-url https://bridges.torproject.org/policy.txt
-sig-keyserver-url !https://bridges.torproject.org/key.asc
-default-keyserver-url https://bridges.torproject.org/key.asc
diff --git a/.gnupg/pubring.gpg b/.gnupg/pubring.gpg
deleted file mode 100644
index 82c5477..0000000
Binary files a/.gnupg/pubring.gpg and /dev/null differ
diff --git a/.gnupg/secring.gpg b/.gnupg/secring.gpg
deleted file mode 100644
index 5e0fb5d..0000000
Binary files a/.gnupg/secring.gpg and /dev/null differ
diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 8308ce2..a74821a 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -21,7 +21,6 @@ pycryptodome==3.9.6
Twisted==20.3.0
coverage==5.0.3
coveralls==1.10.0
-gnupg==2.3.1
ipaddr==2.2.0
mechanize==0.4.5
Pillow==6.2.2
diff --git a/CHANGELOG b/CHANGELOG
index f85283b..7524344 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+ * FIXES https://bugs.torproject.org/17548
+ This patch removes PGP support. BridgeDB's signing key expired on
+ 2015-09-11. Nobody ever complained and maintaining the bits and pieces
+ necessary to sign emails isn't worth the effort, so this patch removes
+ that feature.
+
* FIXES https://bugs.torproject.org/30941
Make our email responder more usable. This patch removes the concept of
"valid" email commands and returns bridges (obfs4, for now) no matter
diff --git a/README.rst b/README.rst
index 1a338ea..858562e 100644
--- a/README.rst
+++ b/README.rst
@@ -82,7 +82,6 @@ BridgeDB requires the following OS-level dependencies:
- python-dev
- `python3-dkim <https://pypi.org/project/dkimpy/>`__ (it contains the ``dkimverify`` binary)
- build-essential
-- gnupg (preferrably, gnupg2)
- OpenSSL>=1.0.1g
- `SQLite3 <http://www.maxmind.com/app/python>`__
- `MaxMind GeoIP <https://www.maxmind.com/en/geolocation_landing>`__
@@ -111,7 +110,7 @@ BridgeDB should work with or without a Python virtualenv.
can do::
sudo apt-get install build-essential openssl python python-dev \
- python-setuptools sqlite3 gnupg2 libgeoip-dev geoip-database
+ python-setuptools sqlite3 libgeoip-dev geoip-database
- Install Pip 1.3.1 or later. Debian has this version, but if for some
@@ -254,32 +253,6 @@ To enable using a local cache of CAPTCHAs, set the following options::
-------
---------------------
-GnuPG email signing:
---------------------
-
-In your ``bridgedb.conf`` file, make sure that::
-
- EMAIL_GPG_SIGNING_ENABLED = True
-
-and edit the following option to add the full fingerprint of the GnuPG key
-that should be used to by BridgeDB to sign outgoing emails::
-
- EMAIL_GPG_PRIMARY_KEY_FINGERPRINT
-
-The key specified by ``EMAIL_GPG_PRIMARY_KEY_FINGERPRINT`` can be a master
-key, or a subkey (with or without the private portions of its corresponding
-master key), but it **must** be inside the ``secring.gpg`` and ``pubring.gpg``
-keyrings inside the directory specified in the ``bridgedb.conf`` option::
-
- EMAIL_GPG_HOMEDIR
-
-If the key has requires a passphrase for signing, you'll also need to set
-either of::
-
- EMAIL_GPG_PASSPHRASE
- EMAIL_GPG_PASSPHRASE_FILE
-
----------------------------------------------------------
Preventing already-blocked bridges from being distributed:
diff --git a/bridgedb.conf b/bridgedb.conf
index 5a8a38e..31eb3fa 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -642,51 +642,6 @@ EMAIL_N_BRIDGES_PER_ANSWER = 3
# once we have the vidalia/tor interaction fixed for everbody.
EMAIL_INCLUDE_FINGERPRINTS = True
-#
-# Configuration options for OpenPGP signing and encryption
-# ------------------------------------------------------------------------------
-
-# Should we sign all email responses to clients with the key specified by
-# EMAIL_GPG_PRIMARY_KEY_FINGERPRINT (or one of its subkeys)?
-EMAIL_GPG_SIGNING_ENABLED = True
-
-# The directory, relative to BridgeDB's runtime directory, in which to store
-# OpenPGP keyrings and associated files.
-EMAIL_GPG_HOMEDIR = '.gnupg'
-
-# This should be a 40-character hexadecimal string containing the OpenPGP
-# fingerprint (without spaces) of the default primary key to use. The key
-# should be capable of both signing and encryption, or have subkeys capable of
-# such.
-#
-# The default primary key fingerprint below is the test key contained in the
-# '.gnupg/TESTING.subkeys.sec' and '.gnupg/TESTING.pub' files:
-EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = '0017098C5DF4197E3C884DCFF1B240D43F148C21'
-
-# If the key referred to by EMAIL_GPG_PRIMARY_KEY_FINGERPRINT requires a
-# passphrase for signing or encryption, then the passphrase may be given in
-# the EMAIL_GPG_PASSPHRASE option (as a string), or it may be contained within
-# the file pointed to by EMAIL_GPG_PASSPHRASE_FILE. Currently, only one
-# passphrase is supported, so if the key specified by
-# EMAIL_GPG_PRIMARY_KEY_FINGERPRINT has multiple subkeys, those subkeys MUST
-# all have the same passphrase.
-#
-# If EMAIL_GPG_PASSPHRASE_FILE is used, and the filepath is not absolute, the
-# path is interpreted as being relative to BridgeDB's runtime directory.
-# (Note: be sure not to put any newlines after the phassphrase in the
-# EMAIL_GPG_PASSPHRASE_FILE, or else they will be interpreted as part of the
-# passphrase.)
-#
-# There are currently no safety checks on the permissions of either this
-# configuration file or the EMAIL_GPG_PASSPHRASE_FILE, so beware and use at
-# your own risk.
-#
-# If both EMAIL_GPG_PASSPHRASE and EMAIL_GPG_PASSPHRASE_FILE are ``None``,
-# then it is assumed that the key specified by
-# EMAIL_GPG_PRIMARY_KEY_FINGERPRINT does not require a passphrase.
-EMAIL_GPG_PASSPHRASE = None
-EMAIL_GPG_PASSPHRASE_FILE = None
-
#-------------------------------
# Hashring Allocation Options \
#------------------------------------------------------------------------------
diff --git a/bridgedb/configure.py b/bridgedb/configure.py
index e069ea3..ab8e08a 100644
--- a/bridgedb/configure.py
+++ b/bridgedb/configure.py
@@ -113,8 +113,7 @@ def loadConfig(configFile=None, configCls=None):
"MOAT_CERT_FILE", "MOAT_KEY_FILE",
"LOG_FILE", "COUNTRY_BLOCK_FILE",
"GIMP_CAPTCHA_DIR", "GIMP_CAPTCHA_HMAC_KEYFILE",
- "GIMP_CAPTCHA_RSA_KEYFILE", "EMAIL_GPG_HOMEDIR",
- "EMAIL_GPG_PASSPHRASE_FILE", "NO_DISTRIBUTION_FILE"]:
+ "GIMP_CAPTCHA_RSA_KEYFILE", "NO_DISTRIBUTION_FILE"]:
setting = getattr(config, attr, None)
if setting is None:
setattr(config, attr, setting)
diff --git a/bridgedb/crypto.py b/bridgedb/crypto.py
index db3d083..9bdf729 100644
--- a/bridgedb/crypto.py
+++ b/bridgedb/crypto.py
@@ -9,9 +9,9 @@
# :license: 3-clause BSD, see included LICENSE for information
"""This module contains general utilities for working with external
-cryptographic tools and libraries, including OpenSSL and GnuPG. It also
-includes utilities for creating callable HMAC functions, generating HMACs for
-data, and generating and/or storing key material.
+cryptographic tools and libraries, like OpenSSL. It also includes utilities for
+creating callable HMAC functions, generating HMACs for data, and generating
+and/or storing key material.
.. py:module:: bridgedb.crypto
:synopsis: BridgeDB general cryptographic utilities.
@@ -19,12 +19,10 @@ data, and generating and/or storing key material.
::
bridgedb.crypto
- |_getGPGContext() - Get a pre-configured GPGME context.
|_getHMAC() - Compute an HMAC with some key for some data.
|_getHMACFunc() - Get a callable for producing HMACs with the given key.
|_getKey() - Load the master HMAC key from a file, or create a new one.
|_getRSAKey() - Load an RSA key from a file, or create a new one.
- |_gpgSignMessage() - Sign a message string according to a GPGME context.
|_writeKeyToFile() - Write to a file readable only by the process owner.
|
\_SSLVerifyingContextFactory - OpenSSL.SSL.Context factory which verifies
@@ -40,7 +38,6 @@ data, and generating and/or storing key material.
from __future__ import absolute_import
from __future__ import unicode_literals
-import gnupg
import hashlib
import hmac
import io
@@ -264,96 +261,6 @@ def removePKCS1Padding(message):
return unpadded
-def initializeGnuPG(config):
- """Initialize a GnuPG interface and test our configured keys.
-
- .. note:: This function uses python-gnupg_.
-
- :type config: :class:`bridgedb.persistent.Conf`
- :param config: The loaded config file.
- :rtype: 2-tuple
- :returns: If ``EMAIL_GPG_SIGNING_ENABLED`` isn't ``True``, or we couldn't
- initialize GnuPG and make a successful test signature with the
- specified key, then a 2-tuple of ``None`` is returned. Otherwise, the
- first item in the tuple is a :class:`gnupg.GPG` interface_ with the
- GnuPG homedir set to the ``EMAIL_GPG_HOMEDIR`` option and the signing
- key specified by the ``EMAIL_GPG_SIGNING_KEY_FINGERPRINT`` option in
- bridgedb.conf set as the default key. The second item in the tuple is
- a signing function with the passphrase (as specified in either
- ``EMAIL_GPG_PASSPHRASE`` or ``EMAIL_GPG_PASSPHRASE_FILE``) already
- set.
-
- .. _python-gnupg: https://pypi.python.org/pypi/gnupg/
- .. _interface: https://python-gnupg.readthedocs.org/en/latest/gnupg.html#gnupg-module
- """
- ret = (None, None)
-
- if not config.EMAIL_GPG_SIGNING_ENABLED:
- return ret
-
- homedir = config.EMAIL_GPG_HOMEDIR
- primary = config.EMAIL_GPG_PRIMARY_KEY_FINGERPRINT
- passphrase = config.EMAIL_GPG_PASSPHRASE
- passFile = config.EMAIL_GPG_PASSPHRASE_FILE
-
- logging.info("Using %s as our GnuPG home directory..." % homedir)
- gpg = gnupg.GPG(homedir=homedir)
- logging.info("Initialized GnuPG interface using %s binary with version %s."
- % (gpg.binary, gpg.binary_version))
-
- primarySK = None
- primaryPK = None
- secrets = gpg.list_keys(secret=True)
- publics = gpg.list_keys()
-
- if not secrets:
- logging.warn("No secret keys found in %s!" % gpg.secring)
- return ret
-
- primarySK = list(filter(lambda key: key['fingerprint'] == primary, secrets))
- primaryPK = list(filter(lambda key: key['fingerprint'] == primary, publics))
-
- if primarySK and primaryPK:
- logging.info("Found GnuPG primary key with fingerprint: %s" % primary)
-
- for sub in primaryPK[0]['subkeys']:
- logging.info(" Subkey: %s Usage: %s" % (sub[0], sub[1].upper()))
- else:
- logging.warn("GnuPG key %s could not be found in %s!" % (primary, gpg.secring))
- return ret
-
- if passphrase:
- logging.info("Read GnuPG passphrase from config.")
- elif passFile:
- try:
- with open(passFile) as fh:
- passphrase = fh.read()
- except (IOError, OSError):
- logging.error("Could not open GnuPG passphrase file: %s!" % passFile)
- else:
- logging.info("Read GnuPG passphrase from file: %s" % passFile)
-
- def gpgSignMessage(message):
- """Sign **message** with the default key specified by
- ``EMAIL_GPG_PRIMARY_KEY_FINGERPRINT``.
-
- :param str message: A message to sign.
- :rtype: str or ``None``.
- :returns: A string containing the clearsigned message, or ``None`` if
- the signing failed.
- """
- sig = gpg.sign(message, default_key=primary, passphrase=passphrase)
- if sig and sig.data:
- return sig.data
-
- logging.debug("Testing signature created with GnuPG key...")
- sig = gpgSignMessage("Testing 1 2 3")
- if sig:
- logging.info("Test signature with GnuPG key %s okay:\n%s" % (primary, sig))
- return (gpg, gpgSignMessage)
-
- return ret
-
class SSLVerifyingContextFactory(ssl.CertificateOptions):
"""``OpenSSL.SSL.Context`` factory which does full certificate-chain and
diff --git a/bridgedb/distributors/email/autoresponder.py b/bridgedb/distributors/email/autoresponder.py
index 5e1fcd0..9b0ac53 100644
--- a/bridgedb/distributors/email/autoresponder.py
+++ b/bridgedb/distributors/email/autoresponder.py
@@ -55,7 +55,6 @@ from bridgedb import safelog
from bridgedb.distributors.email import dkim
from bridgedb.distributors.email import request
from bridgedb.distributors.email import templates
-from bridgedb.distributors.email.distributor import EmailRequestedKey
from bridgedb.distributors.email.distributor import TooSoonEmail
from bridgedb.distributors.email.distributor import IgnoreEmail
from bridgedb.parse import addr
@@ -100,9 +99,6 @@ def createResponseBody(lines, context, client, lang='en'):
# Otherwise they must have requested bridges:
interval = context.schedule.intervalStart(time.time())
bridges = context.distributor.getBridges(bridgeRequest, interval)
- except EmailRequestedKey as error:
- logging.info(error)
- return templates.buildKeyMessage(translator, client)
except TooSoonEmail as error:
logging.info("Got a mail too frequently: %s." % error)
return templates.buildSpamWarning(translator, client)
@@ -120,7 +116,7 @@ def createResponseBody(lines, context, client, lang='en'):
return templates.buildAnswerMessage(translator, client, answer)
def generateResponse(fromAddress, client, body, subject=None,
- messageID=None, gpgSignFunc=None):
+ messageID=None):
"""Create an :class:`EmailResponse`, which acts like an
:class:`io.StringIO` instance, by creating and writing all headers and the
email body into the file-like :attr:`EmailResponse.mailfile`.
@@ -131,21 +127,15 @@ def generateResponse(fromAddress, client, body, subject=None,
:param client: The client's email address which should be in the
``'To:'`` header of the response email.
:param str subject: The string to write to the ``'Subject:'`` header.
- :param str body: The body of the email. If a **gpgSignFunc** is also
- given, then :meth:`EmailResponse.writeBody` will generate and include
- an ascii-armored OpenPGP signature in the **body**.
+ :param str body: The body of the email.
:type messageID: ``None`` or :any:`str`
:param messageID: The :rfc:`2822` specifier for the ``'Message-ID:'``
header, if including one is desirable.
- :type gpgSignFunc: callable
- :param gpgSignFunc: If given, this should be a callable function for
- signing messages. See :func:`bridgedb.crypto.initializeGnuPG` for
- obtaining a pre-configured **gpgSignFunc**.
:returns: An :class:`EmailResponse` which contains the entire email. To
obtain the contents of the email, including all headers, simply use
:meth:`EmailResponse.readContents`.
"""
- response = EmailResponse(gpgSignFunc)
+ response = EmailResponse()
response.to = client
response.writeHeaders(fromAddress.encode('utf-8'), str(client), subject,
inReplyTo=messageID)
@@ -168,10 +158,7 @@ class EmailResponse(object):
.. todo:: At some point, we may want to change this class to optionally
handle creating Multipart MIME encoding messages, so that we can
- include attachments. (This would be useful for attaching our GnuPG
- keyfile, for example, rather than simply pasting it into the body of
- the email.)
-
+ include attachments.
:var str delimiter: Delimiter between lines written to the
:data:`mailfile`.
@@ -180,18 +167,12 @@ class EmailResponse(object):
:var to: The client's email address, to which this response should be sent.
"""
- def __init__(self, gpgSignFunc=None):
+ def __init__(self):
"""Create a response to an email we have recieved.
This class deals with correctly formatting text for the response email
headers and the response body into an instance of :data:`mailfile`.
-
- :type gpgSignFunc: callable
- :param gpgSignFunc: If given, this should be a callable function for
- signing messages. See :func:`bridgedb.crypto.initializeGnuPG` for
- obtaining a pre-configured **gpgSignFunc**.
"""
- self.gpgSign = gpgSignFunc
self.mailfile = io.StringIO()
self.delimiter = '\n'
self.closed = False
@@ -338,18 +319,9 @@ class EmailResponse(object):
def writeBody(self, body):
"""Write the response body into the :attr:`mailfile`.
- If :attr:`EmailResponse.gpgSignFunc` is set, and signing is configured,
- the **body** will be automatically signed before writing its contents
- into the :attr:`mailfile`.
-
:param str body: The body of the response email.
"""
logging.info("Writing email body...")
- if self.gpgSign:
- logging.info("Attempting to sign email...")
- sig = self.gpgSign(body)
- if sig:
- body = sig
self.writelines(body)
@@ -433,8 +405,7 @@ class SMTPAutoresponder(smtp.SMTPClient):
messageID = self.incoming.message.get("Message-ID", None)
subject = self.incoming.message.get("Subject", None)
response = generateResponse(recipient, client,
- body, subject, messageID,
- self.incoming.context.gpgSignFunc)
+ body, subject, messageID)
return response
def getMailTo(self):
diff --git a/bridgedb/distributors/email/distributor.py b/bridgedb/distributors/email/distributor.py
index c6ac2fd..77bcdb9 100644
--- a/bridgedb/distributors/email/distributor.py
+++ b/bridgedb/distributors/email/distributor.py
@@ -20,7 +20,7 @@ bridgedb.distributors.email.autoresponder
A :class:`~bridgedb.distribute.Distributor` which hands out :class:`bridges
<bridgedb.bridges.Bridge>` to clients via an email interface.
-.. inheritance-diagram:: IgnoreEmail TooSoonEmail EmailRequestedKey EmailDistributor
+.. inheritance-diagram:: IgnoreEmail TooSoonEmail EmailDistributor
:parts: 1
"""
@@ -55,10 +55,6 @@ class TooSoonEmail(addr.BadEmail):
"""Raised when we got a request from this address too recently."""
-class EmailRequestedKey(Exception):
- """Raised when an incoming email requested a copy of our GnuPG keys."""
-
-
class EmailDistributor(Distributor):
"""Object that hands out bridges based on the email address of an incoming
request and the current time period.
diff --git a/bridgedb/distributors/email/request.py b/bridgedb/distributors/email/request.py
index 90576c1..6484fe3 100644
--- a/bridgedb/distributors/email/request.py
+++ b/bridgedb/distributors/email/request.py
@@ -45,7 +45,6 @@ import re
from bridgedb import strings
from bridgedb import bridgerequest
-from bridgedb.distributors.email.distributor import EmailRequestedKey
#: A regular expression for matching the Pluggable Transport method TYPE in
@@ -62,7 +61,6 @@ UNBLOCKED_PATTERN = re.compile(UNBLOCKED_REGEXP)
#: valid as long as it wasn't quoted, i.e., the line didn't start with a '>'
#: character.
GET_LINE = re.compile("([^>].*)?get")
-KEY_LINE = re.compile("([^>].*)?key")
IPV6_LINE = re.compile("([^>].*)?ipv6")
TRANSPORT_LINE = re.compile("([^>].*)?transport")
UNBLOCKED_LINE = re.compile("([^>].*)?unblocked")
@@ -75,7 +73,6 @@ def determineBridgeRequestOptions(lines):
and/or ``CC`` will *always* be stored as a *lowercase* string.
:param list lines: A list of lines from an email, including the headers.
- :raises EmailRequestedKey: if the client requested our GnuPG key.
:rtype: :class:`EmailBridgeRequest`
:returns: A :class:`~bridgerequest.BridgeRequest` with all of the requested
parameters set. The returned ``BridgeRequest`` will have already had
@@ -93,9 +90,6 @@ def determineBridgeRequestOptions(lines):
if GET_LINE.match(line) is not None:
request.isValid(True)
logging.debug("Email request was valid.")
- if KEY_LINE.match(line) is not None:
- request.wantsKey(True)
- raise EmailRequestedKey("Email requested a copy of our GnuPG key.")
if IPV6_LINE.match(line) is not None:
request.withIPv6()
if TRANSPORT_LINE.match(line) is not None:
@@ -127,22 +121,6 @@ class EmailBridgeRequest(bridgerequest.BridgeRequestBase):
:class:`~bridgedb.distributors.email.distributor.EmailDistributor`.
"""
super(EmailBridgeRequest, self).__init__()
- self._wantsKey = False
-
- def wantsKey(self, wantsKey=None):
- """Get or set whether this bridge request wanted our GnuPG key.
-
- If called without parameters, this method will return the current
- state, otherwise (if called with the **wantsKey** parameter set), it
- will set the current state for whether or not this request wanted our
- key.
-
- :param bool wantsKey: If given, set the validity state of this
- request. Otherwise, get the current state.
- """
- if wantsKey is not None:
- self._wantsKey = bool(wantsKey)
- return self._wantsKey
def withoutBlockInCountry(self, line):
"""This request was for bridges not blocked in **country**.
diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py
index 063b640..f18a5ad 100644
--- a/bridgedb/distributors/email/server.py
+++ b/bridgedb/distributors/email/server.py
@@ -66,7 +66,6 @@ from zope.interface import implementer
from bridgedb import __version__
from bridgedb import safelog
-from bridgedb.crypto import initializeGnuPG
from bridgedb.distributors.email import autoresponder
from bridgedb.distributors.email import templates
from bridgedb.distributors.email import request
@@ -97,13 +96,6 @@ class MailServerContext(object):
:ivar int fuzzyMatch: An integer specifying the maximum Levenshtein
Distance from an incoming email address to a blacklisted email address
for the incoming email to be dropped.
- :ivar gpg: A :class:`gnupg.GPG` interface_, as returned by
- :func:`~bridgedb.crypto.initialiseGnuPG`, or ``None`` if we couldn't
- initialize GnuPG for some reason.
- :ivar gpgSignFunc: A callable which signs a message, e.g. the one returned
- from :func:`~bridgedb.crypto.initialiseGnuPG`.
-
- .. _interface: https://pythonhosted.org/gnupg/gnupg.html#gnupg-module
"""
def __init__(self, config, distributor, schedule):
@@ -139,8 +131,6 @@ class MailServerContext(object):
self.blacklist = config.EMAIL_BLACKLIST or []
self.fuzzyMatch = config.EMAIL_FUZZY_MATCH or 0
- self.gpg, self.gpgSignFunc = initializeGnuPG(config)
-
def buildCanonicalDomainMap(self):
"""Build a map for all email provider domains from which we will accept
emails to their canonical domain name.
diff --git a/bridgedb/distributors/email/templates.py b/bridgedb/distributors/email/templates.py
index 2eb0a31..44450ea 100644
--- a/bridgedb/distributors/email/templates.py
+++ b/bridgedb/distributors/email/templates.py
@@ -67,9 +67,6 @@ def addGreeting(template):
return greeting
-def addKeyfile(template):
- return u'%s\n\n' % strings.BRIDGEDB_OPENPGP_KEY
-
def addBridgeAnswer(template, answer):
# Give the user their bridges, i.e. the `answer`:
bridgeLines = u""
@@ -88,10 +85,6 @@ def addHowto(template):
"""
return template.gettext(strings.HOWTO_TBB[2])
-def buildKeyMessage(template, clientAddress=None):
- message = addKeyfile(template)
- return message
-
def buildAnswerMessage(template, clientAddress=None, answer=None):
try:
message = addGreeting(template)
diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py
index be99262..b2de4b1 100644
--- a/bridgedb/distributors/https/server.py
+++ b/bridgedb/distributors/https/server.py
@@ -1143,7 +1143,6 @@ def addWebServer(config, distributor):
info = InfoResource()
robots = static.File(os.path.join(TEMPLATE_DIR, 'robots.txt'))
assets = static.File(os.path.join(TEMPLATE_DIR, 'assets/'))
- keys = static.Data(strings.BRIDGEDB_OPENPGP_KEY.encode('utf-8'), 'text/plain')
csp = CSPResource(enabled=config.CSP_ENABLED,
includeSelf=config.CSP_INCLUDE_SELF,
reportViolations=config.CSP_REPORT_ONLY,
@@ -1152,7 +1151,6 @@ def addWebServer(config, distributor):
root = CustomErrorHandlingResource()
root.putChild(b'', index)
root.putChild(b'robots.txt', robots)
- root.putChild(b'keys', keys)
root.putChild(b'assets', assets)
root.putChild(b'options', options)
root.putChild(b'howto', howto)
diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html
index b42d252..2f502a9 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -98,8 +98,6 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwa
·
<a href="https://gitweb.torproject.org/bridgedb.git/tree/CHANGELOG">
<i class="icon icon-large icon-rocket"><span id="footer-changelog"> ${_("Changelog")}</span></i></a>
- ·
- <a href="../keys"><i class="icon icon-large icon-key"><span id="footer-keys"> ${_("Public Keys")}</span></i></a>
</p>
<br />
<p>© The Tor Project</p>
diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot
index 85958bd..bb78824 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -5,11 +5,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: bridgedb 0.10.0+7.gbca6496.dirty\n"
+"Project-Id-Version: bridgedb 0.10.0+10.g96de503\n"
"Report-Msgid-Bugs-To: "
"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…"
"=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2020-04-07 10:14-0700\n"
+"POT-Creation-Date: 2020-04-09 14:45-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -66,10 +66,6 @@ msgstr ""
msgid "Changelog"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:102
-msgid "Public Keys"
-msgstr ""
-
#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr ""
@@ -180,15 +176,15 @@ msgstr ""
msgid "%sG%set Bridges"
msgstr ""
-#: bridgedb/strings.py:42
+#: bridgedb/strings.py:33
msgid "[This is an automated email.]"
msgstr ""
-#: bridgedb/strings.py:44
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr ""
-#: bridgedb/strings.py:46
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
@@ -196,7 +192,7 @@ msgid ""
"ignored."
msgstr ""
-#: bridgedb/strings.py:49
+#: bridgedb/strings.py:40
msgid ""
"If these bridges are not what you need, reply to this email with one of\n"
"the following commands in the message body:"
@@ -206,7 +202,7 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor".
#. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:59
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -218,7 +214,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:66
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -230,7 +226,7 @@ msgstr ""
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:75
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any"
@@ -241,21 +237,21 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:87 bridgedb/test/test_https.py:356
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr ""
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: bridgedb/strings.py:93
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
-#: bridgedb/strings.py:95
+#: bridgedb/strings.py:86
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Leave the email subject"
@@ -267,32 +263,32 @@ msgid ""
"providers: %s or %s."
msgstr ""
-#: bridgedb/strings.py:103
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
#. "Support Portal", respectively.
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:98
#, python-format
msgid "If your Tor Browser cannot connect, please take a look at the %s and our %s."
msgstr ""
-#: bridgedb/strings.py:111
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:112
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr ""
-#: bridgedb/strings.py:116
+#: bridgedb/strings.py:107
msgid "Bridge distribution mechanisms"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
-#: bridgedb/strings.py:118
+#: bridgedb/strings.py:109
#, python-format
msgid ""
"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", "
@@ -306,7 +302,7 @@ msgid ""
"mechanisms is."
msgstr ""
-#: bridgedb/strings.py:124
+#: bridgedb/strings.py:115
#, python-format
msgid ""
"The \"HTTPS\" distribution mechanism hands out bridges over this website. To"
@@ -316,7 +312,7 @@ msgid ""
"solve the subsequent CAPTCHA."
msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:119
#, python-format
msgid ""
"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to"
@@ -329,7 +325,7 @@ msgid ""
"bridges."
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:125
#, python-format
msgid ""
"Users can request bridges from the \"Email\" distribution mechanism by "
@@ -339,11 +335,11 @@ msgid ""
"email body."
msgstr ""
-#: bridgedb/strings.py:138
+#: bridgedb/strings.py:129
msgid "Reserved"
msgstr ""
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:130
#, python-format
msgid ""
"BridgeDB maintains a small number of bridges that are not distributed\n"
@@ -357,11 +353,11 @@ msgid ""
"called \"Unallocated\" in %sbridge pool assignment%s files."
msgstr ""
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:137
msgid "None"
msgstr ""
-#: bridgedb/strings.py:147
+#: bridgedb/strings.py:138
msgid ""
"Bridges whose distribution mechanism is \"None\" are not distributed by "
"BridgeDB.\n"
@@ -372,33 +368,33 @@ msgid ""
"it will then change to the bridge's actual distribution mechanism.\n"
msgstr ""
-#: bridgedb/strings.py:157
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:158
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:163
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:168
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:161
#, python-format
msgid ""
" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
@@ -407,28 +403,22 @@ msgid ""
" are using Android, %sclick here%s."
msgstr ""
-#: bridgedb/strings.py:175
+#: bridgedb/strings.py:166
msgid ""
"Add these bridges to your Tor Browser by opening your browser\n"
"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
"bridge\" field."
msgstr ""
-#: bridgedb/strings.py:182
+#: bridgedb/strings.py:173
msgid "(Request unobfuscated Tor bridges.)"
msgstr ""
-#: bridgedb/strings.py:183
+#: bridgedb/strings.py:174
msgid "(Request IPv6 bridges.)"
msgstr ""
-#: bridgedb/strings.py:184
+#: bridgedb/strings.py:175
msgid "(Request obfs4 obfuscated bridges.)"
msgstr ""
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:187
-msgid "(Get a copy of BridgeDB's public GnuPG key.)"
-msgstr ""
-
diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 6bccf81..2a1e60d 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -8,16 +8,7 @@
# (c) 2007-2017, all entities within the AUTHORS file
# :license: 3-clause BSD, see included LICENSE for information
-"""Commonly used string constants.
-
-.. todo:: The instructions for the OpenPGP keys in
- :data:`BRIDGEDB_OPENPGP_KEY` are not translated… should we translate them?
- Should we tell users where to obtain GPG4Win/GPGTools/gnupg? Should those
- instruction be that verbose? Or should we get rid of the instructions
- altogether, and assume that any encouragement towards using GPG will just
- make users more frustrated, and (possibly) (mis-)direct that frustration
- at Tor or BridgeDB?
-"""
+"""Commonly used string constants."""
from __future__ import unicode_literals
@@ -183,8 +174,6 @@ EMAIL_COMMANDS = {
"get ipv6": _("(Request IPv6 bridges.)"),
"get transport obfs4": _("(Request obfs4 obfuscated bridges.)"),
# TRANSLATORS: Please DO NOT translate "BridgeDB".
- # TRANSLATORS: Please DO NOT translate "GnuPG".
- "get key": _("(Get a copy of BridgeDB's public GnuPG key.)"),
}
#-----------------------------------------------------------------------------
@@ -318,258 +307,3 @@ EMAIL_REFERENCE_LINKS = {
"HOWTO_TBB2": "[1]: https://tb-manual.torproject.org/bridges/#entering-bridge-addresses",
"HOWTO_TBB3": "[2]: https://tb-manual.torproject.org/mobile-tor/#circumvention",
}
-
-BRIDGEDB_OPENPGP_KEY = """\
-# This keypair contains BridgeDB's online signing and encryption subkeys. This
-# keypair rotates because it is kept online. However, the current online
-# keypair will *ALWAYS* be certified by the offline keypair (at the bottom of
-# this file).
-#
-# If you receive an email from BridgeDB, it should be signed with the
-# 21B554E95938F4D0 subkey from the following keypair:
-
-# pub 4096R/8DC43A2848821E32 2013-09-11 [expires: 2015-09-11]
-# Key fingerprint = DF81 1109 E17C 8BF1 34B5 EEB6 8DC4 3A28 4882 1E32
-# uid BridgeDB <bridges(a)bridges.torproject.org>
-# sub 4096R/21B554E95938F4D0 2013-09-11 [expires: 2015-09-11]
-# Key fingerprint = 9FE3 9D1A 7438 9223 3B3F 66F2 21B5 54E9 5938 F4D0
-# sub 4096R/E7793047C5B54232 2013-09-11 [expires: 2015-09-11]
-# Key fingerprint = CFFB 8469 9048 37E7 8CAE 322C E779 3047 C5B5 4232
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFIv8YABEADRqvfLB4xWj3Fz+HEmUUt/qbJnZhqIjo5WBHaBJOmrzx1c9fLN
-aYG36Hgo6A7NygI1oQmFnDinSrZAtrPaT63d1Jg49yZwr/OhMaxHYJElMFHGJ876
-kLZHmQTysquYKDHhv+fH51t7UVaZ9NkP5cI+V3pqck0DW5DwMsVJXNaU317kk9me
-mPJUDMb5FM4d2Vtk1N+54bHJgpgmnukNtpJmRyHRbZBqNMln5nWF7vdZ4u5PGPWj
-bA0rPZhayeE3FQ0MHiGL12kHAy30pfg54QfPJDQBCywjABetRE+xaM9TcS+R31Pf
-2VbLeb+Km7QpHMwOXI5xZLss9BAWm9EBbmXxuqaRBHyi830jjCrK9UYuzzOqKoUV
-Mk1BRelZTFnGPWeVTE+Ps+pwJ0Dwx4ghppJBCoArmEbkNliblxR/2wYOOFi/ZVA4
-Zc2ok9T3rBLVg07b7ezFUScGiTnc7ac7hp6r8Qsh09ZbhRr9erK/n194aEvkXTfr
-qepwrAE7YeF4YuR206UOFFWDhxWDLbRu0gIWgrevEQu/cvQPrO9uH5fL6Gw/+mNP
-Q/NIteejhkDyvyTUKyBu7x+Gls71zT2u/X13eOAJ8IxBkSVRKQ8tRD+oqJkWplOf
-+BpaGU+g6u4kT2AzFDxTOupfrYcPvORTAV/V3suys2YQE4x422GASXDivQARAQAB
-tClCcmlkZ2VEQiA8YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnPokDJQQT
-AQoBD0gUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3
-QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4MjFFMzJPFIAAAAAAHgAoYnJpZGdlc0Bi
-cmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERD
-NDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3JnL3Bv
-bGljeS50eHQCGwEDCw0JBBUKCQgEFgIBAAIeAQIXgCcYaHR0cHM6Ly9icmlkZ2Vz
-LnRvcnByb2plY3Qub3JnL2tleS5hc2MFAlSKBKIFCQPDTiIACgkQjcQ6KEiCHjIs
-jg//bJ12eRnBMfIGzOGh+T4wz7/YyKLfARAMnqDnSxhTxuE+M5hWm3QbxP03R6eY
-x+PKwQaDJSmm7HhRhltb7QXUe8dqjnocFwwagpoLZ/81mBLxByqg5TKHGGIGy+DX
-omIzCq5ijx1IUkHlgh708a5alG7bjRTqedT4Wxxyl6psGzDhGQdS8bqx/f32nQaE
-h41l+A/EY1g2HVqky63ZHAP3S2v+mWCrk5DnkElc0229MXqaBuEr4nbYMXRkahMb
-E2gnCmdSoeD21AY6bNyz7IcJGpyKCx9+hVgPjpm3J23JEYyPL+s48jn6QcI/Q2gD
-yAtgU65y6IrdYn8SwkABI1FIq9WAwG7DaInxvkqkYqyBQLaZJEMyX8NTBvFoT5JS
-jnkxG0xu61Vxq0BLYBIOJE0VFHAJ40/jOvSxQJkQhu9G4BK7htnADbtstmMDMM3q
-xuuO5pcj2rl7YthNunyZ1yhPHXijUUyKrwR9piENpptztFBVN6+ijqU/TmWMOtbH
-X7p9F+3tXCHHqwO5U/JMtsb/9M39MR8BrdcLc7m6dCpeuSUuR2LLroh+MoMJGviI
-iesxHF95kFqkJAecW1Z3eKL9vrlbfO3waeuCi18k1TePnZuG5lmf2KjKDW5vHK4O
-WFqvvfK2kxkCUjvGdLeTOAVOV+X+PQ23jvBJO2bS7YbOb9C5Ag0EUi/ygQEQALZ/
-p7xRINHY7MMf3/bo/I0WRxWHd1AE9tRToyEg1S2u1YrWWL5M9D8saRsp9cpnpGEu
-hW3vu7G4nasY27qOz4bSKu1YMAVIC58v1tEnBqdo1zErNjhs38PrmJKbbs9tDfYY
-Oi2x0GlhMbIrNStcZpnCdLa6U6NLMbggDL1GxjMPYBMi4TtLgcIeRDUSjsZscZkg
-Kxs5QkSVc3SrYyraayIc8WtIpDLcxPt6/g90rbatZzBfO+93Rz7qUXHmgzuM0hy1
-Fvn619o3I5DsWrfOz9t/QuznoOBw4PfzDPNT7VlzZN4xHAcr5+7B+DH9IsvlCt5N
-kQFuYpFZCpXNaD2XOtmIqjTCeLNfcgTEj0qoUIEKyKbBIgfP+7S2tLXy8JKUTy5g
-9kxXQeHueLykQ4Mt18JH0nMHbHbQl0K3LGT4ucRDOmjNtlQCltVLkIk3GimyqKs/
-vdZ9c+dm4Akx1qsJcwvveX+imJe2e9RUodcxWXxWrYnuPa5b5nfR1i+GfV0on/Pt
-AQ8gc9CkJpMiq5TQDOFhFP6yQcq77sXuUkEl5qamptedz28E0I693ulnfwcsE80p
-xkpIG6n33DZJSEyqgtWjE1P2pnsVfO5ILs3mKLe7bO1v3qMXcCkMCGH/kwzvtowq
-YvY4gaZMDZtQFY8U7lI9FdRUvVdeHAB24y291nhzABEBAAGJBYMEGAEKANNIFIAA
-AAAAFwAodmVyaWZpZWRAdG9ycHJvamVjdC5vcmdERjgxMTEwOUUxN0M4QkYxMzRC
-NUVFQjY4REM0M0EyODQ4ODIxRTMyTxSAAAAAAB4AKGJyaWRnZXNAYnJpZGdlcy50
-b3Jwcm9qZWN0Lm9yZ0RGODExMTA5RTE3QzhCRjEzNEI1RUVCNjhEQzQzQTI4NDg4
-MjFFMzIqGmh0dHBzOi8vYnJpZGdlcy50b3Jwcm9qZWN0Lm9yZy9wb2xpY3kudHh0
-AhsCBQJUigTTBQkDw01SAqTB2CAEGQEKAIEFAlIv8oFPFIAAAAAAHgAoYnJpZGdl
-c0BicmlkZ2VzLnRvcnByb2plY3Qub3JnOUZFMzlEMUE3NDM4OTIyMzNCM0Y2NkYy
-MjFCNTU0RTk1OTM4RjREMCoaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2plY3Qub3Jn
-L3BvbGljeS50eHQACgkQIbVU6Vk49NDbPw/5ATe/T8+eaToC3v0TYNRH5nveQvzA
-WdnshD3lnvfsgDhbilwifKpc5LHKXU3rvb42HH2cu0ckuksdDTvICZD9cJjRq/F+
-Mzm0pNCAJg0pQnHaaWFQjw+CHYEoizai3S+iYxhNHeSdA6Ty7xm4+bHNf0Aqblbd
-6dKwq9EvjwAI6zZsAHtsmHRUMdrFwGdKae6CSchUT2JQFBPEWMhvzdpDGACWVaSP
-sxYKuYg9LgpswGcof+tprRjKRl8MtSh0ufjbVBlTeSKpL5Y+fcTRD3PI8w7Ocr3z
-jr6XpYG4SUNHsWwxyu/DTXg76Lk1/+BdaH25hDOAasLUOU7yRL8zD/c7M0FkGXdj
-r5I2DEEqwzJ9cPHWjpgb8N9fZLoPFP9JOmKGHINqxNe7TfwiTdD6uDKs/u/QK1U+
-o3iYBXBTREdopPUdBTM9wYRUhyGXTEKLhUP3MGpXYlgeYPrSdp76VyN3BzLTbMv+
-+7rxyKxL9cWYU0pnXHgPC5nyHX5nqXmhMnkxAD3Bnm8n9XDfgiyTDExqksEh2VXt
-yhVfLezylEP2fwtd8/mABBCsTjzZW6FRfRRAjUZWZGFpFg8no1x5JS9uiswRP5g1
-qHijNFWpGyTtJWl5VNd0d9+LtVUX1jRpDUpsjZcxqs3fsvw2p+H/zQ1wFvDrsoav
-hqOTq+AEnJc7ZG8JEI3EOihIgh4ych8P/3GTyWb29+43YVibbSPPvEv4gFqziC+9
-1p92FJ0V4XdaT7TW3qaZVp5edUNwB/jjF0SxBybwaMX2ZIGXOjnjF6/Zby4ynuTX
-vZkS1mKRA0KWupB3e9PSMY3ZtssnqpGna/+3qlpxtunW7HcW4nCF/f59WHhlVjaO
-MXjtuWj59yB56Dd1sNjwhcNCyp4/NpzGnRW97ZV3Pp4oqIOqcGzCQXkVPcnaqcOh
-Cs9vIDJlMtn/IWBzUGimuRllDSSVSWkYkyJcG2NUHUwgXYpLwQz7sScvmCPchf4K
-qarpX0FpkUDfqaVVuQ7A2XbPUAVFzIk930G1WzgOuOdg9vhWSEjou+SKrAoMz90w
-3xHwEvmPDTTVJQft9ytoRbwZkIPfzzhII3mr4agbORAfzDaj5g/f6CVRdg6D3ME1
-Etg9ZrfLgRY993g/arfIME6OOsiNcy5+PunN96Rw0o1xoD+97NmZuQrs/p4Mfn5o
-8EwXHutREhahin+3/SV3hz9ReeLYmClq+OVhjPzPdtwZsFoyQyUJoFVHPTuSdChZ
-FPaqN68FjlNMugmxnvski3ZDVT7pw3B6otjjaL3rr6q0PC2yhEb2ntb3IFUizHjn
-80SmfE1Bqwit7ZHu8r/Gt/0iecGk5h84VzSgiGZGF/7m1i5UMVlNSeWnsInGa5Su
-7HSzfMq+YmkzuQINBFIv8p4BEADTOLR5e5NKKRPpjCb4B/8YYkWh+orb70EogIZ6
-j5v8d/djLyhjqZ9BIkh41/hYKMwnsa4KkDkTaX0eNu3BFB2zGgZ1GSd7525ESxiq
-suXIlAg2pex7bysaFfua0nUx64tmaQm2XArdkj/wI0pbg+idWym3WQQmZLyTTbzl
-8rpTEtTt+S2m6z3EeAhEHuNFH16hEDUywlef3EotX3njuFiLqaNvnzUYDxhUvKd2
-2K1es1ggispgP+eb1bkMApxecf2rqmSUEcvsuTWip4oGZPBLGDQeNKHkCUVbj4wT
-yWDIRtto3wi+4CFPEVzw+htj1cQfTstPqUdG7NSOmLQggedoUdv7AJm4MJJiyEax
-l+IAf6Afwrrm3eOSv0PgoUxOrUb9vhIoL8ih8gtiqvQ9qYaRQfQA/w3Z0Su2Yfoc
-fQS8Uw99qG+oTgieG6F6ud8+hMZAYVZFqbU+ztzMyDE6h4Hflkt6VNJ0Hk0VoF38
-TTs77pHXXBbLD6SzR6tbNuR9r/lbmC8Qf2A1ZAThR0iuGhNRFtUPo28GxakxGdLZ
-9kHIxjl7EN/gsmYTwuEhr+yfNtLwtSH0ojeqbDmgufvgh+SITCtyNDAUspjrZYEt
-F0NHRpSom2NFVELMqMRydU/ncph1rGZgVp6/zVj6xIlhKmqj5P1y/9B0c4Tu1CzJ
-pkJ5wwARAQABiQLpBBgBCgDTSBSAAAAAABcAKHZlcmlmaWVkQHRvcnByb2plY3Qu
-b3JnREY4MTExMDlFMTdDOEJGMTM0QjVFRUI2OERDNDNBMjg0ODgyMUUzMk8UgAAA
-AAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmdERjgxMTEwOUUxN0M4
-QkYxMzRCNUVFQjY4REM0M0EyODQ4ODIxRTMyKhpodHRwczovL2JyaWRnZXMudG9y
-cHJvamVjdC5vcmcvcG9saWN5LnR4dAIbDAUCVIoE4QUJA8NNQwAKCRCNxDooSIIe
-Mo7JEADDBtQpYxPhbj3MT0xpk96EDlon/5yHVf+cnk1pNisc+HkJsVe1nh7gAWOz
-wJKdeqOVpgxiJTxIQdl6mipKwwFi0DreP7h56s1WQkuSSWJzqssAwWHfVAsX13fV
-zWd0XyxN/OF9ZKQjX4qwpJ/na631PSwZLvHYhMaZnb9pjNwC5/PEKRmFqLbQT6Px
-12miZT6ToPDCczHxJ4BxbEGVU+PtRsHwmTRT3JhxFNDfeVd+uwsQIMidJbUoqVW7
-fe2zNd0TaWyz4Rw087oZE2OXdctjvtsu8fzXx6d/tkazI6cUOqoaMTR41KEu5X0T
-BpWSAMADBYjNs9QRWXX7ZlsJRUSCX1EKbMhgoL6KIGceIkjH61M/LF6HqDgSgSWt
-h+LIYGa+LrB/6819o32QSOSHHJ5+NJrbCSaLgKE/LKnf92V2QbZE8IGY6EOSjHqn
-n1+j+CLRKY/kUyvk+1TumTghjg/aDs/8Jv8PvgSWLQ0q1rxHYbX7q9ZJhYC/4LdR
-ya/Cho6w2l0N3tV/IMAwvFNHsaiIiiwfoOQbkBUvkyzBwjKt96Ai4I0QKt/63uH0
-drQhlJEgIyGkOrorBByVqZAQdnoLENYIu6tDUj0bTbGObKqua4iPlSK3/g40zCm4
-9OgcN7A8kFuNpgp2EHqj1/jrwd7mZYKsWTuGiR/7fwXf+4xbvg==
-=raCx
------END PGP PUBLIC KEY BLOCK-----
-
-# The following keypair is BridgeDB's offline certification-only keypair. It
-# is used to sign new online signing/encryption keypairs.
-#
-# If you import this key and mark it as trusted, emails from BridgeDB (if
-# signed correctly with the online keypair above) should always be trusted. To
-# do this, open a shell and do:
-#
-# $ curl -O https://bridges.torproject.org/keys
-# $ gpg --import keys
-# $ gpg --check-sigs 7B78437015E63DF47BB1270ACBD97AA24E8E472E
-# $ gpg --edit-key 7B78437015E63DF47BB1270ACBD97AA24E8E472E
-#
-# Then type 'trust' to set the trust level. Choose a number that you like.
-# Next type 'quit'. Finally, to create a local signature which will will not
-# be uploaded to keyservers:
-#
-# $ gpg --lsign-key 7B78437015E63DF47BB1270ACBD97AA24E8E472E
-#
-
-# pub 16384R/CBD97AA24E8E472E 2013-10-12
-# Key fingerprint = 7B78 4370 15E6 3DF4 7BB1 270A CBD9 7AA2 4E8E 472E
-# uid BridgeDB (Offline ID Key) <bridges(a)bridges.torproject.org>
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQgNBFJZB+QBQADcx7laikgZOZXLm6WH2mClm7KrRChmQAHOmzvRYTElk+hVZJ6g
-qSUTdl8fvfhifZPCd3g7nJBtOhQAGlrHmJRXfdf4cTRuD73nggbYQ0NRR9VZ3MIK
-ToJDELBhgmWeNKpLcPsTpi2t9qrHf3xxM06OdxOs9lCGtW7XVYnKx3vaRNk6c0ln
-De82ZWnZr1eMoPzcjslw7AxI94hIgV1GDwTSpBndv/VwgLeBC5XNCKv0adhO/RSt
-fuZOHGT/HfI0U0C3fSTiIu4lJqEd9Qe8LUFQ7wRMrf3KSWwyWNb/OtyMfZ52PEg9
-SMWEfpr6aGwQu6yGPsE4SeHsiew5IqCMi64TZ9IcgY0fveiDzMSIAqnWQcxSL0SH
-YbwQPxuOc4Rxj/b1umjigBG/Y4rkrxCKIw6M+CRaz203zs9ntOsWfnary/w+hepA
-XLjC0yb0cP/oBB6qRyaCk2UTdqq1uWmJ2R/XhZHdZIDabxby6mvQbUQA/NEMOE/B
-VrDonP1HNo1xpnY8lltbxdFD/jDikdjIazckMWl/0fri0pyPSdiJdAK2JrUniP9Q
-eNbgcx3XvNnfjYjiQjTdqfxCTKpSmnsBNyYng6c4viOr5weBFXwEJq2Nl7+rP5pm
-TF1PeiF769z4l2Mrx3X5sQqavTzd2VBMQ6/Kmk9Emxb8e1zyQD6odqJyTi1BBAes
-F2BuKLMCVgZWOFSNGDOMoAUMZh0c6sRQtwz3KRBAuxUYm3wQPqG3XpDDcNM5YXgF
-wVU8SYVwdFpPYT5XJIv2J2u45XbPma5aR0ynGuAmNptzELHta5cgeWIMVsKQbnPN
-M6YTOy5auxLts3FZvKpTDyjBd/VRK6ihkKNKFY3gbP6RbwEK3ws/zOxqFau7sA5i
-NGv4siQTWMG++pClz/exbgHPgs3f8yO34ZbocEBdS1sDl1Lsq4qJYo2Kn5MMHCGs
-dqd7Y+E+ep6b74njb1m2UsySEE2cjj/FAFH91jfFy5PedNb/2Hx6BsPJVb7+N4eI
-pehKQQ46XAbsMq6vUtI4Y0rFiBnqvpERqATQ2QhnEh0UmH7wKVQc4MREZfeEqazV
-G/JFt5Qnt3jq8p6/qbWlOPKTLGUqGq3RXiJgEy/5i22R2ZDjafiGoG1KsZIVZg39
-N25fT8abjPWme6JI3Jv+6gKY8tURoePZcMp/rw0NFs1HtCKUAU6FEOh6uJO7KNie
-eE8qG8ItRXVYnP4f8MFyFkHZcJw27d0PT3IrCM1vJwjqgb2j2xWM/8GJDDuUyims
-jvLDH1E7ek600H3FT5c9xPcgwfMM8BOdBNu0Evm9sdZBZFket+ytXo6GKyS/d91D
-FWE+YL+25+sZJS71dnvSUWVneJrTLFasefvPfIR9/aLJoLVFHnN9sUHfVMj0KlGl
-8AuxL7QfNQawvyjoV8rw/sJOQOwwhof1gZz0ZyjuTKj0WekjmDxcRzVY0eX6BzTm
-o7r4jrHl1Mi75svnKCpXi0Vu/1ZqSnKjCjhRTXDLm7tb8b18jogsgDfs7UkUNwD/
-XF8EfTTU4KotLOODAZIW+soFJZgf8rXQZLRShQmre+PUJfADEUd3yyE9h0JIunPQ
-CxR8R8hVhK4yqFn662Ou7fEl3q8FYBBi1Ahn+263S7+WaZGo7ElwzfRb97gP1e77
-eYd8JwY7UBIQku83CxQdahdGOpAfyvhYW2mxCHVZLXObwc18VgRMa7vjCbkGRPSN
-5NecU5KGW6jU1dXuZk0jRt/9mqtYPjJ7K/EVJD9Yxmz+UdxH+BtsSRp3/5fDmHtW
-CB39a7fetp0ixN503FXPKQUvKAKykETwevmWOzHH3t6BpY/ZSjDCC35Y3dWeB54H
-qNta1r0pSWV6IARUoVteAOcuOU/l3HNzY80rL+iR0HiaszioBsd8k8u0rWXzM3BP
-3vhTzccaldSWfqoT86Jfx0YLX6EoocVS8Ka5KUA8VlJWufnPPXDlF3dULrb+ds/l
-zLazt9hF49HCpU1rZc3doRgmBYxMjYyrfK/3uarDefpfdnjbAVIoP26VpVXhLTEM
-oaD+WoTpIyLYfJQUDn1Q06Nu393JqZb8nRngyMeTs73MDJTzqdL4rZXyweeTrtYe
-4yy+Kc3CZdPlZqpkbuxP0cO0ivaTLdXsTCHDnpk16u4sDukcsmlaTF5d75nu/KIQ
-o3nk0g9NvoschDcQiExuqCUOXCkKcUvYVHsuglAuT+AqK692562JrDOVoGwkUVvm
-Qfo0AQvBvXUzHY4YuBUdWbjWsC4sj6B+MW/TIs/OlKIbPE3MHeDhEGLl/8uBceVo
-kM36xm4F8wDwPK4GPyi/D+3piqBsrsjkgRlodQIUS7A9V19b8TWbUFeH4JGJ+5EH
-9WErBlrsQrnosojLchGGp7HxSxWLBiwdnltu6+/hwbBwydJT8ZxPUANIwTdB+mOE
-ILUXBkpIDfVSoZD7qWlntai53BDQr5pfMJhv15di4XAhtqv43vAmA57ifd+QJS2U
-AfYc4CdX0lk2BZ4jRD8jCZ4Uxw15E3RqhnXsWDRxtD4fwsb2ZFi0DDuPlwBdGgh5
-Rm2Bz9JjSV6gDEuXr/JtAzjSz1Jdh8wPkSofiHGTfxysVhlGlg+YPRziRlzML8A2
-0xY+9mPxEEin5ZQ9wmrDyiiOBvPTbG3O9+Sp5VZDuD4ivW/DHumPWGVSRdjcAQDe
-HMXUVGjhBDnj06XNrgJPhODdJeYq0EnGTt15ofZQSswD7TTTRPDOn0Cz/QARAQAB
-tDpCcmlkZ2VEQiAoT2ZmbGluZSBJRCBLZXkpIDxicmlkZ2VzQGJyaWRnZXMudG9y
-cHJvamVjdC5vcmc+iQkfBBMBCgEJBQJSWQfkSBSAAAAAABcAKHZlcmlmaWVkQHRv
-cnByb2plY3Qub3JnN0I3ODQzNzAxNUU2M0RGNDdCQjEyNzBBQ0JEOTdBQTI0RThF
-NDcyRU8UgAAAAAAeAChicmlkZ2VzQGJyaWRnZXMudG9ycHJvamVjdC5vcmc3Qjc4
-NDM3MDE1RTYzREY0N0JCMTI3MEFDQkQ5N0FBMjRFOEU0NzJFKhpodHRwczovL2Jy
-aWRnZXMudG9ycHJvamVjdC5vcmcvcG9saWN5LnR4dAIbAQMLDQkEFQoJCAQWAgEA
-Ah4BAheAJxhodHRwczovL2JyaWRnZXMudG9ycHJvamVjdC5vcmcva2V5LmFzYwAK
-CRDL2XqiTo5HLoqEP/48rFpJCVStn8xo+KkHSVvsqpxDRlb/nNheI+ov2UxILdwl
-NIU6kLsvKECKPe1AHKdS/MzANbkTF35Y4QgZsNpVXaCVL7adGBSzOdPFupDJJVOu
-wa+uFRc/FuNJyH/TIn56/+R5J5C54OxIYNxvW3WF4eHKLJYk/JZOMMfy4iWm7Sql
-0nDC5O435nK4F4Jb4GLPlUIzioIy2OWqGoFHXymbGhL1tWaqasYmED4n3AMqlYw6
-xnNhdWOc/KZelPl9nanybyh0IIdZqUKZleRt4BxSgIT8FqC2sZuZ8z7O9s987Naz
-Q32SKaP4i2M9lai/Y2QYfKo+wlG+egmxtujz7etQMGlpgBZzFLdJ8/w4U11ku1ai
-om74RIn8zl/LHjMQHnCKGoVlscTI1ZPt+p+p8hO2/9vOwTR8y8O/3DQSOfTSipwc
-a3obRkp5ndjfjefOoAnuYapLw72fhJ9+Co09miiHQu7vq4j5k05VpDQd0yxOAZnG
-vodPPhq7/zCG1K9Sb1rS9GvmQxGmgMBWVn+keTqJCZX7TSVgtgua9YjTJNVSiSLv
-rLslNkeRfvkfbAbU8379MDB+Bax04HcYTC4syf0uqUXYq6jRtX37Dfq5XkLCk2Bt
-WusH2NSpHuzZRWODM9PZb6U3vuBmU1nqY77DciuaeBqGGyrC/6UKrS0DrmVvF/0Z
-Sft3BY6Zb3q7Qm7xpzsfrhVlhlyQqZPhr6o7QnGuvwRr+gDwhRbpISKYo89KYwjK
-4Qr7sg/CyU2hWBCDOFPOcv/rtE0aD88M+EwRG/LCfEWU34Dc43Jk+dH56/3eVR58
-rISHRUcU0Y603Uc+/WM31iJmR/1PvGeal+mhI9YSWUIgIY8Mxt3cM2gYl/OErGbN
-4hWAPIFn4sM9Oo4BHpN7J2vkUatpW6v4Mdh+pNxzgE/V5S21SGaAldvM1SzCRz52
-xRt642Mhf6jqfrwzXf7kq7jpOlu1HkG1XhCZQPw7qyIKnX4tjaRd9HXhn9Jb2vA5
-Av+EOPoAx6Yii5X1RkDILOijvgVfSIFXnflHzs58AhwHztQOUWXDkfS5jVxbenbV
-X4DwgtrpzpdPBgBYNtCGBy9pqhWA2XnkH2vjchZy+xIAoaJNIVBfNkR8tflJWEfm
-i/2U0jJnhY8dEClbu3KQnbwKe5E9mTz1VmBsdWaK5rBVZamD/wssQzzyf3SXXXIU
-W6DUXOCzgWvxvqC09lc4izEAxwUktMY+aapplNs/kjOqHYVkW4zpWGp4PDAT/DW9
-/727CeoqY29HePaeGl0/PpR37CkquP69oQeJSU9CNeyAKnQtvaqxLBcEOohSaPtK
-Iy1q6yQgT4j+gVAsFDVyobCNkA8B0GfemDcEXA5dfriTHN72Br0koS0nvv6P5k7T
-7aaSNX++zdEnPauAZXPPjVt7R1sEvx0Oj+l1pu9hNX0nldaNs13bPU5DIOYv+5fN
-En6pqzYGj/0v8Qeb53Qv5de+lo7ZAu/truVa+GOT3ay4jZBaFh2mDZbA+t1V3GmB
-FtYGoVfou4iBQpx6tJLg3PKvtPj9g5B4LTxZVKrdfHXWyNNQOLzWSIgFj44+SmhU
-LVCXofEvJ0sOX2wtqy54Q4lMIc6BK1IB+hsFV6sSnIeI7YmrRXusWEG0wnroNlbq
-FiWg5+oeI1CnnCyj4FmDX/A/Bo0RxD0x3yqDximkOpcHMtLLfFjK3d5ltwBgDOOe
-pvgabxID01mZxh3OYKdGpW3Z1VKEhHjF5e9BhhEKQ8mG3raaDs2hQ2iuEqTzNLif
-aQdRCYd62jS14qSy2Dd+oZ0FbgzJNigWldvuwWzJCO2toF29pvfWtYRuqV/Vt3CK
-iO7en9bhOMRynPlCkAR7ZiZvT9dzStiMKf1v8mzgRjCIiLIwM1v/xNZWEZ/TOfSR
-E7dBMbDzaNjtCsMmNiyplqCjWbaj4irdIhKbtKJ02a1Jopo1/XNK0Y8AbK1xEHV0
-+mjBYU/Pfqnf0WFhkJgha+J17wqrUxf2/Y1b/pdDMGqVWe9+p8tvSP5FNddNyecZ
-0pojFH0jAzHpQen7eeIA3XupVe6cTEhNz4OjHBlZE6dN0q8UDdeG75yPunwShQiO
-kRXA/qxkID/2OLIInWJP0HG05hncGfWZKCLBc/dFg3dNo8VKpw/Q6uMBj2iGi8iB
-lnQGmHQa3j1ANPbcl3ljdJQDEnxk5TEVxNPYUw/BI58l3p+Z3vAZqC0Io7EgpuZ8
-qPuV6hJ2c/7VuFAXVs2mUExtWAjbgnYAfsJtn1yk3sphl65TjPnZwaBlP/ls/W/j
-mVjAx9d5b3mmMBJmNZDvY1QvcftDgfL5vYG5g7UwsbojuNxeM4rwn8qCKk5wC1/a
-Zl6Rh2DG4xS3/ef5tQWw28grjRRwv5phYKtedsKpYRscKAMhiOsChAiSYuCRczmI
-ErdO8ryK8QNzcpE4qVzFQMEtkG6V0RYYjMJzJuY5BW3hKt1UNNaqiGBpNKuf0GoO
-zK/vMgxoo+iFmOuaBdQEjlPLbK+3k+7j14KKVI655AXVKyAsOoSYPzOqfkdiu9W8
-34fOanH7S+lclkXwxTbXko9Jt6Ml64H4QKwd8ak2nCcX9FuMge7XP9VL/pBBMXcB
-WHUKdoqMJExcg5A4H2cyxZ6QgHzNFgqV/4+MGGP+TMc9owzrT3PBadVrMxnHnjc/
-/XYv48p2rRkjyjrtH+ZO9rlOsw0OmGgh9yoQPZn2tiNhG9piyvVxFKZflJm8I4kC
-4AQTAQoAygUCUlkPIkgUgAAAAAAXACh2ZXJpZmllZEB0b3Jwcm9qZWN0Lm9yZzdC
-Nzg0MzcwMTVFNjNERjQ3QkIxMjcwQUNCRDk3QUEyNEU4RTQ3MkVPFIAAAAAAHgAo
-YnJpZGdlc0BicmlkZ2VzLnRvcnByb2plY3Qub3JnREY4MTExMDlFMTdDOEJGMTM0
-QjVFRUI2OERDNDNBMjg0ODgyMUUzMioaaHR0cHM6Ly9icmlkZ2VzLnRvcnByb2pl
-Y3Qub3JnL3BvbGljeS50eHQACgkQjcQ6KEiCHjIaqBAA0BuEs7horx6iCq4cjAhv
-YPLrxuC4fKEfVyhAjCJMJSFFCPAlGgU+BjyPNDD57wzKAmUkdJG+Ss25mwWXa53w
-5R2kDqDnHocOdZGtxZ7zx/uUd2eWLNBfVuK7nHOk1d1Hs0OZBnckc+MCqnLtuYe5
-68pa9+jW6cNIjAnzMIListmoXWgYYWJvMKeBMG4DGtYJ8w7CJQjOHc5yar12DrX3
-wnQ7hXtFuuqQblpEUnLnZGvHf2NKMZfBBMcP96h9OmLGNa+vmNYsMyPKU7n5hPgX
-nTgmQ4xrv1G7JukjppZRA8SFoxupcaQeTixyWERGBhBiAbwZsbQz8L/TVZKierzg
-sdNngHcFzE8MyjuJDvTos7qXPmgSRXFqJLRn0ZxpR5V1V8BVZUqCGuSZT89TizsD
-z5vyv8c9r7HKD4pRjw32P2dgcEqyGRkqERAgSuFpObP+juty+kxYyfnadBNCyjgP
-s7u0GmsTt4CZi7BbowNRL6bynrwrmQI9LJI1bPhgqfdDUbqG3HXwHz80oRFfKou8
-JTYKxK4Iumfw2l/uAACma5ZyrwIDBX/H5XEQqch4sORzQnuhlTmZRf6ldVIIWjdJ
-ef+DpOt12s+cS2F4D5g8G6t9CprCLYyrXiHwM/U8N5ywL9IeYKSWJxa7si3l9A6o
-ZxOds8F/UJYDSIB97MQFzBo=
-=JdC7
------END PGP PUBLIC KEY BLOCK-----
-"""
diff --git a/bridgedb/test/email_helpers.py b/bridgedb/test/email_helpers.py
index edc8196..cd805f9 100644
--- a/bridgedb/test/email_helpers.py
+++ b/bridgedb/test/email_helpers.py
@@ -25,11 +25,6 @@ from . import util
EMAIL_DIST = True
EMAIL_ROTATION_PERIOD = "1 day"
EMAIL_INCLUDE_FINGERPRINTS = True
-EMAIL_GPG_SIGNING_ENABLED = True
-EMAIL_GPG_HOMEDIR = '.gnupg'
-EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = '0017098C5DF4197E3C884DCFF1B240D43F148C21'
-EMAIL_GPG_PASSPHRASE = None
-EMAIL_GPG_PASSPHRASE_FILE = None
EMAIL_DOMAIN_MAP = {
'googlemail.com': 'gmail.com',
'mail.google.com': 'gmail.com',
@@ -56,11 +51,6 @@ TEST_CONFIG_FILE = io.StringIO("""\
EMAIL_DIST = %s
EMAIL_ROTATION_PERIOD = %s
EMAIL_INCLUDE_FINGERPRINTS = %s
-EMAIL_GPG_SIGNING_ENABLED = %s
-EMAIL_GPG_HOMEDIR = %s
-EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = %s
-EMAIL_GPG_PASSPHRASE = %s
-EMAIL_GPG_PASSPHRASE_FILE = %s
EMAIL_DOMAIN_MAP = %s
EMAIL_DOMAIN_RULES = %s
EMAIL_DOMAINS = %s
@@ -78,11 +68,6 @@ EMAIL_PORT = %s
""" % (repr(EMAIL_DIST),
repr(EMAIL_ROTATION_PERIOD),
repr(EMAIL_INCLUDE_FINGERPRINTS),
- repr(EMAIL_GPG_SIGNING_ENABLED),
- repr(EMAIL_GPG_HOMEDIR),
- repr(EMAIL_GPG_PRIMARY_KEY_FINGERPRINT),
- repr(EMAIL_GPG_PASSPHRASE),
- repr(EMAIL_GPG_PASSPHRASE_FILE),
repr(EMAIL_DOMAIN_MAP),
repr(EMAIL_DOMAIN_RULES),
repr(EMAIL_DOMAINS),
@@ -150,10 +135,10 @@ class DummyEmailDistributorWithState(DummyEmailDistributor):
:exc:`bridgedb.distributors.email.distributor.IgnoreEmail` on the third.
Note that the state tracking is done in a really dumb way. For example, we
- currently don't consider requests for help text or GnuPG keys to be a
- "real" request, so in the real email distributor they won't trigger either
- a TooSoonEmail or IgnoreEmail. Here we only track the total number of
- *any* type of request per client.
+ currently don't consider requests for help text to be a "real" request, so
+ in the real email distributor they won't trigger either a TooSoonEmail or
+ IgnoreEmail. Here we only track the total number of *any* type of request
+ per client.
"""
def __init__(self, *args, **kwargs):
diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py
index 45c06ae..f57d4f3 100644
--- a/bridgedb/test/test_crypto.py
+++ b/bridgedb/test/test_crypto.py
@@ -91,143 +91,6 @@ class GetKeyTests(unittest.TestCase):
% (binascii.hexlify(key).decode('utf-8'), binascii.hexlify(SEKRIT_KEY).decode('utf-8')))
-class InitializeGnuPGTests(unittest.TestCase):
- """Unittests for :func:`bridgedb.crypto.initializeGnupG`."""
-
- def _moveGnuPGHomedir(self):
- """Move the .gnupg/ directory from the top-level of this repo to the
- current working directory.
-
- :rtype: str
- :returns: The full path to the new gnupg home directory.
- """
- here = os.getcwd()
- topDir = here.rstrip('_trial_temp')
- gnupghome = os.path.join(topDir, '.gnupg')
- gnupghomeNew = os.path.join(here, '.gnupg')
-
- if os.path.isdir(gnupghomeNew):
- shutil.rmtree(gnupghomeNew)
-
- shutil.copytree(gnupghome, gnupghomeNew)
-
- return gnupghomeNew
-
- def _writePassphraseToFile(self, passphrase, filename):
- """Write **passphrase** to the file at **filename**.
-
- :param str passphrase: The GnuPG passphase.
- :param str filename: The file to write the passphrase to.
- """
- fh = open(filename, 'w')
- fh.write(passphrase)
- fh.flush()
- fh.close()
-
- def setUp(self):
- """Create a config object and setup our gnupg home directory."""
- self.config = _createConfig()
- self.gnupghome = self._moveGnuPGHomedir()
- self.config.EMAIL_GPG_HOMEDIR = self.gnupghome
-
- self.passphraseFile = 'gpg-passphrase-file'
- self._writePassphraseToFile('sekrit', self.passphraseFile)
-
- def test_crypto_initializeGnuPG(self):
- """crypto.initializeGnuPG() should return a 2-tuple with a gpg object
- and a signing function.
- """
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNotNone(gpg)
- self.assertIsNotNone(signfunc)
-
- def test_crypto_initializeGnuPG_disabled(self):
- """When EMAIL_GPG_SIGNING_ENABLED=False, crypto.initializeGnuPG()
- should return a 2-tuple of None.
- """
- self.config.EMAIL_GPG_SIGNING_ENABLED = False
- gpg, signfunc = crypto.initializeGnuPG(self.config)
-
- self.assertIsNone(gpg)
- self.assertIsNone(signfunc)
-
- def test_crypto_initializeGnuPG_no_secrets(self):
- """When the secring.gpg is missing, crypto.initializeGnuPG() should
- return a 2-tuple of None.
- """
- secring = os.path.join(self.gnupghome, 'secring.gpg')
- if os.path.isfile(secring):
- os.remove(secring)
-
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNone(gpg)
- self.assertIsNone(signfunc)
-
- def test_crypto_initializeGnuPG_no_publics(self):
- """When the pubring.gpg is missing, crypto.initializeGnuPG() should
- return a 2-tuple of None.
- """
- pubring = os.path.join(self.gnupghome, 'pubring.gpg')
- if os.path.isfile(pubring):
- os.remove(pubring)
-
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNone(gpg)
- self.assertIsNone(signfunc)
-
- def test_crypto_initializeGnuPG_with_passphrase(self):
- """crypto.initializeGnuPG() should initialize correctly when a
- passphrase is given but no passphrase is needed.
- """
- self.config.EMAIL_GPG_PASSPHRASE = 'password'
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNotNone(gpg)
- self.assertIsNotNone(signfunc)
-
- def test_crypto_initializeGnuPG_with_passphrase_file(self):
- """crypto.initializeGnuPG() should initialize correctly when a
- passphrase file is given but no passphrase is needed.
- """
- self.config.EMAIL_GPG_PASSPHRASE_FILE = self.passphraseFile
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNotNone(gpg)
- self.assertIsNotNone(signfunc)
-
- def test_crypto_initializeGnuPG_missing_passphrase_file(self):
- """crypto.initializeGnuPG() should initialize correctly if a passphrase
- file is given but that file is missing (when no passphrase is actually
- necessary).
- """
- self.config.EMAIL_GPG_PASSPHRASE_FILE = self.passphraseFile
- os.remove(self.passphraseFile)
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNotNone(gpg)
- self.assertIsNotNone(signfunc)
-
- def test_crypto_initializeGnuPG_signingFunc(self):
- """crypto.initializeGnuPG() should return a signing function which
- produces OpenPGP signatures.
- """
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNotNone(gpg)
- self.assertIsNotNone(signfunc)
-
- sig = signfunc("This is a test of the public broadcasting system.")
- print(sig)
- self.assertIsNotNone(sig)
- self.assertTrue(sig.startswith(b'-----BEGIN PGP SIGNED MESSAGE-----'))
-
- def test_crypto_initializeGnuPG_nonexistent_default_key(self):
- """When the key specified by EMAIL_GPG_PRIMARY_KEY_FINGERPRINT doesn't
- exist in the keyrings, crypto.initializeGnuPG() should return a 2-tuple
- of None.
- """
- self.config.EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = 'A' * 40
- gpg, signfunc = crypto.initializeGnuPG(self.config)
- self.assertIsNone(gpg)
- self.assertIsNone(signfunc)
-
-
class RemovePKCS1PaddingTests(unittest.TestCase):
"""Unittests for :func:`bridgedb.crypto.removePKCS1Padding`."""
diff --git a/bridgedb/test/test_email_autoresponder.py b/bridgedb/test/test_email_autoresponder.py
index d5023e0..9b49c67 100644
--- a/bridgedb/test/test_email_autoresponder.py
+++ b/bridgedb/test/test_email_autoresponder.py
@@ -35,16 +35,8 @@ from bridgedb.test.email_helpers import DummyEmailDistributorWithState
class CreateResponseBodyTests(unittest.TestCase):
"""Tests for :func:`bridgedb.distributors.email.autoresponder.createResponseBody`."""
- def _moveGPGTestKeyfile(self):
- here = os.getcwd()
- topDir = here.rstrip('_trial_temp')
- self.gpgFile = os.path.join(topDir, '.gnupg', 'TESTING.subkeys.sec')
- self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec')
- shutil.copy(self.gpgFile, self.gpgMoved)
-
def setUp(self):
"""Create fake email, distributor, and associated context data."""
- self._moveGPGTestKeyfile()
self.toAddress = "user(a)example.com"
self.config = _createConfig()
self.ctx = _createMailServerContext(self.config)
@@ -62,13 +54,6 @@ class CreateResponseBodyTests(unittest.TestCase):
]
return lines
- def test_createResponseBody_getKey(self):
- """A request for 'get key' should receive our GPG key."""
- lines = self._getIncomingLines()
- lines[4] = "get key"
- ret = autoresponder.createResponseBody(lines, self.ctx, self.toAddress)
- self.assertSubstring('-----BEGIN PGP PUBLIC KEY BLOCK-----', ret)
-
def test_createResponseBody_bridges_invalid(self):
"""An invalid request for 'transport obfs3' should still return
bridges."""
diff --git a/bridgedb/test/test_email_request.py b/bridgedb/test/test_email_request.py
index e0bb642..1cbcbc0 100644
--- a/bridgedb/test/test_email_request.py
+++ b/bridgedb/test/test_email_request.py
@@ -27,32 +27,21 @@ class DetermineBridgeRequestOptionsTests(unittest.TestCase):
def test_determineBridgeRequestOptions_multiline_invalid(self):
lines = ['',
'help',
- 'i need bridges',
- 'give me your gpgs']
+ 'i need bridges']
reqvest = request.determineBridgeRequestOptions(lines)
# We consider every request valid...
self.assertEqual(reqvest.isValid(), True)
- self.assertFalse(reqvest.wantsKey())
# ...so by default, we return a bridge.
self.assertEqual(len(reqvest.transports), 1)
- def test_determineBridgeRequestOptions_get_key(self):
- """Requesting 'get key' should raise EmailRequestedKey."""
- lines = ['',
- 'get key']
- self.assertRaises(request.EmailRequestedKey,
- request.determineBridgeRequestOptions, lines)
-
def test_determineBridgeRequestOptions_multiline_invalid(self):
"""Requests without a 'get' are incorrect but still valid, and should
return bridges."""
lines = ['',
'transport obfs3',
- 'ipv6 vanilla bridges',
- 'give me your gpgs']
+ 'ipv6 vanilla bridges']
reqvest = request.determineBridgeRequestOptions(lines)
self.assertEqual(reqvest.isValid(), True)
- self.assertFalse(reqvest.wantsKey())
# Though they did request IPv6, technically.
self.assertIs(reqvest.ipVersion, 6)
# And they did request a transport, technically.
@@ -67,7 +56,6 @@ class DetermineBridgeRequestOptionsTests(unittest.TestCase):
reqvest = request.determineBridgeRequestOptions(lines)
# It's valid because it included a 'get'.
self.assertEqual(reqvest.isValid(), True)
- self.assertFalse(reqvest.wantsKey())
# Though they didn't request IPv6, so it should default to IPv4.
self.assertIs(reqvest.ipVersion, 4)
# And they requested two transports.
@@ -90,7 +78,6 @@ class DetermineBridgeRequestOptionsTests(unittest.TestCase):
reqvest = request.determineBridgeRequestOptions(lines)
# It's valid because it included a 'get'.
self.assertEqual(reqvest.isValid(), True)
- self.assertFalse(reqvest.wantsKey())
# Though they didn't request IPv6, so it should default to IPv4.
self.assertIs(reqvest.ipVersion, 4)
# And they requested two transports.
@@ -156,25 +143,6 @@ class EmailBridgeRequestTests(unittest.TestCase):
self.request.isValid(False)
self.assertEqual(self.request.isValid(), False)
- def test_EmailBridgeRequest_wantsKey_initial(self):
- """Initial value of EmailBridgeRequest.wantsKey() should be False."""
- self.request.wantsKey(None)
- self.assertEqual(self.request.wantsKey(), False)
-
- def test_EmailBridgeRequest_wantsKey_True(self):
- """The value of EmailBridgeRequest.wantsKey() should be True, after it
- has been called with ``True`` as an argument.
- """
- self.request.wantsKey(True)
- self.assertEqual(self.request.wantsKey(), True)
-
- def test_EmailBridgeRequest_wantsKey_False(self):
- """The value of EmailBridgeRequest.wantsKey() should be False, after
- it has been called with ``False`` as an argument.
- """
- self.request.wantsKey(False)
- self.assertEqual(self.request.wantsKey(), False)
-
def test_EmailBridgeRequest_withIPv6(self):
"""IPv6 requests should have ``ipVersion == 6``."""
self.assertEqual(self.request.ipVersion, 4)
diff --git a/bridgedb/test/test_email_templates.py b/bridgedb/test/test_email_templates.py
index 4a5979d..a948c91 100644
--- a/bridgedb/test/test_email_templates.py
+++ b/bridgedb/test/test_email_templates.py
@@ -30,10 +30,6 @@ class EmailTemplatesTests(unittest.TestCase):
self.t = NullTranslations(StringIO('test'))
self.client = Address('blackhole(a)torproject.org')
self.answer = 'obfs3 1.1.1.1:1111\nobfs3 2.2.2.2:2222'
- # This is the fingerprint of BridgeDB's offline, certification-only
- # GnuPG key. It should be present in any responses to requests for our
- # public keys.
- self.offlineFingerprint = '7B78437015E63DF47BB1270ACBD97AA24E8E472E'
def shouldIncludeCommands(self, text):
self.assertSubstring('commands', text)
@@ -51,9 +47,6 @@ class EmailTemplatesTests(unittest.TestCase):
def shouldIncludeAutomationNotice(self, text):
self.assertSubstring('automated email', text)
- def shouldIncludeKey(self, text):
- self.assertSubstring('-----BEGIN PGP PUBLIC KEY BLOCK-----', text)
-
def test_templates_addCommands(self):
text = templates.addCommands(self.t)
self.shouldIncludeCommands(text)
@@ -76,10 +69,6 @@ class EmailTemplatesTests(unittest.TestCase):
self.shouldIncludeAutomationNotice(text)
self.shouldIncludeCommands(text)
- def test_templates_buildKeyMessage(self):
- text = templates.buildKeyMessage(self.t, self.client)
- self.assertSubstring(self.offlineFingerprint, text)
-
def test_templates_buildSpamWarning(self):
text = templates.buildSpamWarning(self.t, self.client)
self.shouldIncludeGreeting(text)
diff --git a/bridgedb/test/test_main.py b/bridgedb/test/test_main.py
index 82b609f..64b65a4 100644
--- a/bridgedb/test/test_main.py
+++ b/bridgedb/test/test_main.py
@@ -444,11 +444,6 @@ EMAIL_BIND_IP = "127.0.0.1"
EMAIL_PORT = 55557
EMAIL_N_BRIDGES_PER_ANSWER = 3
EMAIL_INCLUDE_FINGERPRINTS = True
-EMAIL_GPG_SIGNING_ENABLED = False
-EMAIL_GPG_HOMEDIR = '../.gnupg'
-EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = '0017098C5DF4197E3C884DCFF1B240D43F148C21'
-EMAiL_GPG_PASSPHRASE = None
-EMAIL_GPG_PASSPHRASE_FILE = None
HTTPS_SHARE = 10
EMAIL_SHARE = 5
RESERVED_SHARE = 2"""
diff --git a/requirements.txt b/requirements.txt
index ef72ed5..79bb01d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@ html5lib==1.0b8
Mako==1.1.1
pycryptodome==3.9.6
Twisted==20.3.0
-gnupg==2.3.1
ipaddr==2.2.0
Pillow==6.2.2
pyOpenSSL==19.1.0
diff --git a/scripts/setup-tests b/scripts/setup-tests
index 1de3c71..fc89d8f 100755
--- a/scripts/setup-tests
+++ b/scripts/setup-tests
@@ -13,7 +13,7 @@ cd $THERE
mkdir -p run/from-authority
mkdir -p run/from-bifroest
-cp -R -t run bridgedb.conf captchas .gnupg
+cp -R -t run bridgedb.conf captchas
# Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be
# done on testing servers, never on production servers.
sed -r -i -e "s/(EMAIL_DOMAINS)(.*)(])/\1\2\, '127.0.0.1']/" run/bridgedb.conf
1
0
15 Apr '20
commit 4cdd6a61d01ae6d7c755e870acd8a7eb139d22e7
Merge: 208b49c b366bb4
Author: Philipp Winter <phw(a)nymity.ch>
Date: Wed Apr 15 09:34:59 2020 -0700
Merge branch 'defect/17548' into develop
.gnupg/TESTING.pub | Bin 4622 -> 0 bytes
.gnupg/TESTING.subkeys.sec | Bin 7212 -> 0 bytes
.gnupg/bridgedb-offline-key.pub.asc | 113 ----------
.gnupg/bridgedb-online-key.pub.asc | 100 ---------
.gnupg/gpg.conf | 96 ---------
.gnupg/pubring.gpg | Bin 4634 -> 0 bytes
.gnupg/secring.gpg | Bin 7224 -> 0 bytes
.travis.requirements.txt | 1 -
CHANGELOG | 6 +
README.rst | 29 +--
bridgedb.conf | 45 ----
bridgedb/configure.py | 3 +-
bridgedb/crypto.py | 99 +--------
bridgedb/distributors/email/autoresponder.py | 41 +---
bridgedb/distributors/email/distributor.py | 6 +-
bridgedb/distributors/email/request.py | 22 --
bridgedb/distributors/email/server.py | 10 -
bridgedb/distributors/email/templates.py | 7 -
bridgedb/distributors/https/server.py | 2 -
bridgedb/distributors/https/templates/base.html | 2 -
bridgedb/i18n/templates/bridgedb.pot | 84 ++++----
bridgedb/strings.py | 268 +-----------------------
bridgedb/test/email_helpers.py | 23 +-
bridgedb/test/test_crypto.py | 137 ------------
bridgedb/test/test_email_autoresponder.py | 15 --
bridgedb/test/test_email_request.py | 36 +---
bridgedb/test/test_email_templates.py | 11 -
bridgedb/test/test_main.py | 5 -
requirements.txt | 1 -
scripts/setup-tests | 2 +-
30 files changed, 63 insertions(+), 1101 deletions(-)
1
0
[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation@torproject.org 15 Apr '20
by translation@torproject.org 15 Apr '20
15 Apr '20
commit bff6e6f75f6d882c71b1467467e143cbc13feaa7
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 15 16:21:55 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton…
---
tr/torbutton.properties | 65 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 63 insertions(+), 2 deletions(-)
diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index aaa4b3aaab..44ad95be54 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = Bilinmeyen Ülke
torbutton.circuit_display.guard = Koruma
torbutton.circuit_display.guard_note = [Koruma] düğümünüz değiştirilemez.
torbutton.circuit_display.learn_more = Ayrıntılı bilgi alın
+torbutton.circuit_display.click_to_copy = Kopyalamak için tıklayın
+torbutton.circuit_display.copied = Kopyalandı!
torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin genişlik ve yüksekliğini daha az ayırt edilebilir duruma getirmek için kenar boşlukları ekleyerek kişilerin sizi çevrim içi olarak izleme yeteneğini azaltır.
torbutton.panel.tooltip.disabled = Tor uygulamasını etkinleştirmek için tıklayın
torbutton.panel.tooltip.enabled = Tor uygulamasını devre dışı bırakmak için tıklayın
@@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=Bağlantı Şifreli (Onion Hizmeti,
pageInfo_OnionEncryption=Bağlantı Şifreli (Onion Hizmeti)
# Onion services strings. Strings are kept here for ease of translation.
-# LOCALIZATION NOTE: %S will be replaced with the .onion address.
onionServices.learnMore=Ayrıntılı bilgi alın
-onionServices.clientAuthMissing=Tor Onion hizmeti istemci kimlik doğrulaması eksik
+onionServices.errorPage.browser=Tarayıcı
+onionServices.errorPage.network=Ağ
+onionServices.errorPage.onionSite=Onion Sitesi
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+# an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Onion sitesi yüklenirken sorun çıktı
+onionServices.descNotFound.header=Onion sitesi bulunamadı
+# onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+# onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+# Tor SOCKS error 0xF1:
+# onionServices.descInvalid.pageTitle=Problem Loading Onionsite
+# onionServices.descInvalid.header=Onionsite Cannot Be Reached
+# onionServices.descInvalid=The onionsite is unreachable due an internal error.
+# onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+# Tor SOCKS error 0xF2:
+# onionServices.introFailed.pageTitle=Problem Loading Onionsite
+# onionServices.introFailed.header=Onionsite Has Disconnected
+# onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
+# onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+# Tor SOCKS error 0xF3:
+# onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
+# onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
+# onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+# onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+# Tor SOCKS error 0xF4:
+# onionServices.clientAuthMissing.pageTitle=Authorization Required
+# onionServices.clientAuthMissing.header=Onionsite Requires Authentication
+# onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
+# onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+# Tor SOCKS error 0xF5:
+# onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
+# onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
+# onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
+# onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+# Tor SOCKS error 0xF6:
+# onionServices.badAddress.pageTitle=Problem Loading Onionsite
+# onionServices.badAddress.header=Invalid Onionsite Address
+# onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
+# onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+# Tor SOCKS error 0xF7:
+# onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
+# onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
+# onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
+# onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
onionServices.authPrompt.description=%S kişisel anahtarınıza gerek duyuyor
onionServices.authPrompt.keyPlaceholder=Bu Onion hizmeti için kişisel anahtarınızı yazın
onionServices.authPrompt.done=Tamam
@@ -80,3 +127,17 @@ onionServices.authPreferences.remove=Sil
onionServices.authPreferences.removeAll=Tümünü Sil
onionServices.authPreferences.failedToGetKeys=Anahtarlar Tor üzerinden alınamadı
onionServices.authPreferences.failedToRemoveKey=Anahtar silinemedi
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Onion sitelerine öncelik verilsin
+onionLocation.alwaysPrioritizeAccessKey=a
+onionLocation.notNow=Şimdi Değil
+onionLocation.notNowAccessKey=n
+onionLocation.description=Bu sitenin Tor ağı üzerinde onion hizmetleri ile sunulan daha özel ve güvenli bir sürümü var. Onion hizmetleri web sitesi yayıncıları ve ziyaretçilerinin sansürden ve izlenmekten kaçınmasına yardımcı olur.
+onionLocation.tryThis=Onion Hizmetlerini Deneyin
+onionLocation.onionAvailable=.onion sitesi var
+onionLocation.learnMore=Ayrıntılı bilgi alın…
+onionLocation.always=Her zaman
+onionLocation.askEverytime=Her defasında sorulsun
+onionLocation.prioritizeOnionsDescription=Bilindiğinde .onion sitelerine öncelik verilsin.
+onionLocation.onionServicesTitle=Onion Hizmetleri
1
0
[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation@torproject.org 15 Apr '20
by translation@torproject.org 15 Apr '20
15 Apr '20
commit 63d588b38dc10899fad632a326da37ba2e0e5ba3
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 15 16:21:48 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton…
---
tr/torbutton.properties | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index eac14289c0..4462e5622f 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -71,7 +71,7 @@ onionServices.errorPage.onionSite=Onion Sitesi
# Tor SOCKS error 0xF0:
onionServices.descNotFound.pageTitle=Onion sitesi yüklenirken sorun çıktı
onionServices.descNotFound.header=Onion sitesi bulunamadı
-onionServices.descNotFound=Büyük ihtimalle onionsite çevrimdışı. onionsite yöneticisiyle bağlantı kurun.
+onionServices.descNotFound=Büyük ihtimalle onionsite çevrimdışı. onionsite yöneticisiyle iletişime geçin.
onionServices.descNotFound.longDescription=Ayrıntılar: %S — İstenen onion hizmet tanımlayıcı hashring'te bulunamadı ve bu nedenle hizmet istemci tarafından erişilebilir değil.
# Tor SOCKS error 0xF1:
onionServices.descInvalid.pageTitle=Onion sitesi yüklenirken sorun çıktı
@@ -81,33 +81,33 @@ onionServices.descInvalid.longDescription=Ayrıntılar: %S — İstenen onion hi
# Tor SOCKS error 0xF2:
onionServices.introFailed.pageTitle=Onion sitesi yüklenirken sorun çıktı
onionServices.introFailed.header=Onionsite Bağlantısı Kesildi
-onionServices.introFailed=Büyük ihtimalle onionsite çevrimdışı. onionsite yöneticisiyle bağlantı kurun.
+onionServices.introFailed=Büyük ihtimalle onionsite çevrimdışı. onionsite yöneticisiyle iletişime geçin.
onionServices.introFailed.longDescription=Ayrıntılar: %S — Tanıtım başarısız oldu, bunun anlamı tanımlayıcı bulunsa da hizmetin bu tanıtım noktasına artık bağlı olmadığıdır. Yüksek ihtimalle ya hizmet tanımlayıcısını değiştirdi ya da şu an çalışmıyor.
# Tor SOCKS error 0xF3:
onionServices.rendezvousFailed.pageTitle=Onion sitesi yüklenirken sorun çıktı
onionServices.rendezvousFailed.header=Onionsiteye Bağlanılamadı
onionServices.rendezvousFailed=Onionsite meşgul veya Tor ağı aşırı yüklenmiş. Daha sonra tekrar deneyin.
-onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
+onionServices.rendezvousFailed.longDescription=Ayrıntılar: %S — İstemci hizmetle buluşmakta başarısız oldu, bu istemcinin bağlantıyı tamamlandıramadığı anlamına gelir.
# Tor SOCKS error 0xF4:
-onionServices.clientAuthMissing.pageTitle=Authorization Required
-onionServices.clientAuthMissing.header=Onionsite Requires Authentication
-onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
-onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
+onionServices.clientAuthMissing.pageTitle=Yetkilendirme Gerekli
+onionServices.clientAuthMissing.header=Onionsite Yetkilendirme Gerektiriyor
+onionServices.clientAuthMissing=Onionsiteye erişmek için bir anahtar gerekiyor ama hiç bir anahtar sağlanmadı.
+onionServices.clientAuthMissing.longDescription=Ayrıntılar: %S — İstemci istenen onion hizmet tanımlayıcıyı indirdi ancak içeriğin şifresini çözmekte başarısız oldu, çünkü istemcinin yetkilendirme bilgisi eksik.
# Tor SOCKS error 0xF5:
-onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
-onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
-onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
-onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
+onionServices.clientAuthIncorrect.pageTitle=Yetkilendirme Başarısız Oldu
+onionServices.clientAuthIncorrect.header=Onionsite Yetkilendirmesi Başarısız Oldu
+onionServices.clientAuthIncorrect=Sağlanan anahtar ya hatalı ya da iptal edilmiş. Onionsite yöneticisiyle iletişime geçin.
+onionServices.clientAuthIncorrect.longDescription=Ayrıntılar: %S — İstemci istenen onion hizmet tanımlayıcısını indirebildi ancak sağlanan yetkilendirme bilgisiyle içeriğinin şifresini çözmekte başarısız oldu. Bu erişimin kaldırıldığı anlamına gelebilir.
# Tor SOCKS error 0xF6:
onionServices.badAddress.pageTitle=Onion sitesi yüklenirken sorun çıktı
-onionServices.badAddress.header=Invalid Onionsite Address
-onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
-onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
+onionServices.badAddress.header=Geçersiz Onionsite Adresi
+onionServices.badAddress=Sağlanan onionsite adresi geçersizdir. Lütfen adresi doğru girip girmediğinizi kontrol edin.
+onionServices.badAddress.longDescription=Ayrıntılar: %S — Sağlanan .onion adresi geçersizdir. Bu hata şu nedenlerden biri dolayısıyla oluşuyor: adres sağlaması eşleşmiyor, ed25519 açık anahtarı geçersiz veya kodlama geçersiz.
# Tor SOCKS error 0xF7:
onionServices.introTimedOut.pageTitle=Onion sitesi yüklenirken sorun çıktı
-onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
-onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
-onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
+onionServices.introTimedOut.header=Onionsite Devre Oluşturma Zaman Aşımı
+onionServices.introTimedOut=Onionsteye bağlanma başarısız oldu, muhtemel nedeni zayıf ağ bağlantısı.
+onionServices.introTimedOut.longDescription=Ayrıntılar: %S — İstenen onion hizmetiyle bağlantı, buluşma devresini kurmaya çalışırken zaman aşımına uğradı.
#
# LOCALIZATION NOTE: %S will be replaced with the .onion address.
onionServices.authPrompt.description=%S kişisel anahtarınıza gerek duyuyor
1
0
[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation@torproject.org 15 Apr '20
by translation@torproject.org 15 Apr '20
15 Apr '20
commit c587a6b7d22aa6ebc26627f4e47b1b2aaf4a1abc
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 15 16:15:16 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
tr/LC_MESSAGES/bridgedb.po | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 3e9b641a48..fddeca0d8e 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -28,7 +28,7 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
"POT-Creation-Date: 2020-04-07 10:14-0700\n"
-"PO-Revision-Date: 2020-04-15 15:44+0000\n"
+"PO-Revision-Date: 2020-04-15 16:14+0000\n"
"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgstr "E-posta sınırınızı aştınız. Lütfen yavaşlayın! E-postalar ara
msgid ""
"If these bridges are not what you need, reply to this email with one of\n"
"the following commands in the message body:"
-msgstr ""
+msgstr "Eğer bu köprüler istedikleriniz değilse, bu e-postayı şu komutlardan birini ileti gövdesine yazarak yanıtlayın:"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -305,7 +305,7 @@ msgstr "Köprüleri Al!"
#: bridgedb/strings.py:116
msgid "Bridge distribution mechanisms"
-msgstr ""
+msgstr "Köprü dağıtım düzenekleri"
#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
#: bridgedb/strings.py:118
@@ -316,7 +316,7 @@ msgid ""
"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
"mechanisms is."
-msgstr ""
+msgstr "BridgeDB köprüleri dağıtmak için dört farklı yöntem kullanır: \"HTTPS\", \"Moat\",\n\"E-posta\" ve \"Rezerve\". BridgeDB üzerinden dağıtılmayan köprüler uydurma\nyöntem olan \"Hiçbiri\" kullanırlar. Aşağıdaki liste kısaca bu yöntemlerin nasıl\nçalıştığını ve her bir yöntemin ne kadar gözde olduğunu görselleştiren\n%sBridgeDB ölçütlerimizi%saçıklıyor."
#: bridgedb/strings.py:124
#, python-format
@@ -324,7 +324,7 @@ msgid ""
"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
"solve the subsequent CAPTCHA."
-msgstr ""
+msgstr "\"HTTPS\" dağıtım yöntemi köprüleri bu websitesi üzerinden dağıtır. Köprüleri\nedinmek için %sbridges.torproject.org%s adresine gidin, tercih ettiğiniz seçenekleri seçin ve\nsonra gelen CAPTCHA'yı çözün."
#: bridgedb/strings.py:128
#, python-format
@@ -334,7 +334,7 @@ msgid ""
"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
"bridges."
-msgstr ""
+msgstr "\"Moat\" dağıtım yöntemi Tor Tarayıcının bir parçasıdır, kullanıcıların Tor Tarayıcı ayarları içerisinden köprü istemelerini sağlar. Köprüleri almak için, Tor\nTarayıcınızın %sTor ayarlarına%s gidin, \"yeni bir köprü iste\"ye tıklayın, sonr gelen\nCAPTCHA'yı çözün, böylece Tor Tarayıcı yeni köprüleri otomatik olarak ekleyecektir."
#: bridgedb/strings.py:134
#, python-format
@@ -346,7 +346,7 @@ msgstr ""
#: bridgedb/strings.py:138
msgid "Reserved"
-msgstr ""
+msgstr "Rezerve"
#: bridgedb/strings.py:139
#, python-format
@@ -416,18 +416,18 @@ msgstr ""
#: bridgedb/strings.py:182
msgid "(Request unobfuscated Tor bridges.)"
-msgstr ""
+msgstr "(gizlenmemiş Tor köprüleri iste)"
#: bridgedb/strings.py:183
msgid "(Request IPv6 bridges.)"
-msgstr ""
+msgstr "(IPv6 köprüleri iste)"
#: bridgedb/strings.py:184
msgid "(Request obfs4 obfuscated bridges.)"
-msgstr ""
+msgstr "(obfs4 gizlenmiş köprüleri iste)"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
#: bridgedb/strings.py:187
msgid "(Get a copy of BridgeDB's public GnuPG key.)"
-msgstr ""
+msgstr "(BridgeDB'nin GnuPG açık anahtarının bir kopyasını al)"
1
0
[translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
by translation@torproject.org 15 Apr '20
by translation@torproject.org 15 Apr '20
15 Apr '20
commit c83431e8e6b617c2474ed4fa660d3eec2a7fd111
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 15 16:02:05 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=support-portal_comp…
---
contents.pot | 152 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 122 insertions(+), 30 deletions(-)
diff --git a/contents.pot b/contents.pot
index f99a5eb5dd..a12dd5c9a7 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: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+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"
@@ -359,12 +359,12 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -787,6 +787,39 @@ msgstr ""
" [bridge](../bridge). When using a bridge, the bridge takes the place of the"
" guard."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr "hamburger menu"
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1219,12 +1252,21 @@ msgstr "onion address"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1309,11 +1351,13 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3356,6 +3400,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3549,6 +3602,19 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3566,6 +3632,17 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Verifying the signature"
@@ -3586,10 +3663,14 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3603,11 +3684,11 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3620,10 +3701,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3651,6 +3732,17 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Workaround (using a public key)"
@@ -3727,15 +3819,15 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
@@ -8632,15 +8724,15 @@ msgid ""
msgstr ""
"Once more bridges report these data, the numbers will become more accurate."
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
"What are these red and blue dots indicating possible censorship events?"
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
@@ -8650,8 +8742,8 @@ msgstr ""
"user numbers over a series of days and predicts the user number in the next "
"days."
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
@@ -8659,8 +8751,8 @@ msgstr ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -12286,7 +12378,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor Project | Support"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Topics"
1
0
[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation@torproject.org 15 Apr '20
by translation@torproject.org 15 Apr '20
15 Apr '20
commit 4b5a9c7b357db5256f5819008d18cb47b93cd73b
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 15 16:01:47 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
contents+ar.po | 125 ++++++++++++++++++++++++++++++++------------
contents+bn.po | 115 ++++++++++++++++++++++++++++++++---------
contents+ca.po | 115 ++++++++++++++++++++++++++++++++---------
contents+cs.po | 111 ++++++++++++++++++++++++++++++++-------
contents+da.po | 111 ++++++++++++++++++++++++++++++++-------
contents+de.po | 132 ++++++++++++++++++++++++++++++++---------------
contents+el.po | 115 ++++++++++++++++++++++++++++++++---------
contents+es-AR.po | 111 ++++++++++++++++++++++++++++++++-------
contents+es.po | 133 ++++++++++++++++++++++++++++++++---------------
contents+fa.po | 132 ++++++++++++++++++++++++++++++++---------------
contents+fo.po | 111 ++++++++++++++++++++++++++++++++-------
contents+fr.po | 119 ++++++++++++++++++++++++++++++++----------
contents+ga.po | 111 ++++++++++++++++++++++++++++++++-------
contents+he.po | 111 ++++++++++++++++++++++++++++++++-------
contents+hr.po | 120 +++++++++++++++++++++++++++++++-----------
contents+hu.po | 111 ++++++++++++++++++++++++++++++++-------
contents+id.po | 115 ++++++++++++++++++++++++++++++++---------
contents+is.po | 115 ++++++++++++++++++++++++++++++++---------
contents+it.po | 132 ++++++++++++++++++++++++++++++++---------------
contents+ja.po | 111 ++++++++++++++++++++++++++++++++-------
contents+ka.po | 132 ++++++++++++++++++++++++++++++++---------------
contents+ko.po | 115 ++++++++++++++++++++++++++++++++---------
contents+lt.po | 115 ++++++++++++++++++++++++++++++++---------
contents+ml.po | 129 +++++++++++++++++++++++++++++++--------------
contents+ms.po | 111 ++++++++++++++++++++++++++++++++-------
contents+nb.po | 111 ++++++++++++++++++++++++++++++++-------
contents+nl.po | 111 ++++++++++++++++++++++++++++++++-------
contents+pl.po | 111 ++++++++++++++++++++++++++++++++-------
contents+pt-BR.po | 131 ++++++++++++++++++++++++++++++++--------------
contents+pt-PT.po | 131 ++++++++++++++++++++++++++++++++--------------
contents+ro.po | 132 ++++++++++++++++++++++++++++++++---------------
contents+ru.po | 129 +++++++++++++++++++++++++++++++--------------
contents+sq.po | 111 ++++++++++++++++++++++++++++++++-------
contents+sr.po | 111 ++++++++++++++++++++++++++++++++-------
contents+sv.po | 113 ++++++++++++++++++++++++++++++++--------
contents+th.po | 111 ++++++++++++++++++++++++++++++++-------
contents+tr.po | 133 ++++++++++++++++++++++++++++++++---------------
contents+uk.po | 111 ++++++++++++++++++++++++++++++++-------
contents+zh-CN.po | 123 ++++++++++++++++++++++++++++++++-----------
contents+zh-TW.po | 111 ++++++++++++++++++++++++++++++++-------
contents.pot | 152 +++++++++++++++++++++++++++++++++++++++++++-----------
41 files changed, 3764 insertions(+), 1126 deletions(-)
diff --git a/contents+ar.po b/contents+ar.po
index bb74044cc9..864e07ca4a 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Ahmed IB <mee.tbhole(a)gmail.com>, 2020\n"
"Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
@@ -361,14 +361,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"مستخدموا تور عادة ما يُقدم لهم اختبارات تحقق لأن عُقد تور تقوم بإرسال الكثير"
-" من الطلبات بحيث يصعب على المواقع أحيانًا تحديد ما إذا كانت هذه الطلبات "
-"مرسلة بواسطة بشر أم روبوتات."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -725,6 +722,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1067,10 +1093,17 @@ msgstr "عنوان البصلة"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1142,8 +1175,9 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2931,6 +2965,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3120,6 +3161,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3136,6 +3186,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### التحقق من التوقيع"
@@ -3155,9 +3213,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"الأمثلة فى الأسفل تفترض أنك حمّلت هذين الملفين لمجلد \"Downloads\" الخاص بك."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3171,11 +3230,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3187,10 +3244,8 @@ msgstr "### لمستخدمي GNU/Linux (غيّر 64 إلى 32 اذا كان عن
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3218,6 +3273,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "### الحل البديل (باستخدام مفتاح عام)"
@@ -3291,16 +3354,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"متصفح تور 9 يأتى بدفاع ضد أخذ البصمة فى هذه السيناريوهات أيضا فيما يسمى "
-"[بالأشرطة الأفقية "
-"Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming))، هى "
-"تقنية طوّرتها Mozilla وتم [تقديمها مبكرا هذه "
-"السنة](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -7528,29 +7585,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10579,7 +10636,7 @@ msgstr "دافع عن نفسك ضد التتبع والرصد . تحايل عل
msgid "Tor Project | Support"
msgstr "مشروع تور | المساعدة"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "الموضوعات"
diff --git a/contents+bn.po b/contents+bn.po
index f5d6235784..d8ff8f73c8 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -331,7 +331,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -666,6 +666,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1006,10 +1035,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1083,8 +1119,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2748,6 +2785,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2913,6 +2957,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2926,6 +2979,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2942,7 +3003,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2957,11 +3020,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -2973,10 +3034,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3002,6 +3061,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3065,8 +3132,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7308,29 +7375,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10428,7 +10495,7 @@ msgstr "নিজেকে ট্র্যাকিং এবং নজরদা
msgid "Tor Project | Support"
msgstr "টর প্রকল্প | সহায়ক"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "বিষয়শ্রেণী"
diff --git a/contents+ca.po b/contents+ca.po
index ade48acc2d..d5828ac629 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Assumpta, 2020\n"
"Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -332,7 +332,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -669,6 +669,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1009,10 +1038,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1084,8 +1120,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2837,6 +2874,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3002,6 +3046,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3015,6 +3068,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -3031,7 +3092,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3046,11 +3109,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3062,10 +3123,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3091,6 +3150,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3154,8 +3221,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7434,29 +7501,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10571,7 +10638,7 @@ msgstr "Defenseu-vos contra el seguiment i la vigilància. Eludiu la censura."
msgid "Tor Project | Support"
msgstr "Projecte Tor | Suport"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Temes"
diff --git a/contents+cs.po b/contents+cs.po
index 8b9c836bd2..7ad18de4e8 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Plarome, 2020\n"
"Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
@@ -331,7 +331,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -666,6 +666,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1006,10 +1035,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1081,8 +1117,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2743,6 +2780,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2908,6 +2952,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2921,6 +2974,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2937,7 +2998,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2950,8 +3013,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2964,7 +3027,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2993,6 +3056,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3056,8 +3127,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7029,29 +7100,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10052,7 +10123,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor Project | Podpora"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Témata"
diff --git a/contents+da.po b/contents+da.po
index 672e04817f..4110d6848b 100644
--- a/contents+da.po
+++ b/contents+da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: erinm, 2020\n"
"Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n"
@@ -327,7 +327,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -662,6 +662,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1002,10 +1031,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1077,8 +1113,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2736,6 +2773,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2900,6 +2944,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2913,6 +2966,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2929,7 +2990,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2942,8 +3005,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2956,7 +3019,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2983,6 +3046,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3043,8 +3114,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6946,29 +7017,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -9966,7 +10037,7 @@ msgstr "Beskyt dig selv mod sporing og overvågning. Omgå censur."
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Emner"
diff --git a/contents+de.po b/contents+de.po
index 42aadbe852..9c85e48256 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -379,15 +379,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"[Tor](../tor-tor-network-core-tor) Benutzer werden oft mit Captchas "
-"versorgt, weil Tor[relays](../relay) so viele Anfragen stellen, dass es "
-"Webseiten manchmal schwer fällt festzustellen, ob diese Anfragen von "
-"Menschen oder von Bots kommen oder nicht."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -793,6 +789,35 @@ msgstr ""
"denn, man verwendet eine [Brücke](../Brücke). Bei der Verwendung einer "
"Brücke tritt die Brücke an die Stelle der Guard."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1225,12 +1250,16 @@ msgstr "onion adresse"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Ein standardisierter Internet-Domainname, der von Onion-Diensten verwendet "
-"wird und mit .onion endet und als "
-"[selbstauthentifizierend](../selbstauthentifizierend) konzipiert ist."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1314,11 +1343,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo ist ein webbasiertes Protokoll, um mehr über die aktuell laufenden "
-"[Tor-Relais](../relay) und [bridges](../bridge) zu erfahren."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3314,6 +3342,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3508,6 +3543,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3525,6 +3569,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Überprüft die Signatur"
@@ -3545,10 +3597,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Die untenstehenden Beispiele gehen davon aus, dass du die Dateien im "
-"\"Downloads\"-Ordner gespeichert hast."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3562,11 +3614,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3579,10 +3629,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3610,6 +3658,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "### Umgehung (einen öffentlichen Schlüssel benutzen)"
@@ -3689,16 +3745,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"Tor Browser 9 bringt einen Wiedererkennungsschutz gegen diese Szenarien mit,"
-" die sich "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)) nennen,"
-" eine Technik welche von Mozilla entwickelt und [Anfang diesen Jahres "
-"vorgestellt wurde](https://www.zdnet.com/article/firefox-to-add-tor-browser-"
-"anti-fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8573,29 +8623,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11756,7 +11806,7 @@ msgstr "Verteidige dich gegen Verfolgung und Überwachung. Umgehe die Zensur."
msgid "Tor Project | Support"
msgstr "Tor Project | Hilfe"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Themen"
diff --git a/contents+el.po b/contents+el.po
index fe9559bd9a..b673014dc3 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
@@ -334,7 +334,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -669,6 +669,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1009,10 +1038,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1084,8 +1120,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2748,6 +2785,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2915,6 +2959,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2930,6 +2983,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2946,7 +3007,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2961,11 +3024,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -2977,10 +3038,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3008,6 +3067,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3071,8 +3138,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7307,29 +7374,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10424,7 +10491,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor Project | Υποστήριξη"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Θέματα"
diff --git a/contents+es-AR.po b/contents+es-AR.po
index 7878433ff3..153e3bc547 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: erinm, 2020\n"
"Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n"
@@ -337,7 +337,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -679,6 +679,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1030,10 +1059,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1107,8 +1143,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2795,6 +2832,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2959,6 +3003,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2972,6 +3025,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2988,7 +3049,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3001,8 +3064,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3015,7 +3078,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3042,6 +3105,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3102,8 +3173,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7322,29 +7393,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10419,7 +10490,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Proyecto Tor | Soporte"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Tópicos"
diff --git a/contents+es.po b/contents+es.po
index 98f23a002c..a4a66b6dd7 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -376,15 +376,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Los usuarios de [Tor](../tor-tor-network-core-tor) a menudo reciben captchas"
-" porque los [repetidores](../relay) de Tor hacen tantas peticiones que a "
-"veces los sitios web tienen dificultades para determinar si esas peticiones "
-"provienen o no de humanos o de bots."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -811,6 +807,35 @@ msgstr ""
"menos que se utilice un [puente](../bridge) Cuando se utiliza un puente, el "
"puente toma el lugar de guard."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1248,12 +1273,16 @@ msgstr "dirección onion"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Un nombre de dominio de Internet estandarizado utilizado por los servicios "
-"cebolla que termina en .onion y está diseñado para ser [auto-autentificable"
-"](../self-authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1337,12 +1366,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo es una aplicación web para analizar en grupo los [repetidores de "
-"tor](../relay) y los [repetidores puente](../bridge) que hay en este "
-"momento."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3337,6 +3364,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3529,6 +3563,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3546,6 +3589,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Comprobar la firma"
@@ -3565,10 +3616,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Los siguientes ejemplos asumen que has descargado estos dos archivos en la "
-"carpeta \"Descargas\"."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3582,11 +3633,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3600,10 +3649,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3631,6 +3678,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Método alternativo (usando una clave pública)"
@@ -3709,16 +3764,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"El Navegador Tor en su versión 9 viene con una defensa contra la "
-"identificación unívoca en estos casos, llamada "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), una "
-"técnica desarrollada por Mozilla y [presentada este "
-"año](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8734,29 +8783,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -12069,7 +12118,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor Project | Ayuda"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Temas"
diff --git a/contents+fa.po b/contents+fa.po
index 06351fd3ed..f20778ac8c 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
@@ -376,15 +376,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"کاربران [تور](../tor-tor-network-core-tor) اغلب اوقات کپچا دریافت می کنند "
-"چون [بازپخش ها](../relay)ی تور درخواست های زیادی می کنند بنابراین گاهی اوقات"
-" سایت ها برای شناسایی اینکه این درخواست ها از جانب انسان می آید یا ربات دچار"
-" مشکل هستند."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -802,6 +798,35 @@ msgstr ""
"[پل](../bridge) استفاده کنید. در هنگام استفاده از یک پل، پل جای محافظ را می "
"گیرد."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1229,12 +1254,16 @@ msgstr "نشانی پیاز"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"نام یک دامنه اینترنتی استاندارد استفاده شده توسط سرویس های پیازی که در "
-"onion. پایان می یابد و طوری طراحی شده تا [اصالت خود را بسنجد](../self-"
-"authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1319,11 +1348,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo یک پروتکل مبتنی بر وب می باشد تا درباره [بازپخش های تور](../relay) "
-"یا [پل ها](../bridge)ی مورد استفاده یاد بگیرید."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3284,6 +3312,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3477,6 +3512,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3494,6 +3538,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### در حال تایید امضا"
@@ -3513,10 +3565,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"نمونه های زیر فرض می کنند که شما این دو فایل را در پوشه \"Downloads\" دانلود"
-" کرده اید."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3530,11 +3582,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3548,10 +3598,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3579,6 +3627,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### روش کار (استفاده از یک کلید عمومی)"
@@ -3655,16 +3711,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"مرورگر Tor نسخه ۹ با این مکانیسم دفاعی در برابر انگشت نگاری برای چنین سناریو"
-" هایی می آید که به آن "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)) گفته می"
-" شود که یک روش است که توسط موزیلا توسعه داده شده و [در اوایل سال از آن "
-"رونمایی شد](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8559,29 +8609,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -12125,7 +12175,7 @@ msgstr "از خود در برابر ردیابی و نظارت دفاع کنید
msgid "Tor Project | Support"
msgstr "پروژه تور | پشتیبانی کردن"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "موضوعات"
diff --git a/contents+fo.po b/contents+fo.po
index 19dce8459a..1381878d32 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: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: erinm, 2020\n"
"Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)\n"
@@ -327,7 +327,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -662,6 +662,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1002,10 +1031,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1077,8 +1113,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2739,6 +2776,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2903,6 +2947,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2916,6 +2969,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2932,7 +2993,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2945,8 +3008,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2959,7 +3022,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2986,6 +3049,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3046,8 +3117,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6996,29 +7067,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10010,7 +10081,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor Project | Hjálp"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr ""
diff --git a/contents+fr.po b/contents+fr.po
index 9d36bdb9ba..bf571d226c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: AO <ao(a)localizationlab.org>, 2020\n"
"Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
@@ -377,15 +377,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Les utilisateurs de [Tor](../tor-tor-network-core-tor) se voient souvent "
-"servir des captchas, car les [relais](../relay) Tor sont la source de "
-"tellement de requêtes que les sites Web ont parfois de la difficulté à "
-"déterminer si ces requêtes proviennent d’êtres humains ou de robots."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -816,6 +812,35 @@ msgstr ""
" vous utilisiez un [pont](../bridge). Si un pont est utilisé, le pont prend "
"la place de la garde."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1261,11 +1286,16 @@ msgstr "adresse onion"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Un nom de domaine Internet normalisé utilisé par les services onion, qui se "
-"termine par .onion et conçu pour s’[autoauthentifier](#self-authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1347,8 +1377,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -3210,6 +3241,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3405,6 +3443,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expire : 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3422,6 +3469,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Vérifier la signature"
@@ -3443,10 +3498,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Les exemples ci-dessous supposent que vous avez téléchargé ces deux fichiers"
-" dans votre dossier « Téléchargements »."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3458,8 +3513,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3474,7 +3529,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3504,6 +3559,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3569,8 +3632,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7926,29 +7989,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11075,7 +11138,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Projet Tor | Assistance"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Sujets"
diff --git a/contents+ga.po b/contents+ga.po
index 093c1f97cb..2cb3221015 100644
--- a/contents+ga.po
+++ b/contents+ga.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n"
@@ -328,7 +328,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -663,6 +663,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1003,10 +1032,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1078,8 +1114,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2740,6 +2777,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2904,6 +2948,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2917,6 +2970,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2933,7 +2994,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2946,8 +3009,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2960,7 +3023,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2987,6 +3050,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3047,8 +3118,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7280,29 +7351,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10378,7 +10449,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tionscadal Tor | Tacaíocht"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Topaicí"
diff --git a/contents+he.po b/contents+he.po
index d11ffba754..c9587a8356 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: ION, 2020\n"
"Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
@@ -328,7 +328,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -663,6 +663,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1003,10 +1032,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1078,8 +1114,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2737,6 +2774,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2901,6 +2945,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2914,6 +2967,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2930,7 +2991,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2943,8 +3006,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2957,7 +3020,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2984,6 +3047,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3044,8 +3115,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6974,29 +7045,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -9993,7 +10064,7 @@ msgstr "הגן על עצמך מפני מעקב וציתות. עקיפת צנזו
msgid "Tor Project | Support"
msgstr "מיזם Tor | תמיכה"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "נושאים"
diff --git a/contents+hr.po b/contents+hr.po
index 6fd5cf7011..2fb0dee3c5 100644
--- a/contents+hr.po
+++ b/contents+hr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
@@ -366,15 +366,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Korisnici [Tora](../tor-tor-network-core-tor) često se poslužuju testom "
-"captcha, jer Tor [releji](../relay) postavljaju toliko zahtjeva, da web "
-"mjesta ponekad ne mogu lako utvrditi, radi li se o zahtjevima ljudi ili "
-"botova."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -791,6 +787,35 @@ msgstr ""
"Prvi [relej](../relay) u [Tor lancu](../circuit), osim ako koristiš "
"[most](../bridge). Kad koristiš most, most zauzima mjesto prilaza."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1221,12 +1246,16 @@ msgstr "onion adresa"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Standardizirano ime internetske domene koje koriste onion usluge, koje "
-"završavaju s .onion i zamišljeno je da se [samoautentificira](../self-"
-"authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1312,11 +1341,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo je internetski protokol za saznavanje trenutačno pokrenutih [Tor "
-"releja](../relay) i [mostova](../bridge)."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3143,6 +3171,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3307,6 +3342,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3320,6 +3364,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -3336,7 +3388,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3349,8 +3403,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3363,7 +3417,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3390,6 +3444,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3450,8 +3512,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7376,29 +7438,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10418,7 +10480,7 @@ msgstr "Zaštiti se od praćenja i nadzora. Zaobiđi cenzure."
msgid "Tor Project | Support"
msgstr "Tor Project i podrška"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Teme"
diff --git a/contents+hu.po b/contents+hu.po
index 549ccc6626..a570a2fea5 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: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2020\n"
"Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
@@ -328,7 +328,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -663,6 +663,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1003,10 +1032,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1078,8 +1114,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2749,6 +2786,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2913,6 +2957,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2926,6 +2979,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2942,7 +3003,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2955,8 +3018,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2969,7 +3032,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2996,6 +3059,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3056,8 +3127,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7033,29 +7104,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10043,7 +10114,7 @@ msgstr "Védd meg magad a követés és felügyelet ellen. Kerüld meg a cenzúr
msgid "Tor Project | Support"
msgstr "Tor Project | Támogatás"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Témák"
diff --git a/contents+id.po b/contents+id.po
index ee49238fd3..07125e387f 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
@@ -333,7 +333,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -668,6 +668,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1008,10 +1037,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1083,8 +1119,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2784,6 +2821,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2949,6 +2993,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2962,6 +3015,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2978,7 +3039,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2993,11 +3056,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3009,10 +3070,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3040,6 +3099,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3103,8 +3170,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7385,29 +7452,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10512,7 +10579,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor Project | Dukungan"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Topik-topik"
diff --git a/contents+is.po b/contents+is.po
index b7ad914655..7a2be3c38b 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: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>, 2020\n"
"Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
@@ -357,7 +357,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -734,6 +734,35 @@ msgstr ""
"nota [brú](../bridge). Þegar brú er notuð, kemur hún í stað dyravarðar "
"(varðendurvarpa - guard)."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1147,10 +1176,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1231,8 +1267,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -3021,6 +3058,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3200,6 +3244,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3215,6 +3268,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Sannreyna undirritunina"
@@ -3231,7 +3292,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3246,11 +3309,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3264,10 +3325,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3295,6 +3354,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3358,8 +3425,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7626,29 +7693,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10762,7 +10829,7 @@ msgstr "Verðu þig fyrir eftirliti og njósnum. Farðu framhjá ritskoðun."
msgid "Tor Project | Support"
msgstr "Tor-verkefnið | Aðstoð"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Umfjöllunarefni"
diff --git a/contents+it.po b/contents+it.po
index 3dc240e0c4..12c2c91108 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Toque Blanche <toque_blanche(a)elude.in>, 2020\n"
"Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
@@ -386,15 +386,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Gli utenti [Tor](../tor-tor-network-core-tor) ricevono spesso captcha perché"
-" i [relè](../relay) Tor fanno così tante richieste che a volte il sito web "
-"ha difficoltà a stabilire se tali richieste provengono da utenti umani o "
-"bot. "
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -804,6 +800,35 @@ msgstr ""
" usi un [bridge](../bridge). Quando si usa un bridge, esso prende il posto "
"della guardia."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1242,12 +1267,16 @@ msgstr "indirizzo onion"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Un dominio internet standarizzato utilizzato dai servizi onion che finisce "
-"con .onion ed è progettato per l'[autenticazione personale](../self-"
-"authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1335,11 +1364,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo è un protocollo web-based per conoscere i [relay di Tor](../relay) e"
-" i [bridge](../bridges) attualmente in funzione."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3298,6 +3326,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3490,6 +3525,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3507,6 +3551,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Verificare la firma"
@@ -3525,10 +3577,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"L'esempio presume che hai scaricato due file dalla tua cartella "
-"\"Downloads\""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3542,11 +3594,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3559,10 +3609,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3590,6 +3638,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Soluzione alternativa (utilizzando una chiave pubblica)"
@@ -3668,16 +3724,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"Tor Browser 9 viene fornito con una difesa anche per questi scenari, che è "
-"chiamata "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), una "
-"tecnica sviluppata da Mozilla e [presentata all'inizio di "
-"quest'anno](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8651,29 +8701,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11945,7 +11995,7 @@ msgstr "Difenditi contro tracciamento e sorveglianza. Evita la censura."
msgid "Tor Project | Support"
msgstr "Tor Project | Supporto"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Argomenti"
diff --git a/contents+ja.po b/contents+ja.po
index 08a6b1b4c2..02efd43528 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: ue zaeco, 2020\n"
"Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
@@ -337,7 +337,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -672,6 +672,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1012,10 +1041,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1087,8 +1123,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2748,6 +2785,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2914,6 +2958,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2927,6 +2980,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### 署名を検証する"
@@ -2943,7 +3004,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2956,8 +3019,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2970,7 +3033,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2997,6 +3060,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3057,8 +3128,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6970,29 +7041,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -9989,7 +10060,7 @@ msgstr "追跡と監視から身を守る。検閲を回避する。"
msgid "Tor Project | Support"
msgstr "Torプロジェクトをサポート"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "話題"
diff --git a/contents+ka.po b/contents+ka.po
index 2148e41bcc..1c1eb12662 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: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Georgianization, 2020\n"
"Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
@@ -374,15 +374,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"[Tor](../tor-tor-network-core-tor)-ის მომხმარებლებს, ხშირად უწევთ ამ სახის "
-"შემოწმებების გავლა, ვინაიდან Tor-ის [გადამცემები](../relay) ზედმეტად ბევრ "
-"მოთხოვნას აგზავნის, შედეგად საიტებს უჭირთ განსაზღვრა, ეს მოთხოვნები "
-"ადამიანების მიერ არის გამოგზავნილი, თუ ავტომატური პროგრამების."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -794,6 +790,35 @@ msgstr ""
"შემთხვევებისა, როცა [ხიდი](../bridge) გამოიყენება. ხიდით სარგებლობისას, "
"თავად გადამცემი ხიდი იკავებს მცველის ადგილს."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1223,12 +1248,16 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Onion-მომსახურებებისთვის განსაზღვრული ინტერნეტმისამართების სახე, რომელთა "
-"დაბოლოებაცაა .onion და განკუთვნილია [თვითდამოწმებისთვის](../self-"
-"authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1313,11 +1342,10 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo არის ინტერნეტზე დაფუძნებული ოქმი, მიმდინარე დროში გაშვებული [Tor-"
-"გადამცემებისა](../relay) და [ხიდების](../bridge) მონაცემების სანახავად."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3298,6 +3326,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3487,6 +3522,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3504,6 +3548,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### ხელმოწერის დამოწმება (signature)"
@@ -3523,10 +3575,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"ქვემოთ მოცემული მაგალითების მიხედვით, ჩამოტვირთული ფაილები, უნდა იყოს თქვენს"
-" „Downloads“ საქაღალდეში."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3540,11 +3592,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3558,10 +3608,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3589,6 +3637,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### დროებითი გამოსავალი (საჯარო გასაღებით)"
@@ -3665,16 +3721,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"Tor-ბრაუზერი 9 აღჭურვილია მომხმარებლის ამოცნობისგან დაცვით, სხვადასხვა "
-"პირობებში, რასაც ეწოდება შიგთავსის [ეკრანზე "
-"მორგება](https://en.wikipedia.org/wiki/Letterboxing_(filming)), ტექნოლოგია, "
-"რომელიც შეიმუშავა Mozilla-მ და [წარმოადგინა წლის "
-"დასაწყისში](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8638,29 +8688,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11951,7 +12001,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor-პროექტი | მხარდაჭერაა"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "საკითხები"
diff --git a/contents+ko.po b/contents+ko.po
index 52916d0ca2..20373fc7a3 100644
--- a/contents+ko.po
+++ b/contents+ko.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
@@ -330,7 +330,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -665,6 +665,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1005,10 +1034,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1080,8 +1116,9 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2739,6 +2776,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2906,6 +2950,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2921,6 +2974,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2937,7 +2998,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2952,11 +3015,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -2968,10 +3029,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -2999,6 +3058,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3062,8 +3129,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6985,29 +7052,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10013,7 +10080,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor 프로젝트 | 지원"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "주제"
diff --git a/contents+lt.po b/contents+lt.po
index 744cdf8eac..dbcd3aafc2 100644
--- a/contents+lt.po
+++ b/contents+lt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Moo, 2020\n"
"Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
@@ -329,7 +329,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -664,6 +664,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1004,10 +1033,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1079,8 +1115,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2751,6 +2788,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2920,6 +2964,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2935,6 +2988,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Parašo patikrinimas"
@@ -2951,10 +3012,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Žemiau esančiuose pavyzdžiuose yra numanoma, kad šiuos du failus "
-"atsisiuntėte į \"Atsiuntimų\" aplanką."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -2968,11 +3029,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Atsiuntimai/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -2984,7 +3043,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3011,6 +3070,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3074,8 +3141,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6991,29 +7058,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10022,7 +10089,7 @@ msgstr "Apsaugokite save nuo sekimo ir stebėjimo. Apeikite cenzūrą."
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Temos"
diff --git a/contents+ml.po b/contents+ml.po
index 7a44bc9f49..2e2186cf60 100644
--- a/contents+ml.po
+++ b/contents+ml.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)\n"
@@ -366,15 +366,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"[ടോർ](../tor-tor-network-core-tor) ഉപയോക്താക്കൾക്ക് പലപ്പോഴും ക്യാപ്ചകൾ "
-"നൽകാറുണ്ട്, കാരണം ടോർ [റിലേകൾ](../relay) വളരെയധികം അഭ്യർത്ഥനകൾ നടത്തുന്നു, "
-"ചില സമയങ്ങളിൽ വെബ്സൈറ്റുകൾക്ക് ആ അഭ്യർത്ഥനകൾ ഉണ്ടോ ഇല്ലയോ എന്ന് "
-"നിർണ്ണയിക്കാൻ ബുദ്ധിമുട്ടാണ്. മനുഷ്യരിൽ നിന്നോ ബോട്ടുകളിൽ നിന്നോ വരുന്നു."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -767,6 +763,35 @@ msgstr ""
"[ബ്രിഡ്ജ്](../bridge) ഉപയോഗിക്കാത്ത പക്ഷം. ഒരു പാലം ഉപയോഗിക്കുമ്പോൾ, പാലം "
"ഗാർഡിന്റെ സ്ഥാനം പിടിക്കുന്നു."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1189,12 +1214,16 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-".ഓനിയനിൽ അവസാനിക്കുന്ന ഉള്ളി സേവനങ്ങൾ ഉപയോഗിക്കുന്ന ഒരു സ്റ്റാൻഡേർഡ് "
-"ഇന്റർനെറ്റ് ഡൊമെയ്ൻ നാമം [സ്വയം പ്രാമാണീകരണം](../self-authenticating) ആയി "
-"രൂപകൽപ്പന ചെയ്തിരിക്കുന്നു."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1276,8 +1305,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -3207,6 +3237,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3402,6 +3439,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3419,6 +3465,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### ഒപ്പ് പരിശോധിച്ചുറപ്പിക്കുന്നു"
@@ -3439,10 +3493,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"ചുവടെയുള്ള ഉദാഹരണങ്ങൾ നിങ്ങൾ ഈ രണ്ട് ഫയലുകളും നിങ്ങളുടെ \"ഡൗൺലോഡുകൾ\" "
-"ഫോൾഡറിലേക്ക് ഡൗൺലോഡ് ചെയ്തതായി അനുമാനിക്കുന്നു."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3456,11 +3510,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3474,10 +3526,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3505,6 +3555,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Workaround (ഒരു പൊതു കീ ഉപയോഗിച്ച്)"
@@ -3583,15 +3641,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"ടോർ ബ്രൗസർ 9, ഫിംഗർപ്രിന്റിംഗ് പ്രതിരോധമുള്ളതും , ഇതിനെ "
-"[ലെറ്റർബോക്സിംഗ്](https://en.wikipedia.org/wiki/Letterboxing_(filming)) "
-"എന്ന് വിളിക്കുന്നു, ഇത് മോസില്ല വികസിപ്പിച്ചെടുത്തതും [ഈ വർഷം ആദ്യം "
-"അവതരിപ്പിച്ചതും ](https://www.zdnet.com/article/firefox-to-add-tor-browser-"
-"anti-fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8648,29 +8701,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11973,7 +12026,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "ടോർ പ്രോജക്റ്റ് | പിന്തുണ"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "വിഷയങ്ങൾ"
diff --git a/contents+ms.po b/contents+ms.po
index a6f97efb0e..d020fe8f20 100644
--- a/contents+ms.po
+++ b/contents+ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: abuyop <abuyop(a)gmail.com>, 2020\n"
"Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n"
@@ -327,7 +327,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -662,6 +662,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1002,10 +1031,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1077,8 +1113,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2739,6 +2776,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2903,6 +2947,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2916,6 +2969,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2932,7 +2993,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2945,8 +3008,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2959,7 +3022,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2986,6 +3049,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3046,8 +3117,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6959,29 +7030,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10000,7 +10071,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Topik-Topik"
diff --git a/contents+nb.po b/contents+nb.po
index ac7a31d4a5..ad76f27219 100644
--- a/contents+nb.po
+++ b/contents+nb.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: erinm, 2020\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/otf/teams/1519/nb/)\n"
@@ -330,7 +330,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -665,6 +665,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1005,10 +1034,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1080,8 +1116,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2742,6 +2779,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2906,6 +2950,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2919,6 +2972,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2935,7 +2996,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2948,8 +3011,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2962,7 +3025,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2989,6 +3052,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3049,8 +3120,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6987,29 +7058,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10021,7 +10092,7 @@ msgstr "Forsvar deg mot sporing og overvåking. Omgå sensur."
msgid "Tor Project | Support"
msgstr "Tor Project | Brukerstøtte"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Emner"
diff --git a/contents+nl.po b/contents+nl.po
index 81cf5174db..1f4beb6bf0 100644
--- a/contents+nl.po
+++ b/contents+nl.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>, 2020\n"
"Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
@@ -333,7 +333,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -668,6 +668,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1008,10 +1037,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1083,8 +1119,9 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2745,6 +2782,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2909,6 +2953,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2922,6 +2975,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### De signatuur verifiëren"
@@ -2938,7 +2999,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2951,8 +3014,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2965,7 +3028,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2992,6 +3055,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3052,8 +3123,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7004,29 +7075,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10051,7 +10122,7 @@ msgstr "Verdedig jezelf tegen volgen en bewaken. Omzeil censuur."
msgid "Tor Project | Support"
msgstr "Tor Project | Ondersteuning"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Onderwerp"
diff --git a/contents+pl.po b/contents+pl.po
index 3b90f5a6d6..fd7505b562 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Waldemar Stoczkowski, 2020\n"
"Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
@@ -375,7 +375,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -754,6 +754,35 @@ msgstr ""
"używa się [mostu](../bridge). W przypadku korzystania z mostka, mostek "
"zajmuje miejsce strażnika."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1172,10 +1201,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1256,8 +1292,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -3039,6 +3076,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3216,6 +3260,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3229,6 +3282,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -3245,7 +3306,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3258,8 +3321,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3274,7 +3337,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3303,6 +3366,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3365,8 +3436,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7625,29 +7696,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10744,7 +10815,7 @@ msgstr "Obroń się przed śledzeniem i nadzorem. Omiń cenzurę."
msgid "Tor Project | Support"
msgstr "Tor Project | Pomoc"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Tematy"
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index c3a6f9b5f2..72b8ace6eb 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Igor Bk 13 <igorgcoleto(a)gmail.com>, 2020\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
@@ -383,15 +383,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"As pessoas que usam [Tor](../tor-/rede tor) frequentemente são confrontadas "
-"por CAPTCHAs porque os [relays](../relay) do Tor recebem tantas solicitações"
-" que, às vezes, os sítios web encontram dificuldades em determinar se essas "
-"solicitação vêm de humanos ou de robôs."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -797,6 +793,35 @@ msgstr ""
"utilizando uma [bridge](../bridge). Quando uma bridge está sendo utilizada, "
"a bridge toma o lugar do guardião. "
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1225,11 +1250,16 @@ msgstr "endereço Onion"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Um nome padronizado de domínio de internet que termina em .onion e foi "
-"desenvolvido para ser [auto-autenticável](../self-authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1315,11 +1345,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo é um protocolo baseado na web para informar sobre os [relays "
-"Tor](../relay) e [pontes](../bridge) atualmente em execução."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3322,6 +3351,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3515,6 +3551,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expira em: 12-09-2020]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3532,6 +3577,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Verificando a assinatura"
@@ -3552,10 +3605,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Os exemplos abaixo consideram que você tenha baixado estes dois arquivos "
-"para a pasta \"Downloads\"."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3569,11 +3622,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3587,10 +3638,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3618,6 +3667,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Alternativa (usando uma chave pública)"
@@ -3695,16 +3752,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
-msgstr ""
-"O Navegador Tor, na versão 9, também possui defesas de rastreio de impressão"
-" digital para estes casos, denominadas "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), uma "
-"técnica desenvolvida pelo Mozilla, [apresentada no começo de "
+"technique developed by Mozilla and [presented in "
"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
+msgstr ""
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8193,29 +8244,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11396,7 +11447,7 @@ msgstr "Defenda-se contra rastreamento e vigilância. Contorne a censura."
msgid "Tor Project | Support"
msgstr "Projeto Tor | Suporte"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Tópicos"
diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index 937b9b6afa..47360e5a1f 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>, 2020\n"
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
@@ -374,15 +374,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Os utilizadores do [Tor](../tor-/-tor-network/-core-tor) vêm muitas vezes "
-"estes captchas porque os [retransmissores](../relay) Tor fazem muitos "
-"pedidos, o que fazem com que os sites tenham dificuldade em determinar se "
-"esses pedidos são feitos por humanos ou por programas robô."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -809,6 +805,35 @@ msgstr ""
"ser que esteja a usar uma [ponte](../bridge). Quando se está a usar uma "
"ponte, esta toma o lugar do guarda."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1245,11 +1270,16 @@ msgstr "endereço onion"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Um nome padronizado de domínio de Internet que termina em .onion e foi "
-"desenvolvido para ser [auto-autenticável](../self-authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1335,11 +1365,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"O Onionoo é um protocolo à bae de web para conhecer [Tor relays](../relay) e"
-" [pontes](../bridge) que estejam em funcionamento."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3337,6 +3366,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3531,6 +3567,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expira: 12-09-2020]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3548,6 +3593,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Verificação da assinatura"
@@ -3568,10 +3621,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Os exemplos abaixo assumem que descarregou estes dois ficheiros para a sua "
-"pasta de Downloads."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3585,11 +3638,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3603,10 +3654,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3634,6 +3683,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Contornar (utilização de uma chave pública)"
@@ -3711,16 +3768,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"O Tor Browser 9 foi publicado com uma defesa para esses cenários, que é "
-"chamada de "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), uma "
-"técnica desenvolvida pela Mozilla e [apresentada "
-"recentemente](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8148,29 +8199,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11275,7 +11326,7 @@ msgstr "Defenda-se contra a monitorização e vigilância. Contorne a censura."
msgid "Tor Project | Support"
msgstr "Tor - Projeto | Apoio"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Tópicos"
diff --git a/contents+ro.po b/contents+ro.po
index e8858763d1..77dc33377c 100644
--- a/contents+ro.po
+++ b/contents+ro.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: eduard pintilie <eduard.pintilie(a)gmail.com>, 2020\n"
"Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
@@ -372,15 +372,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Utilizatorii [Tor](../tor-tor-network-core-tor) sunt des serviți cu captcha,"
-" deoarece [releele](../relay) Tor fac atât de multe solicitări, încât uneori"
-" site-urile web cu greu pot stabili dacă aceste solicitări provin sau nu de "
-"la oameni sau roboți."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -792,6 +788,35 @@ msgstr ""
"cazului în care se utilizează un [pod](../bridge). Când utilizați un pod, "
"podul ia locul gardianului."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1219,12 +1244,16 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Un nume de domeniu de internet standardizat folosit de serviciile Onion care"
-" se termină în .onion și este conceput pentru a fi [auto-autentificabil"
-"](../self-authenticating)."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1308,11 +1337,10 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo este un protocol bazat pe web pentru a afla despre rularea în "
-"prezent a [releelor Tor](../relay) și a [punților](../bridge)."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3284,6 +3312,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3476,6 +3511,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3493,6 +3537,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Verificarea semnăturii"
@@ -3513,10 +3565,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Exemplele de mai jos presupun că ați descărcat aceste două fișiere în "
-"folderul „Descărcări” - Downloads."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3530,11 +3582,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3548,10 +3598,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3579,6 +3627,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Mod de lucru (folosind o cheie publică)"
@@ -3657,16 +3713,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"Tor Browser 9 livrează o metodă de apărare a amprentării și pentru acele "
-"scenarii, care se numește "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), o "
-"tehnică dezvoltată de Mozilla și [prezentată la începutul acestui "
-"an.](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8650,29 +8700,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11962,7 +12012,7 @@ msgstr "Apărați-vă împotriva urmăririi și supravegherii. Împiedicați cen
msgid "Tor Project | Support"
msgstr "Tor Project | Suport"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Subiecte"
diff --git a/contents+ru.po b/contents+ru.po
index 9653816c06..10b159b622 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Sergey Smirnov <cj75300(a)gmail.com>, 2020\n"
"Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
@@ -376,14 +376,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Пользователи [Tor](../tor-tor-network-core-tor) часто сталкиваются с капчей,"
-" потому что [узлы Tor](../relay) создают множество запросов, и порой веб-"
-"сайтам трудно определить, кто их генерирует – люди или боты."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -802,6 +799,35 @@ msgstr ""
"Является первым, если не используется [мост](../bridge). При использовании "
"моста тот занимает место входного узла."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1232,11 +1258,16 @@ msgstr "\"Луковый\" адрес Tor"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Домен onion. Стандартный интернет-домен для сервисов onion c [само-"
-"аутентификацией](../self-authenticating), заканчивается на .onion."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1319,11 +1350,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo – веб-протокол, с помощью которого можно узнавать о действующих "
-"[узлах](../relay) и [мостах](../bridge) Tor."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3265,6 +3295,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3454,6 +3491,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [годен до: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3471,6 +3517,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Проверка подписи"
@@ -3489,10 +3543,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"В следующих примерах мы предполагаем, что вы уже скачали эти два файла (сам "
-"пакет и подпись) в папку \"Загрузки\" (\"Downloads\")."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3506,10 +3560,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Загрузки/TorBrowser-9.0.2-osx64_ru.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3523,10 +3576,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Загрузки/tor-browser-"
-"linux64-9.0.2_ru.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3554,6 +3605,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Альтернативный вариант (с использованием открытого ключа)"
@@ -3631,16 +3690,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"В Tor Browser версии 9 есть защита от создания отпечатков и таких сценариев."
-" Технология называется "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming) и "
-"принадлежит Mozilla. Подробнее о ней можно прочитать "
-"[здесь](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
-"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8502,29 +8555,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11784,7 +11837,7 @@ msgstr "Защититесь от слежки. Обходите цензуру.
msgid "Tor Project | Support"
msgstr "Tor Project | Поддержка"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Темы"
diff --git a/contents+sq.po b/contents+sq.po
index 23b7a6f07f..3e0e9501e9 100644
--- a/contents+sq.po
+++ b/contents+sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: justin somedude <reimyderrizi(a)gmail.com>, 2020\n"
"Language-Team: Albanian (https://www.transifex.com/otf/teams/1519/sq/)\n"
@@ -327,7 +327,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -662,6 +662,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1002,10 +1031,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1077,8 +1113,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2736,6 +2773,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2900,6 +2944,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2913,6 +2966,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2929,7 +2990,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2942,8 +3005,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2956,7 +3019,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2983,6 +3046,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3043,8 +3114,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6953,29 +7024,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -9991,7 +10062,7 @@ msgstr "Mbroni veten nga gjurmimi dhe survejimi. Anashkaloni censurën."
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Temat"
diff --git a/contents+sr.po b/contents+sr.po
index 0b150cf813..87d8e5d3e7 100644
--- a/contents+sr.po
+++ b/contents+sr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Aleksa Ristić, 2020\n"
"Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)\n"
@@ -328,7 +328,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -663,6 +663,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1003,10 +1032,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1078,8 +1114,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2739,6 +2776,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2903,6 +2947,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2916,6 +2969,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2932,7 +2993,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2945,8 +3008,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2959,7 +3022,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2986,6 +3049,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3046,8 +3117,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6984,29 +7055,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -9994,7 +10065,7 @@ msgstr "Brani se od praćenja i nadzora. Zaobiđi cenzuru."
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Теме"
diff --git a/contents+sv.po b/contents+sv.po
index 99a325c70a..131641b390 100644
--- a/contents+sv.po
+++ b/contents+sv.po
@@ -1,6 +1,6 @@
# Translators:
# leveebreaks, 2020
-# Jonatan Nyberg, 2020
+# Jonatan, 2020
# erinm, 2020
# Jonatan Lintao <Sebulonium(a)riseup.net>, 2020
#
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Jonatan Lintao <Sebulonium(a)riseup.net>, 2020\n"
"Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
@@ -328,7 +328,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -663,6 +663,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1003,10 +1032,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1078,8 +1114,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2740,6 +2777,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2904,6 +2948,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2917,6 +2970,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2933,7 +2994,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2946,8 +3009,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2960,7 +3023,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2987,6 +3050,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3047,8 +3118,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7029,29 +7100,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10077,7 +10148,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr ""
diff --git a/contents+th.po b/contents+th.po
index c740ce9b4c..ac1863c7d5 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: DN DN <deen6(a)protonmail.com>, 2020\n"
"Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
@@ -335,7 +335,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -670,6 +670,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1010,10 +1039,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1085,8 +1121,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2751,6 +2788,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2915,6 +2959,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2928,6 +2981,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2944,7 +3005,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2957,8 +3020,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2971,7 +3034,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2998,6 +3061,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3058,8 +3129,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6984,29 +7055,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10007,7 +10078,7 @@ msgstr "ป้องกันตัวเองจากการติดตา
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "หัวข้อ"
diff --git a/contents+tr.po b/contents+tr.po
index 8f98f828c6..6882d99af6 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2020\n"
"Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
@@ -368,15 +368,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"Tor [aktarıcıları](../relay) çok fazla istekte bulunduğu için web siteleri "
-"bu isteklerin insanlardan mı bot yazılımlarından mı geldiğini anlamakta "
-"zorlanır. Bu nedenle [Tor](../tor-tor-network-core-tor) kullanıcılarına sık "
-"sık güvenlik kodu sorulabilir."
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -787,6 +783,35 @@ msgstr ""
"[aktarıcı](../relay). Bir köprü kullanıldığında köprü aktarıcısı koruyucunun"
" yerini alır."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1215,12 +1240,16 @@ msgstr "onion adresi"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"Onion hizmetleri tarafından kullanılan ve .onion ile biten "
-"standartlaştırılmış bir İnternet etki alanı adıdır ve [kendi kendine kimlik "
-"doğrulaması](../self-authenticating) yapabilecek şekilde tasarlanmıştır."
+
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
@@ -1306,12 +1335,10 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo çalışmakta olan Tor [aktarıcıları](../relay) ve "
-"[köprüleri](../bridge) hakkında bilgi almak için kullanılan bir web temelli "
-"iletişim kuralıdır."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3285,6 +3312,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3477,6 +3511,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3494,6 +3537,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### İmzayı doğrulamak"
@@ -3513,10 +3564,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
-"Aşağıdaki örnek komutlar bu iki dosyayı Downloads klasörüne indirdiğinizi "
-"varsayarak yazılmıştır."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3530,11 +3581,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3548,10 +3597,8 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3579,6 +3626,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Çözüm (herkese açık bir anahtar kullanarak)"
@@ -3656,16 +3711,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"Tor Browser 9 sürümüne bu durumları da ele alan ve Mozilla tarafından "
-"geliştirilerek [bu yıl içinde duyurulan](https://www.zdnet.com/article"
-"/firefox-to-add-tor-browser-anti-fingerprinting-technique-called-"
-"letterboxing/) ve "
-"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)) denilen"
-" bir ekran parmak izi koruması eklendi. "
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -8686,29 +8735,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -11994,7 +12043,7 @@ msgstr "Kendinizi ağın izlenmesinden ve gözetlenmekten koruyun. Sansürü aş
msgid "Tor Project | Support"
msgstr "Tor Projesi | Destek"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Konular"
diff --git a/contents+uk.po b/contents+uk.po
index 74d5f22afe..e04456f47d 100644
--- a/contents+uk.po
+++ b/contents+uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: LinuxChata, 2020\n"
"Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
@@ -332,7 +332,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -667,6 +667,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1007,10 +1036,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1082,8 +1118,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2741,6 +2778,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -2905,6 +2949,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2918,6 +2971,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2934,7 +2995,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2947,8 +3010,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2961,7 +3024,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2988,6 +3051,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3048,8 +3119,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -6970,29 +7041,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -9989,7 +10060,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr ""
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Теми"
diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 56fcef5358..33c774aa69 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: ff98sha, 2020\n"
"Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
@@ -343,13 +343,11 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"[Tor](../tor-tor-network-core-tor) 用户经常被提供验证码,因为 Tor "
-"[中继](../relay)发出的请求太多,有时网站很难确定这些请求是来自人类还是来自机器人。"
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.spelling)
@@ -695,6 +693,35 @@ msgid ""
msgstr ""
"[Tor 链路](../circuit)的第一个[中继](../relay),除非使用[网桥](../bridge)。当使用网桥时,网桥取代了守卫节点。"
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1066,10 +1093,17 @@ msgstr "onion 地址"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1145,8 +1179,9 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2869,6 +2904,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr "我们现在展示如何在不同的操作系统上验证下载文件的数字签名。"
@@ -3039,6 +3081,15 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr "在导入密钥完成后,您可以将其另存为一个文件(通过指纹来鉴定它):"
@@ -3054,6 +3105,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### 验证签名"
@@ -3070,8 +3129,10 @@ msgstr "为了验证你下载的包的签名,除了安装文件本身,你还
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
-msgstr "下面的例子假设你已经下载了这样的两个文件到你的\"下载\"文件夹。"
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
+msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3085,11 +3146,9 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3101,10 +3160,8 @@ msgstr "#### 对于 GNU/Linux 的用户(如果您有32位的安装包,请将
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3132,6 +3189,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "### 更多操作(使用公钥)"
@@ -3197,14 +3262,10 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
-"Tor "
-"浏览器9在那些情景下也有着指纹保护措施,这项技术叫[黑边](https://zh.wikipedia.org/wiki/%E9%BB%91%E9%82…"
-"/firefox-to-add-tor-browser-anti-fingerprinting-technique-called-"
-"letterboxing/)。"
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -7292,29 +7353,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10331,7 +10392,7 @@ msgstr "防止你被追踪和监视。避开网络审查。"
msgid "Tor Project | Support"
msgstr "Tor Project | 支持"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "主题"
diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index 3f8eb185da..e073dbf98f 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
"Last-Translator: Emma Peel, 2020\n"
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
@@ -336,7 +336,7 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -671,6 +671,35 @@ msgid ""
" guard."
msgstr ""
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr ""
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1014,10 +1043,17 @@ msgstr ""
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1091,8 +1127,9 @@ msgstr ""
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
#: https//support.torproject.org/glossary/onionoo/
@@ -2760,6 +2797,13 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr "接著我們將為您示範說明,如何確認在不同的作業系統上,驗證下載資料中的數位簽章。"
@@ -2925,6 +2969,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -2938,6 +2991,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr ""
@@ -2954,7 +3015,9 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2967,8 +3030,8 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -2981,7 +3044,7 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -3008,6 +3071,14 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr ""
@@ -3068,8 +3139,8 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
@@ -7032,29 +7103,29 @@ msgid ""
"Once more bridges report these data, the numbers will become more accurate."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
"days."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
msgstr ""
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -10049,7 +10120,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor專案|支持"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "主題"
diff --git a/contents.pot b/contents.pot
index f99a5eb5dd..a12dd5c9a7 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: 2020-04-10 00:25+CET\n"
+"POT-Creation-Date: 2020-04-15 17:39+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"
@@ -359,12 +359,12 @@ msgstr ""
#: https//support.torproject.org/glossary/captcha/
#: (content/glossary/captcha/contents+en.lrword.definition)
msgid ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
msgstr ""
-"[Tor](../tor-tor-network-core-tor) users are often served captchas because "
+"[Tor](../tor-tor-network-core-tor) users are often served CAPTCHAS because "
"Tor [relays](../relay) make so many requests that sometimes websites have a "
"hard time determining whether or not those requests are coming from humans "
"or bots."
@@ -787,6 +787,39 @@ msgstr ""
" [bridge](../bridge). When using a bridge, the bridge takes the place of the"
" guard."
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.term)
+msgid "hamburger menu"
+msgstr "hamburger menu"
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+msgstr ""
+"It's a icon with three horizontal lines usually on the top-left corner or "
+"top-right corner of the screen."
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+msgstr ""
+"By clicking or tapping on the icon, it reveals a menu with options or "
+"additional pages."
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+msgstr "Reference: https://en.wikipedia.org/wiki/Hamburger_button"
+
+#: https//support.torproject.org/glossary/hamburger-menu/
+#: (content/glossary/hamburger-menu/contents+en.lrword.definition)
+msgid ""
+msgstr ""
+
#: https//support.torproject.org/glossary/hash/
#: (content/glossary/hash/contents+en.lrword.term)
msgid "hash"
@@ -1219,12 +1252,21 @@ msgstr "onion address"
#: https//support.torproject.org/glossary/onion-address/
#: (content/glossary/onion-address/contents+en.lrword.definition)
msgid ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
msgstr ""
-"A standardized internet domain name used by onion services that end in "
+"A standardized Internet domain name used by onion services that end in "
".onion and is designed to be [self-authenticating](../self-authenticating)."
+#: https//support.torproject.org/glossary/onion-address/
+#: (content/glossary/onion-address/contents+en.lrword.translation)
+msgid ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+msgstr ""
+"Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'"
+" or 'dirección onion'."
+
#: https//support.torproject.org/glossary/onion-browser/
#: (content/glossary/onion-browser/contents+en.lrword.term)
msgid "Onion Browser"
@@ -1309,11 +1351,13 @@ msgstr "Onionoo"
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
msgid ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
msgstr ""
-"Onionoo is a web-based protocol to learn about currently running [Tor "
-"relays](../relay) and [bridges](../bridge)."
+"[Onionoo](https://metrics.torproject.org/onionoo.html) is a web-based "
+"protocol to learn about currently running [Tor relays](../relay) and "
+"[bridges](../bridge)."
#: https//support.torproject.org/glossary/onionoo/
#: (content/glossary/onionoo/contents+en.lrword.definition)
@@ -3356,6 +3400,15 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+msgstr ""
+"These are example file names and will not exactly match the file names that "
+"you download."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"We now show how you can verify the downloaded file's digital signature on "
"different operating systems."
msgstr ""
@@ -3549,6 +3602,19 @@ msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+msgstr ""
+"If you get an error message, something has gone wrong and you cannot "
+"continue until you've figured out why this didn't work. You might be able to"
+" import the key using the **Workaround (using a public key)** section "
+"instead."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
"After importing the key, you can save it to a file (identifying it by "
"fingerprint here):"
msgstr ""
@@ -3566,6 +3632,17 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+msgstr ""
+"If `./tor.keyring` doesn't exist after running this command, something has "
+"gone wrong and you cannot continue until you've figured out why this didn't "
+"work."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "### Verifying the signature"
msgstr "### Verifying the signature"
@@ -3586,10 +3663,14 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
msgstr ""
"The examples below assume that you downloaded these two files to your "
-"\"Downloads\" folder."
+"\"Downloads\" folder. Note that these commands use example file names and "
+"yours will be different: you will have downloaded a different version than "
+"9.0 and you may not have chosen the English (en) version."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3603,11 +3684,11 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
-"US.dmg{.asc,}"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc "
+"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3620,10 +3701,10 @@ msgstr ""
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
msgstr ""
"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
-"US.tar.xz{.asc,}"
+"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz"
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3651,6 +3732,17 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+msgstr ""
+"If you get error messages containing 'No such file or directory', either "
+"something went wrong with one of the previous steps, or you forgot that "
+"these commands use example file names and yours will be a little different."
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
msgid "#### Workaround (using a public key)"
msgstr "#### Workaround (using a public key)"
@@ -3727,15 +3819,15 @@ msgid ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
"Tor Browser 9 ships with a fingerprinting defense for those scenarios as "
"well, which is called "
"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), a "
-"technique developed by Mozilla and [presented earlier this "
-"year](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"technique developed by Mozilla and [presented in "
+"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
@@ -8632,15 +8724,15 @@ msgid ""
msgstr ""
"Once more bridges report these data, the numbers will become more accurate."
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.title)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.title)
msgid ""
"What are these red and blue dots indicating possible censorship events?"
msgstr ""
"What are these red and blue dots indicating possible censorship events?"
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"We run an anomaly-based censorship-detection system that looks at estimated "
"user numbers over a series of days and predicts the user number in the next "
@@ -8650,8 +8742,8 @@ msgstr ""
"user numbers over a series of days and predicts the user number in the next "
"days."
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
@@ -8659,8 +8751,8 @@ msgstr ""
"If the actual number is higher or lower, this might indicate a possible "
"censorship event or release of censorship."
-#: https//support.torproject.org/metrics/censorship/
-#: (content/metrics/censorship/contents+en.lrquestion.description)
+#: https//support.torproject.org/metrics/censorship-events/
+#: (content/metrics/censorship-events/contents+en.lrquestion.description)
msgid ""
"For more details, see our [technical "
"report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
@@ -12286,7 +12378,7 @@ msgstr ""
msgid "Tor Project | Support"
msgstr "Tor Project | Support"
-#: templates/sidenav.html:4 templates/sidenav.html:36
+#: templates/sidenav.html:4 templates/sidenav.html:35
msgid "Topics"
msgstr "Topics"
1
0
[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation@torproject.org 15 Apr '20
by translation@torproject.org 15 Apr '20
15 Apr '20
commit 622168de8ca57ce3ca01b6bd0b180f38914aa65b
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 15 15:52:12 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton…
---
tr/torbutton.properties | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tr/torbutton.properties b/tr/torbutton.properties
index cc20c6e281..eac14289c0 100644
--- a/tr/torbutton.properties
+++ b/tr/torbutton.properties
@@ -71,22 +71,22 @@ onionServices.errorPage.onionSite=Onion Sitesi
# Tor SOCKS error 0xF0:
onionServices.descNotFound.pageTitle=Onion sitesi yüklenirken sorun çıktı
onionServices.descNotFound.header=Onion sitesi bulunamadı
-onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
-onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
+onionServices.descNotFound=Büyük ihtimalle onionsite çevrimdışı. onionsite yöneticisiyle bağlantı kurun.
+onionServices.descNotFound.longDescription=Ayrıntılar: %S — İstenen onion hizmet tanımlayıcı hashring'te bulunamadı ve bu nedenle hizmet istemci tarafından erişilebilir değil.
# Tor SOCKS error 0xF1:
onionServices.descInvalid.pageTitle=Onion sitesi yüklenirken sorun çıktı
onionServices.descInvalid.header=Onion Sitesine Erişilemiyor
-onionServices.descInvalid=The onionsite is unreachable due an internal error.
-onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
+onionServices.descInvalid=İçsel bir hata nedeniyle onionsiteye erişilemiyor.
+onionServices.descInvalid.longDescription=Ayrıntılar: %S — İstenen onion hizmet tanımlayıcı çözümlenemiyor veya imza doğrulama başarısız oldu.
# Tor SOCKS error 0xF2:
onionServices.introFailed.pageTitle=Onion sitesi yüklenirken sorun çıktı
-onionServices.introFailed.header=Onionsite Has Disconnected
-onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
-onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
+onionServices.introFailed.header=Onionsite Bağlantısı Kesildi
+onionServices.introFailed=Büyük ihtimalle onionsite çevrimdışı. onionsite yöneticisiyle bağlantı kurun.
+onionServices.introFailed.longDescription=Ayrıntılar: %S — Tanıtım başarısız oldu, bunun anlamı tanımlayıcı bulunsa da hizmetin bu tanıtım noktasına artık bağlı olmadığıdır. Yüksek ihtimalle ya hizmet tanımlayıcısını değiştirdi ya da şu an çalışmıyor.
# Tor SOCKS error 0xF3:
onionServices.rendezvousFailed.pageTitle=Onion sitesi yüklenirken sorun çıktı
-onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
-onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
+onionServices.rendezvousFailed.header=Onionsiteye Bağlanılamadı
+onionServices.rendezvousFailed=Onionsite meşgul veya Tor ağı aşırı yüklenmiş. Daha sonra tekrar deneyin.
onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
# Tor SOCKS error 0xF4:
onionServices.clientAuthMissing.pageTitle=Authorization Required
1
0
[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation@torproject.org 15 Apr '20
by translation@torproject.org 15 Apr '20
15 Apr '20
commit b390f3edc95769cf371da11630233114ccf9405c
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 15 15:45:15 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
tr/LC_MESSAGES/bridgedb.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index ce093a5995..3e9b641a48 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -28,8 +28,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
"POT-Creation-Date: 2020-04-07 10:14-0700\n"
-"PO-Revision-Date: 2020-04-07 19:47+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2020-04-15 15:44+0000\n"
+"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "%sK%söprüleri Al"
#: bridgedb/strings.py:42
msgid "[This is an automated email.]"
-msgstr ""
+msgstr "[Bu otomatik bir e-postadır.]"
#: bridgedb/strings.py:44
msgid "Here are your bridges:"
1
0
[tor-browser-spec/master] Bug 21952: Onion-Location spec update to match latest implementation
by sysrqb@torproject.org 15 Apr '20
by sysrqb@torproject.org 15 Apr '20
15 Apr '20
commit fcdbf39dde66f629c7abefb2ab44e36ade55f9ff
Author: Alex Catarineu <acat(a)torproject.org>
Date: Tue Apr 7 17:22:35 2020 +0200
Bug 21952: Onion-Location spec update to match latest implementation
---
proposals/100-onion-location-header.txt | 46 ++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 6 deletions(-)
diff --git a/proposals/100-onion-location-header.txt b/proposals/100-onion-location-header.txt
index 0820968..5d0e763 100644
--- a/proposals/100-onion-location-header.txt
+++ b/proposals/100-onion-location-header.txt
@@ -35,10 +35,8 @@ Ticket: #21952
2.1. Redirection method
- We introduce a new HTTP header called "Onion-Location" with the exact same
- restrictions and semantics as the Location HTTP header. Websites can use the
- Onion-Location HTTP header to specify their onion counterpart, in the same
- way that they would use the Location header.
+ We introduce a new HTTP header called "Onion-Location", which websites
+ can use to specify their onion counterpart.
Example:
Onion-Location: http://vwc43ag5jyewlfgf.onion
@@ -46,8 +44,29 @@ Ticket: #21952
2.2. Browser logic
The Tor Browser intercepts the Onion-Location HTTP header (if any) and
- informs the user of the existence of the onion site, giving them the option
- to visit it. Tor Browser only does so if the header is served over HTTPS.
+ acts upon it in two possible ways, depending on the configuration state
+ of the browser:
+
+ a) If the user has enabled automatic Onion-Location redirects
+ the header is equivalent to a redirect with a Refresh header and a
+ timeout of 0 seconds [1]. As an example: the header in 2.1 would be
+ treated like a `Refresh: 0;URL='http://vwc43ag5jyewlfgf.onion'` header.
+
+ b) If the user has not enabled automatic Onion-Location redirects,
+ it informs them of the existence of the onionsite, giving them the option
+ to visit it. If the user chooses to visit the onionsite, the webpage
+ will be reloaded and redirected to its onion counterpart, as in a).
+
+ Before acting upon it, the browser checks whether the Onion-Location has
+ a valid value, and ignores it if it does not. For the header to be valid
+ the following conditions need to be fulfilled:
+
+ * The Onion-Location value must be a valid URL with http: or https: protocol
+ and a .onion hostname.
+
+ * The webpage defining the Onion-Location header must be served over HTTPS.
+
+ * The webpage defining the Onion-Location header must not be an onionsite.
Tor Browser should inform the user about the onion in a non-intrusive way
(e.g. an infobar below the address bar), it should also provide a way for
@@ -56,6 +75,18 @@ Ticket: #21952
Browsers that don't support Tor SHOULD ignore the Onion-Location header.
+2.3. Using an HTML <meta> attribute instead of an HTTP header
+
+ The (conditionally) identical behaviour of Onion-Location and a Refresh
+ header (with 0 seconds timeout) includes the option of defining it as a
+ HTML <meta> http-equiv attribute. This may be used by websites that prefer
+ (or need) to define Onion-Location by modifying the served HTML content
+ instead of adding a new HTTP header.
+
+ As an example, the Onion-Location header in 2.1 would be equivalent to a
+ `<meta http-equiv="onion-location" content="http://vwc43ag5jyewlfgf.onion" />`
+ added in the HTML head element of the webpage.
+
3. Drawbacks
3.1. No security/performance benefits
@@ -122,3 +153,6 @@ Ticket: #21952
and would still confuse people. So I think starting with a simple approach
that will educate users and then moving to more advanced designs is a more
normative way to go.
+
+
+[1] https://www.w3.org/TR/2016/NOTE-WCAG20-TECHS-20161007/H76
\ No newline at end of file
1
0