commit b58349ab556070886a69b727e78f21c4e3db74f0
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Dec 3 11:47:27 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess…
---
lt/messages.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lt/messages.json b/lt/messages.json
index e9eb1d75a3..6ba04d4240 100644
--- a/lt/messages.json
+++ b/lt/messages.json
@@ -30,7 +30,7 @@
"message": "Slapukai nėra įjungti."
},
"websiteIntro": {
- "message": "Snowflake yra sistema nugalėti interneto blokavimą. Blokuojami žmonės gali naudotis Snowflake interneto pasiekimui. Jų jungtis eina per Snowflake tarpinius serverius, kuriuos palaiko savanoriai. Daugiau detalios informacijos apie tai kaip veikia Snowflake rasite mūsų <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">wiki dokumnetacijoje</a>."
+ "message": "Snowflake yra sistema, skirta nugalėti interneto cenzūrą. Cenzūruojami žmonės gali naudotis Snowflake, kad gautų prieigą prie interneto. Jų ryšys jungiasi per įgaliotuosius Snowflake serverius, kuriuos palaiko savanoriai. Daugiau išsamesnės informacijos apie tai, kaip veikia Snowflake, rasite mūsų <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">dokumentacijos vikyje</a>."
},
"docWiki": {
"message": "dokumentacijos vikis"
commit 333910ace62ecc904d7123fabf10a5f44e5b0e33
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Dec 3 11:45:39 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten…
---
contents+en.po | 270 +++++++++++++++++++++++++++++++++++++++++----------------
contents.pot | 270 +++++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 390 insertions(+), 150 deletions(-)
diff --git a/contents+en.po b/contents+en.po
index a5a88fd7c0..a9afe5e4dc 100644
--- a/contents+en.po
+++ b/contents+en.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-14 09:48+CET\n"
+"POT-Creation-Date: 2019-12-03 01:33+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"
@@ -11619,6 +11619,8 @@ msgstr "/etc/rc.d/tor start"
#: https//community.torproject.org/relay/setup/bridge/netbsd/
#: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body)
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid "### 4. Monitor your logs"
msgstr "### 4. Monitor your logs"
@@ -12040,12 +12042,12 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
msgid ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
msgstr ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
@@ -12486,17 +12488,18 @@ msgstr "How to deploy an obfs4 bridge using a docker container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
-msgstr ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
+msgid "### 1. Pull the image"
+msgstr "### 1. Pull the image"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"walks you through setting up this container. First, download the container:"
-msgstr ""
-"walks you through setting up this container. First, download the container:"
+msgid "We are maintaining a docker image that runs an obfs4 bridge."
+msgstr "We are maintaining a docker image that runs an obfs4 bridge."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "First, download the image:"
+msgstr "First, download the image:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12505,100 +12508,196 @@ msgstr "docker pull phwinter/obfs4-bridge:latest"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"Now, it's time to run the container. You can choose between two options:"
-msgstr ""
-"Now, it's time to run the container. You can choose between two options:"
+msgid "### 2. Deploy a container"
+msgstr "### 2. Deploy a container"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "We provide a Makefile that helps you deploy the container."
+msgstr "We provide a Makefile that helps you deploy the container."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
msgstr ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "Here's a template:"
+msgstr "Here's a template:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your bridge's Tor port."
+msgstr "# Your bridge's Tor port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export OR_PORT=X"
+msgstr "export OR_PORT=X"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "then runs the docker container."
-msgstr "then runs the docker container."
+msgid "# Your bridge's obfs4 port."
+msgstr "# Your bridge's obfs4 port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export PT_PORT=Y"
+msgstr "export PT_PORT=Y"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your email address."
+msgstr "# Your email address."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export EMAIL=Z"
+msgstr "export EMAIL=Z"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
+msgstr ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
msgstr ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge.sh && make deploy"
+msgstr "source bridge.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "You should now see output similar to the following:"
+msgstr "You should now see output similar to the following:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
+msgstr "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "When running this script, provide your email address as argument:"
-msgstr "When running this script, provide your email address as argument:"
+msgid "Make sure that port X and Y are forwarded in your firewall."
+msgstr "Make sure that port X and Y are forwarded in your firewall."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "bash deploy-container.sh address(a)email.com"
-msgstr "bash deploy-container.sh address(a)email.com"
+msgid ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
+msgstr ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
msgstr ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-1.sh && make deploy"
+msgstr "source bridge-1.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-2.sh && make deploy"
+msgstr "source bridge-2.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "..."
+msgstr "..."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "sure that **both** ports are forwarded in your firewall."
-msgstr "sure that **both** ports are forwarded in your firewall."
+msgid "### 3. Upgrade your container"
+msgstr "### 3. Upgrade your container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
msgstr ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
-msgstr "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
+msgid "docker stop CONTAINER_ID"
+msgstr "docker stop CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "`admin(a)example.com` with your email address."
-msgstr "`admin(a)example.com` with your email address."
+msgid "docker rm CONTAINER_ID"
+msgstr "docker rm CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
msgstr ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Again, make sure that **both** ports are forwarded by your firewall."
-msgstr "Again, make sure that **both** ports are forwarded by your firewall."
+msgid ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
+msgstr ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
msgstr ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "You can inspect its logs by running:"
-msgstr "You can inspect its logs by running:"
+msgid "You can inspect your bridge's logs by running:"
+msgstr "You can inspect your bridge's logs by running:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12607,17 +12706,13 @@ msgstr "docker logs CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
-msgstr ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
+msgid "To use your new bridge in Tor Browser, you need its \"bridge line\"."
+msgstr "To use your new bridge in Tor Browser, you need its \"bridge line\"."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "you can get your bridge line:"
-msgstr "you can get your bridge line:"
+msgid "Here's how you can get your bridge line:"
+msgstr "Here's how you can get your bridge line:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12642,29 +12737,21 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Make sure to check out the [post-install"
-msgstr "Make sure to check out the [post-install"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
msgstr ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"you are having troubles setting up your bridge, have a look at [our help"
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
msgstr ""
-"you are having troubles setting up your bridge, have a look at [our help"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "section](https://community.torproject.org/relay/getting-help/)."
-msgstr "section](https://community.torproject.org/relay/getting-help/)."
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
#: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
#: (content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents+en.lrpage.title)
@@ -14453,6 +14540,39 @@ msgstr "#3. Restart cron's service."
msgid "# service cron restart"
msgstr "# service cron restart"
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO1\" with a Tor port of your choice."
+msgstr "# Replace \"TODO1\" with a Tor port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# This port must be externally reachable."
+msgstr "# This port must be externally reachable."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+msgstr ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO2\" with an obfs4 port of your choice."
+msgstr "# Replace \"TODO2\" with an obfs4 port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+msgstr ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+
#: lego/templates/banner.html:2 lego/templates/banner.html:4
#: templates/banner.html:2 templates/banner.html:4
msgid "Close banner"
diff --git a/contents.pot b/contents.pot
index a5a88fd7c0..a9afe5e4dc 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-14 09:48+CET\n"
+"POT-Creation-Date: 2019-12-03 01:33+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"
@@ -11619,6 +11619,8 @@ msgstr "/etc/rc.d/tor start"
#: https//community.torproject.org/relay/setup/bridge/netbsd/
#: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body)
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid "### 4. Monitor your logs"
msgstr "### 4. Monitor your logs"
@@ -12040,12 +12042,12 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
msgid ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
msgstr ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
@@ -12486,17 +12488,18 @@ msgstr "How to deploy an obfs4 bridge using a docker container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
-msgstr ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
+msgid "### 1. Pull the image"
+msgstr "### 1. Pull the image"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"walks you through setting up this container. First, download the container:"
-msgstr ""
-"walks you through setting up this container. First, download the container:"
+msgid "We are maintaining a docker image that runs an obfs4 bridge."
+msgstr "We are maintaining a docker image that runs an obfs4 bridge."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "First, download the image:"
+msgstr "First, download the image:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12505,100 +12508,196 @@ msgstr "docker pull phwinter/obfs4-bridge:latest"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"Now, it's time to run the container. You can choose between two options:"
-msgstr ""
-"Now, it's time to run the container. You can choose between two options:"
+msgid "### 2. Deploy a container"
+msgstr "### 2. Deploy a container"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "We provide a Makefile that helps you deploy the container."
+msgstr "We provide a Makefile that helps you deploy the container."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
msgstr ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "Here's a template:"
+msgstr "Here's a template:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your bridge's Tor port."
+msgstr "# Your bridge's Tor port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export OR_PORT=X"
+msgstr "export OR_PORT=X"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "then runs the docker container."
-msgstr "then runs the docker container."
+msgid "# Your bridge's obfs4 port."
+msgstr "# Your bridge's obfs4 port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export PT_PORT=Y"
+msgstr "export PT_PORT=Y"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your email address."
+msgstr "# Your email address."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export EMAIL=Z"
+msgstr "export EMAIL=Z"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
+msgstr ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
msgstr ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge.sh && make deploy"
+msgstr "source bridge.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "You should now see output similar to the following:"
+msgstr "You should now see output similar to the following:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
+msgstr "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "When running this script, provide your email address as argument:"
-msgstr "When running this script, provide your email address as argument:"
+msgid "Make sure that port X and Y are forwarded in your firewall."
+msgstr "Make sure that port X and Y are forwarded in your firewall."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "bash deploy-container.sh address(a)email.com"
-msgstr "bash deploy-container.sh address(a)email.com"
+msgid ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
+msgstr ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
msgstr ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-1.sh && make deploy"
+msgstr "source bridge-1.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-2.sh && make deploy"
+msgstr "source bridge-2.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "..."
+msgstr "..."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "sure that **both** ports are forwarded in your firewall."
-msgstr "sure that **both** ports are forwarded in your firewall."
+msgid "### 3. Upgrade your container"
+msgstr "### 3. Upgrade your container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
msgstr ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
-msgstr "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
+msgid "docker stop CONTAINER_ID"
+msgstr "docker stop CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "`admin(a)example.com` with your email address."
-msgstr "`admin(a)example.com` with your email address."
+msgid "docker rm CONTAINER_ID"
+msgstr "docker rm CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
msgstr ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Again, make sure that **both** ports are forwarded by your firewall."
-msgstr "Again, make sure that **both** ports are forwarded by your firewall."
+msgid ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
+msgstr ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
msgstr ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "You can inspect its logs by running:"
-msgstr "You can inspect its logs by running:"
+msgid "You can inspect your bridge's logs by running:"
+msgstr "You can inspect your bridge's logs by running:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12607,17 +12706,13 @@ msgstr "docker logs CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
-msgstr ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
+msgid "To use your new bridge in Tor Browser, you need its \"bridge line\"."
+msgstr "To use your new bridge in Tor Browser, you need its \"bridge line\"."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "you can get your bridge line:"
-msgstr "you can get your bridge line:"
+msgid "Here's how you can get your bridge line:"
+msgstr "Here's how you can get your bridge line:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12642,29 +12737,21 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Make sure to check out the [post-install"
-msgstr "Make sure to check out the [post-install"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
msgstr ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"you are having troubles setting up your bridge, have a look at [our help"
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
msgstr ""
-"you are having troubles setting up your bridge, have a look at [our help"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "section](https://community.torproject.org/relay/getting-help/)."
-msgstr "section](https://community.torproject.org/relay/getting-help/)."
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
#: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
#: (content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents+en.lrpage.title)
@@ -14453,6 +14540,39 @@ msgstr "#3. Restart cron's service."
msgid "# service cron restart"
msgstr "# service cron restart"
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO1\" with a Tor port of your choice."
+msgstr "# Replace \"TODO1\" with a Tor port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# This port must be externally reachable."
+msgstr "# This port must be externally reachable."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+msgstr ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO2\" with an obfs4 port of your choice."
+msgstr "# Replace \"TODO2\" with an obfs4 port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+msgstr ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+
#: lego/templates/banner.html:2 lego/templates/banner.html:4
#: templates/banner.html:2 templates/banner.html:4
msgid "Close banner"
commit 48339cad04acc41e5695e0d6f53e408fa4262d53
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Dec 3 11:45:30 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten…
---
contents+en.po | 270 +++++++++++++++++++++++++++++++++++++++++----------------
contents.pot | 270 +++++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 390 insertions(+), 150 deletions(-)
diff --git a/contents+en.po b/contents+en.po
index a5a88fd7c0..a9afe5e4dc 100644
--- a/contents+en.po
+++ b/contents+en.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-14 09:48+CET\n"
+"POT-Creation-Date: 2019-12-03 01:33+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"
@@ -11619,6 +11619,8 @@ msgstr "/etc/rc.d/tor start"
#: https//community.torproject.org/relay/setup/bridge/netbsd/
#: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body)
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid "### 4. Monitor your logs"
msgstr "### 4. Monitor your logs"
@@ -12040,12 +12042,12 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
msgid ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
msgstr ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
@@ -12486,17 +12488,18 @@ msgstr "How to deploy an obfs4 bridge using a docker container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
-msgstr ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
+msgid "### 1. Pull the image"
+msgstr "### 1. Pull the image"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"walks you through setting up this container. First, download the container:"
-msgstr ""
-"walks you through setting up this container. First, download the container:"
+msgid "We are maintaining a docker image that runs an obfs4 bridge."
+msgstr "We are maintaining a docker image that runs an obfs4 bridge."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "First, download the image:"
+msgstr "First, download the image:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12505,100 +12508,196 @@ msgstr "docker pull phwinter/obfs4-bridge:latest"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"Now, it's time to run the container. You can choose between two options:"
-msgstr ""
-"Now, it's time to run the container. You can choose between two options:"
+msgid "### 2. Deploy a container"
+msgstr "### 2. Deploy a container"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "We provide a Makefile that helps you deploy the container."
+msgstr "We provide a Makefile that helps you deploy the container."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
msgstr ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "Here's a template:"
+msgstr "Here's a template:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your bridge's Tor port."
+msgstr "# Your bridge's Tor port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export OR_PORT=X"
+msgstr "export OR_PORT=X"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "then runs the docker container."
-msgstr "then runs the docker container."
+msgid "# Your bridge's obfs4 port."
+msgstr "# Your bridge's obfs4 port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export PT_PORT=Y"
+msgstr "export PT_PORT=Y"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your email address."
+msgstr "# Your email address."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export EMAIL=Z"
+msgstr "export EMAIL=Z"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
+msgstr ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
msgstr ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge.sh && make deploy"
+msgstr "source bridge.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "You should now see output similar to the following:"
+msgstr "You should now see output similar to the following:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
+msgstr "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "When running this script, provide your email address as argument:"
-msgstr "When running this script, provide your email address as argument:"
+msgid "Make sure that port X and Y are forwarded in your firewall."
+msgstr "Make sure that port X and Y are forwarded in your firewall."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "bash deploy-container.sh address(a)email.com"
-msgstr "bash deploy-container.sh address(a)email.com"
+msgid ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
+msgstr ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
msgstr ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-1.sh && make deploy"
+msgstr "source bridge-1.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-2.sh && make deploy"
+msgstr "source bridge-2.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "..."
+msgstr "..."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "sure that **both** ports are forwarded in your firewall."
-msgstr "sure that **both** ports are forwarded in your firewall."
+msgid "### 3. Upgrade your container"
+msgstr "### 3. Upgrade your container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
msgstr ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
-msgstr "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
+msgid "docker stop CONTAINER_ID"
+msgstr "docker stop CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "`admin(a)example.com` with your email address."
-msgstr "`admin(a)example.com` with your email address."
+msgid "docker rm CONTAINER_ID"
+msgstr "docker rm CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
msgstr ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Again, make sure that **both** ports are forwarded by your firewall."
-msgstr "Again, make sure that **both** ports are forwarded by your firewall."
+msgid ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
+msgstr ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
msgstr ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "You can inspect its logs by running:"
-msgstr "You can inspect its logs by running:"
+msgid "You can inspect your bridge's logs by running:"
+msgstr "You can inspect your bridge's logs by running:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12607,17 +12706,13 @@ msgstr "docker logs CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
-msgstr ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
+msgid "To use your new bridge in Tor Browser, you need its \"bridge line\"."
+msgstr "To use your new bridge in Tor Browser, you need its \"bridge line\"."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "you can get your bridge line:"
-msgstr "you can get your bridge line:"
+msgid "Here's how you can get your bridge line:"
+msgstr "Here's how you can get your bridge line:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12642,29 +12737,21 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Make sure to check out the [post-install"
-msgstr "Make sure to check out the [post-install"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
msgstr ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"you are having troubles setting up your bridge, have a look at [our help"
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
msgstr ""
-"you are having troubles setting up your bridge, have a look at [our help"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "section](https://community.torproject.org/relay/getting-help/)."
-msgstr "section](https://community.torproject.org/relay/getting-help/)."
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
#: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
#: (content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents+en.lrpage.title)
@@ -14453,6 +14540,39 @@ msgstr "#3. Restart cron's service."
msgid "# service cron restart"
msgstr "# service cron restart"
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO1\" with a Tor port of your choice."
+msgstr "# Replace \"TODO1\" with a Tor port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# This port must be externally reachable."
+msgstr "# This port must be externally reachable."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+msgstr ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO2\" with an obfs4 port of your choice."
+msgstr "# Replace \"TODO2\" with an obfs4 port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+msgstr ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+
#: lego/templates/banner.html:2 lego/templates/banner.html:4
#: templates/banner.html:2 templates/banner.html:4
msgid "Close banner"
diff --git a/contents.pot b/contents.pot
index a5a88fd7c0..a9afe5e4dc 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-14 09:48+CET\n"
+"POT-Creation-Date: 2019-12-03 01:33+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"
@@ -11619,6 +11619,8 @@ msgstr "/etc/rc.d/tor start"
#: https//community.torproject.org/relay/setup/bridge/netbsd/
#: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body)
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid "### 4. Monitor your logs"
msgstr "### 4. Monitor your logs"
@@ -12040,12 +12042,12 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
msgid ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
msgstr ""
-"Under Debian, you will also need to set `NoNewPrivileges=no` in "
+"You will also need to set `NoNewPrivileges=no` in "
"`/lib/systemd/system/tor(a)default.service` and "
"`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. "
"(see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))"
@@ -12486,17 +12488,18 @@ msgstr "How to deploy an obfs4 bridge using a docker container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
-msgstr ""
-"We are maintaining a docker container that runs an obfs4 bridge. This guide"
+msgid "### 1. Pull the image"
+msgstr "### 1. Pull the image"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"walks you through setting up this container. First, download the container:"
-msgstr ""
-"walks you through setting up this container. First, download the container:"
+msgid "We are maintaining a docker image that runs an obfs4 bridge."
+msgstr "We are maintaining a docker image that runs an obfs4 bridge."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "First, download the image:"
+msgstr "First, download the image:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12505,100 +12508,196 @@ msgstr "docker pull phwinter/obfs4-bridge:latest"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"Now, it's time to run the container. You can choose between two options:"
-msgstr ""
-"Now, it's time to run the container. You can choose between two options:"
+msgid "### 2. Deploy a container"
+msgstr "### 2. Deploy a container"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "We provide a Makefile that helps you deploy the container."
+msgstr "We provide a Makefile that helps you deploy the container."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
msgstr ""
-"1. We maintain a script that determines a free OR and obfs4 port for you, "
-"and"
+"First, [download the Makefile](https://dip.torproject.org/torproject/anti-"
+"censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your "
+"bridge configuration to a new file, bridge.sh."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "Here's a template:"
+msgstr "Here's a template:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your bridge's Tor port."
+msgstr "# Your bridge's Tor port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export OR_PORT=X"
+msgstr "export OR_PORT=X"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "then runs the docker container."
-msgstr "then runs the docker container."
+msgid "# Your bridge's obfs4 port."
+msgstr "# Your bridge's obfs4 port."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export PT_PORT=Y"
+msgstr "export PT_PORT=Y"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "# Your email address."
+msgstr "# Your email address."
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "export EMAIL=Z"
+msgstr "export EMAIL=Z"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
+msgstr ""
+"Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure "
+"that **both** ports are forwarded in your firewall), and `Z` with your email"
+" address, which allows us to get in touch with you if there are problems "
+"with your bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
msgstr ""
-"[Download the script here](https://dip.torproject.org/torproject/anti-"
-"censorship/docker-obfs4-bridge/raw/master/deploy-container.sh)."
+"With your bridge configuration in place, you can now deploy the container:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge.sh && make deploy"
+msgstr "source bridge.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "You should now see output similar to the following:"
+msgstr "You should now see output similar to the following:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
+msgstr "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "When running this script, provide your email address as argument:"
-msgstr "When running this script, provide your email address as argument:"
+msgid "Make sure that port X and Y are forwarded in your firewall."
+msgstr "Make sure that port X and Y are forwarded in your firewall."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "bash deploy-container.sh address(a)email.com"
-msgstr "bash deploy-container.sh address(a)email.com"
+msgid ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
+msgstr ""
+"That's it! Your container (identified by the first line of output) is now "
+"bootstrapping your new obfs4 bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
msgstr ""
-"The script will tell you what ports it chose, and your container ID. Make"
+"If you want to run multiple bridges on your machine, you need to create more"
+" bridge configuration files with different sets of ports, and run `make "
+"deploy` again, like so:"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-1.sh && make deploy"
+msgstr "source bridge-1.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "source bridge-2.sh && make deploy"
+msgstr "source bridge-2.sh && make deploy"
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
+msgid "..."
+msgstr "..."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "sure that **both** ports are forwarded in your firewall."
-msgstr "sure that **both** ports are forwarded in your firewall."
+msgid "### 3. Upgrade your container"
+msgstr "### 3. Upgrade your container"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
msgstr ""
-"2. If you would rather provide your own ports, run the following command and"
+"To upgrade to the latest version of our image, you need to stop your "
+"existing container, delete it, pull the latest image, and finally deploy it "
+"again:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
-msgstr "replace `XXX` with your OR port, `YYY` with your obfs4 port, and"
+msgid "docker stop CONTAINER_ID"
+msgstr "docker stop CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "`admin(a)example.com` with your email address."
-msgstr "`admin(a)example.com` with your email address."
+msgid "docker rm CONTAINER_ID"
+msgstr "docker rm CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
msgstr ""
-"OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e "
-"OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p"
-" $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest"
+"Note that your bridge's data directory (which includes its key material) is "
+"stored in a docker volume, so you won't lose your bridge's identity when "
+"upgrading to the latest docker image."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Again, make sure that **both** ports are forwarded by your firewall."
-msgstr "Again, make sure that **both** ports are forwarded by your firewall."
+msgid ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
+msgstr ""
+"If you are running multiple bridges on your computer, you need to repeat "
+"this step for each bridge."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
msgstr ""
-"That's it! Your container should now be bootstrapping your new obfs4 bridge."
+"We will announce new image versions on the [tor-"
+"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing "
+"list."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "You can inspect its logs by running:"
-msgstr "You can inspect its logs by running:"
+msgid "You can inspect your bridge's logs by running:"
+msgstr "You can inspect your bridge's logs by running:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12607,17 +12706,13 @@ msgstr "docker logs CONTAINER_ID"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
-msgstr ""
-"To use your new bridge in Tor Browser, you need its \"bridge line\". Here's"
-" how"
+msgid "To use your new bridge in Tor Browser, you need its \"bridge line\"."
+msgstr "To use your new bridge in Tor Browser, you need its \"bridge line\"."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "you can get your bridge line:"
-msgstr "you can get your bridge line:"
+msgid "Here's how you can get your bridge line:"
+msgstr "Here's how you can get your bridge line:"
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
@@ -12642,29 +12737,21 @@ msgstr ""
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "Make sure to check out the [post-install"
-msgstr "Make sure to check out the [post-install"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
msgstr ""
-"notes](https://community.torproject.org/relay/setup/bridge/post-install/). "
-"If"
+"Make sure to check out the [post-install "
+"notes](https://community.torproject.org/relay/setup/bridge/post-install/)."
#: https//community.torproject.org/relay/setup/bridge/docker/
#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
msgid ""
-"you are having troubles setting up your bridge, have a look at [our help"
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
msgstr ""
-"you are having troubles setting up your bridge, have a look at [our help"
-
-#: https//community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)
-msgid "section](https://community.torproject.org/relay/getting-help/)."
-msgstr "section](https://community.torproject.org/relay/getting-help/)."
+"If you are having troubles setting up your bridge, have a look at [our help "
+"section](https://community.torproject.org/relay/getting-help/)."
#: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
#: (content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents+en.lrpage.title)
@@ -14453,6 +14540,39 @@ msgstr "#3. Restart cron's service."
msgid "# service cron restart"
msgstr "# service cron restart"
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO1\" with a Tor port of your choice."
+msgstr "# Replace \"TODO1\" with a Tor port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# This port must be externally reachable."
+msgstr "# This port must be externally reachable."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+msgstr ""
+"# Avoid port 9001 because it's commonly associated with Tor and censors may "
+"be scanning the Internet for this port."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid "# Replace \"TODO2\" with an obfs4 port of your choice."
+msgstr "# Replace \"TODO2\" with an obfs4 port of your choice."
+
+#: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)
+msgid ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+msgstr ""
+"# This port must be externally reachable and must be different from the one "
+"specified for ORPort."
+
#: lego/templates/banner.html:2 lego/templates/banner.html:4
#: templates/banner.html:2 templates/banner.html:4
msgid "Close banner"
commit 596e68a592ab881d459bda3acef63938dace0b4f
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Dec 3 11:23:07 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ…
---
lt/network-settings.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index f0367c112b..4d25fc96cb 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -64,7 +64,7 @@
<!-- #31286 about:preferences strings -->
<!ENTITY torPreferences.categoryTitle "Tor">
<!ENTITY torPreferences.torSettings "Tor nustatymai">
-<!ENTITY torPreferences.torSettingsDescription "Tor Naršyklė nukreipia jūsų srautą per Tor tinklą, veikiančio po visą pasaulį išsidėsčiusių tūkstančių savanorių dėka." >
+<!ENTITY torPreferences.torSettingsDescription "Tor Naršyklė nukreipia jūsų srautą per Tor tinklą, veikiantį po visą pasaulį išsidėsčiusių tūkstančių savanorių dėka." >
<!ENTITY torPreferences.learnMore "Sužinokite daugiau">
<!ENTITY torPreferences.bridges "Tinklų tiltai">
<!ENTITY torPreferences.bridgesDescription "Tinklo tiltai padeda jums pasiekti Tor tinklą, vietose kur Tor užblokuotas. Priklausomai nuo to kur esate, vienas tiltas gali veikti geriau nei kitas.">
commit c12ea16f0bed0f5fc2cc47568483923db9e5a337
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Dec 3 11:22:17 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron…
---
lt/browserOnboarding.properties | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lt/browserOnboarding.properties b/lt/browserOnboarding.properties
index 211ae8c818..a53b857f58 100644
--- a/lt/browserOnboarding.properties
+++ b/lt/browserOnboarding.properties
@@ -36,11 +36,11 @@ onboarding.tour-tor-expect-differences=Patyrimo patarimai
onboarding.tour-tor-expect-differences.title=Tikėkitės kai kurių skirtumų.
onboarding.tour-tor-expect-differences.description=Su visomis Tor suteikiamomis saugumo ir privatumo ypatybėmis, jūsų patyrimas naršant saityną gali būti šiek tiek kitoks. Priklausomai nuo jūsų saugumo lygmens, viskas gali veikti šiek tiek lėčiau, o kai kurie elementai - neveikti arba būti neįkeliami. Taip pat jūsų gali būti prašoma įrodyti, kad esate žmogus, o ne robotas.
onboarding.tour-tor-expect-differences.button=Rodyti DUK
-onboarding.tour-tor-expect-differences.next-button=Pereiti į Onion tarnybas
+onboarding.tour-tor-expect-differences.next-button=Pereiti į Onion paslaugas
-onboarding.tour-tor-onion-services=Onion tarnybos
+onboarding.tour-tor-onion-services=Onion paslaugos
onboarding.tour-tor-onion-services.title=Būkite papildomai apsaugoti.
-onboarding.tour-tor-onion-services.description=Onion tarnybos yra svetainės, kurių adresai baigiasi .onion - turinio leidėjams bei lankytojams jos suteikia papildomą apsaugą, įskaitant apsaugą prieš cenzūros. Onion tarnybos leidžia visiems skelbti turinį bei teikti paslaugas anonimiškai. Spustelėkite žemiau, norėdami apsilankyti DuckDuckGo onion svetainėje.
+onboarding.tour-tor-onion-services.description=Onion paslaugos yra svetainės, kurių adresai baigiasi .onion. Turinio leidėjams bei lankytojams jos suteikia papildomą apsaugą, įskaitant apsaugos priemones nuo cenzūros. Onion paslaugos leidžia visiems skelbti turinį bei teikti paslaugas anonimiškai. Spustelėkite žemiau, norėdami apsilankyti DuckDuckGo onion svetainėje.
onboarding.tour-tor-onion-services.button=Apsilankyti Onion
onboarding.tour-tor-onion-services.next-button=Atlikta
@@ -49,9 +49,9 @@ onboarding.tour-tor-update.prefix-new=Nauja
onboarding.tour-tor-update.prefix-updated=Atnaujinta
onboarding.tour-tor-toolbar=Įrankių juosta
-onboarding.tour-tor-toolbar-update-9.0.title=Viso gero Svogūno mygtuke.
+onboarding.tour-tor-toolbar-update-9.0.title=Viso gero, svogūno mygtuke.
onboarding.tour-tor-toolbar-update-9.0.description=Norime kad jūsų patirtis naudojantis Tor būtų pilnai integruota Tor Naršyklėje.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=Dėl to dabar, vietoj svogūno mygtuko naudojimo, galite Tor grandinę pamatyti per [i] URL juostoje ir duoti užklausą naujai tapatybei naudodamiesi įrankių juostos mygtuku arba [≡] meniu.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=Dėl to, dabar, vietoj to, kad naudotumėte svogūno mygtuką, galite matyti savo Tor grandinę per [i] URL adresų juostoje ir užklausti naują tapatybę naudodamiesi įrankių juostoje esančių mygtuku arba [≡] meniu.
onboarding.tour-tor-toolbar-update-9.0.button=Kaip duoti užklausą naujai tapatybei
onboarding.tour-tor-toolbar-update-9.0.next-button=Pereiti prie Tor tinklo
@@ -63,7 +63,7 @@ onboarding.tor-circuit-display.two-of-three=2 iš 3
onboarding.tor-circuit-display.three-of-three=3 iš 3
onboarding.tor-circuit-display.intro.title=Kaip veikia grandinės?
-onboarding.tor-circuit-display.intro.msg=Grandinės yra sudarytos iš atsitiktinai priskirtų retransliavimų, kurie savo ruožtu yra kompiuteriai visame pasaulyje sukonfigūruoti persiųsti Tor duomenų srautą. Grandinės jums leidžia naršyti privačiai ir prisijungti prie onion tarnybų.
+onboarding.tor-circuit-display.intro.msg=Grandinės yra sudarytos iš atsitiktinai priskirtų retransliavimų, kurie savo ruožtu yra kompiuteriai visame pasaulyje sukonfigūruoti persiųsti Tor duomenų srautą. Grandinės jums leidžia naršyti privačiai ir prisijungti prie onion paslaugų.
onboarding.tor-circuit-display.diagram.title=Grandinės rodinys
onboarding.tor-circuit-display.diagram.msg=Ši diagrama rodo retransliavimus, kurie sudaro šios internetinės svetainės grandinę. Norint neleisti susieti veiklos tarp įvairių svetainių, kiekviena svetainė gauna skirtingą grandinę.
commit 6ca2f8a03e303ee0b84d252e3669f803cdb6aead
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Dec 3 11:20:20 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
contents+lt.po | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/contents+lt.po b/contents+lt.po
index 3bcfec9df1..f4d0b4553b 100644
--- a/contents+lt.po
+++ b/contents+lt.po
@@ -200,8 +200,8 @@ msgid ""
"your real Internet (IP) address, and will not know who you are unless you "
"explicitly identify yourself."
msgstr ""
-"Svetainių operatoriai bei paslaugos, kuriomis naudojatės, ir visi kiti, kas "
-"jas stebi, vietoj jūsų tikrojo internetinio (IP) adreso, matys ryšį "
+"* Svetainių operatoriai bei paslaugos, kuriomis naudojatės, ir visi kiti, "
+"kas jas stebi, vietoj jūsų tikrojo internetinio (IP) adreso, matys ryšį "
"ateinantį iš Tor tinklo, ir jie nežinos kas jūs esate, nebent patys aiškiai "
"leisite jiems save atpažinti."
@@ -744,9 +744,10 @@ msgid ""
"bridges by Internet scanning. obfs4 bridges are less likely to be blocked "
"than its predecessor, obfs3 bridges."
msgstr ""
-"obfs4 leidžia Tor srautui atrodyti kaip atsitiktiniam ir taip neleisti "
-"cenzūruotojams rasti tiltų skenuojant Internetą. obfs4 tiltai turi mažesnį "
-"tikimybę būti užblokuoti, nei jų pirmtakai obfs3 tiltai"
+"obfs4 padaro taip, kad Tor duomenų srautas atrodo kaip atsitiktinis, ir "
+"tokiu būdu neleidžia cenzoriams rasti tinklų tiltus peržiūrint internetą. "
+"obfs4 tinklų tiltai turi mažesnę tikimybę būti užblokuoti, nei jų pirmtakai "
+"obfs3 tinklų tiltai."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
commit d82a57a377bab3a39ac37c3368cb49a9c5ab200e
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Dec 3 11:20:05 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin…
---
lt/torbrowser_strings.dtd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lt/torbrowser_strings.dtd b/lt/torbrowser_strings.dtd
index 722b1c1d8a..a8a1a05e57 100644
--- a/lt/torbrowser_strings.dtd
+++ b/lt/torbrowser_strings.dtd
@@ -19,9 +19,9 @@
<!ENTITY firstrun_tips_title "Patyrimo patarimai.">
<!ENTITY firstrun_tips_message "Su visomis Tor teikiamomis saugumo ir privatumo ypatybėmis, jūsų patyrimas naršant saityną gali būti šiek tiek kitoks. Priklausomai nuo jūsų saugumo lygmens, viskas gali veikti šiek tiek lėčiau, o kai kurie elementai - neveikti arba būti neįkeliami. Taip pat jūsų gali būti prašoma įrodyti, kad esate žmogus, o ne robotas.">
<!ENTITY firstrun_tips_next "Kitas">
-<!ENTITY firstrun_onionservices_tab_title "Onion tarnybos">
-<!ENTITY firstrun_onionservices_title "Onion tarnybos">
-<!ENTITY firstrun_onionservices_message "Onion svetainės yra tokios, kurių adresai baigiasi .onion - turinio skleidėjams bei lankytojams jos suteikia papildomą apsaugą, taip pat prideda apsaugą prieš cenzūrą. Onion svetainės leidžia visiems skelbti turinį bei teikti paslaugas anonimiškai.">
+<!ENTITY firstrun_onionservices_tab_title "Onion paslaugos">
+<!ENTITY firstrun_onionservices_title "Onion paslaugos.">
+<!ENTITY firstrun_onionservices_message "Onion paslaugos - tai svetainės, kurių adresai baigiasi .onion. Turinio leidėjams bei lankytojams jos suteikia papildomą apsaugą, įskaitant apsaugos priemones nuo cenzūros. Onion paslaugos leidžia visiems skelbti turinį bei teikti paslaugas anonimiškai.">
<!ENTITY firstrun_onionservices_next "Eiti naršyti">
<!ENTITY tor_bootstrap_swipe_for_logs "Perbraukite kairėn norėdami matyti Tor žurnalus">