[tor-commits] [tor-browser-build/master] Bump Fenix rebase number
commit 3b0257464ad3c5aa6e9f7ac6508d9c64ef30013f
Author: Matthew Finkel
Date: Wed Aug 25 01:02:59 2021 +
Bump Fenix rebase number
---
projects/fenix/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/fenix/config b/projects/fenix/config
index 8aa4c8f..e5e0b50 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -10,7 +10,7 @@ variant: Beta
var:
fenix_version: 91.2.0
torbrowser_branch: 11.0
- git_branch: 'tor-browser-[% c("var/fenix_version") %]-[%
c("var/torbrowser_branch") %]-1'
+ git_branch: 'tor-browser-[% c("var/fenix_version") %]-[%
c("var/torbrowser_branch") %]-2'
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
container:
use_container: 1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/main] Parse X-Forwarded-For addresses from left to right
commit abab8898363de90a35085e62d02f66b9b1af9980
Author: Cecylia Bocovich
Date: Thu Aug 12 17:29:05 2021 -0400
Parse X-Forwarded-For addresses from left to right
This parses X-Forwarded-For addresses from left to right since with the
domain fronting at moat we may have more than one external proxy
address. getClientIP is also updated to skip not only loopback addresses
but any non-valid address (such as private addresses) that may have been
in the header.
---
bridgedb/distributors/common/http.py | 31 +++---
bridgedb/distributors/moat/server.py | 36 +-
bridgedb/metrics.py| 4 +--
bridgedb/parse/addr.py | 22
bridgedb/test/test_distributors_common_http.py | 20 +++---
5 files changed, 45 insertions(+), 68 deletions(-)
diff --git a/bridgedb/distributors/common/http.py
b/bridgedb/distributors/common/http.py
index 3bd7b41..755a4c8 100644
--- a/bridgedb/distributors/common/http.py
+++ b/bridgedb/distributors/common/http.py
@@ -21,7 +21,7 @@ import logging
import os
from bridgedb.parse.addr import isIPAddress
-from bridgedb.parse.addr import isLoopback
+from bridgedb.parse.addr import isValidIP
#: The fully-qualified domain name for any and all web servers we run.
@@ -55,7 +55,7 @@ def getFQDN():
"""
return SERVER_PUBLIC_FQDN
-def getClientIP(request, useForwardedHeader=False, skipLoopback=False):
+def getClientIP(request, useForwardedHeader=False, skipInvalid=False):
"""Get the client's IP address from the ``'X-Forwarded-For:'``
header, or from the :api:`request `.
@@ -63,8 +63,8 @@ def getClientIP(request, useForwardedHeader=False,
skipLoopback=False):
:param request: A ``Request`` for a :api:`twisted.web.resource.Resource`.
:param bool useForwardedHeader: If ``True``, attempt to get the client's
IP address from the ``'X-Forwarded-For:'`` header.
-:param bool skipLoopback: If ``True``, and ``useForwardedHeader`` is
-also ``True``, then skip any loopback addresses (127.0.0.1/8) when
+:param bool skipInvalid: If ``True``, and ``useForwardedHeader`` is
+also ``True``, then validate and skip any invalid addresses when
parsing the X-Forwarded-For header.
:rtype: ``None`` or :any:`str`
:returns: The client's IP address, if it was obtainable.
@@ -74,19 +74,18 @@ def getClientIP(request, useForwardedHeader=False,
skipLoopback=False):
if useForwardedHeader:
header = request.getHeader("X-Forwarded-For")
if header:
-index = -1
-ip = header.split(",")[index].strip()
-if skipLoopback:
+values = header.split(",")
+for ip in values:
+ip = ip.strip()
+if not skipInvalid:
+break
logging.info(("Parsing X-Forwarded-For again, ignoring "
- "loopback addresses..."))
-while isLoopback(ip):
-index -= 1
-ip = header.split(",")[index].strip()
-if not skipLoopback and isLoopback(ip):
- logging.warn("Accepting loopback address: %s" % ip)
-else:
-if not isIPAddress(ip):
-logging.warn("Got weird X-Forwarded-For value %r" % header)
+ "invalid addresses..."))
+if isValidIP(ip):
+break
+if not isValidIP(ip):
+logging.warn("Got weird X-Forwarded-For value %r" % header)
+if skipInvalid:
ip = None
else:
ip = request.getClientIP()
diff --git a/bridgedb/distributors/moat/server.py
b/bridgedb/distributors/moat/server.py
index 7e83d94..fe03fc4 100644
--- a/bridgedb/distributors/moat/server.py
+++ b/bridgedb/distributors/moat/server.py
@@ -141,17 +141,17 @@ class JsonAPIResource(resource.Resource):
"""A resource which conforms to the `JSON API spec
[tor-commits] [bridgedb/main] Provide bridges of the configure transport by default on email distributor
commit b973b84b6c92ae9d95ed59da468ffe7a14c386fc
Author: meskio
Date: Tue Aug 24 11:06:32 2021 +0200
Provide bridges of the configure transport by default on email distributor
The default command 'get bridges' now now answers with 'DEFAULT_TRANSPORT'
(obfs4 for now) bridges. Adding a new command 'get vanilla' to be able
to get vanilla bridges if this is really the intent of the requester.
Closes: #40019
---
bridgedb/distributors/email/request.py | 17 -
bridgedb/strings.py| 7 ---
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/bridgedb/distributors/email/request.py
b/bridgedb/distributors/email/request.py
index 6484fe3..0fee7c7 100644
--- a/bridgedb/distributors/email/request.py
+++ b/bridgedb/distributors/email/request.py
@@ -64,6 +64,8 @@ GET_LINE = re.compile("([^>].*)?get")
IPV6_LINE = re.compile("([^>].*)?ipv6")
TRANSPORT_LINE = re.compile("([^>].*)?transport")
UNBLOCKED_LINE = re.compile("([^>].*)?unblocked")
+VANILLA_LINE = re.compile("([^>].*)?vanilla")
+
def determineBridgeRequestOptions(lines):
"""Figure out which :mod:`~bridgedb.filters` to apply.
@@ -80,6 +82,7 @@ def determineBridgeRequestOptions(lines):
"""
request = EmailBridgeRequest()
skippedHeaders = False
+requested_transport = False
for line in lines:
line = line.strip().lower()
@@ -93,20 +96,24 @@ def determineBridgeRequestOptions(lines):
if IPV6_LINE.match(line) is not None:
request.withIPv6()
if TRANSPORT_LINE.match(line) is not None:
+requested_transport = True
request.withPluggableTransportType(line)
if UNBLOCKED_LINE.match(line) is not None:
request.withoutBlockInCountry(line)
+if VANILLA_LINE.match(line) is not None:
+requested_transport = True
+
+# If not transport requested we will respond with our default transport
protocol.
+if not requested_transport:
+# Note that this variable must satisfy TRANSPORT_PATTERN.
+default_transport = "transport %s" % strings._getDefaultTransport()
+request.withPluggableTransportType(default_transport)
# We cannot expect all users to understand BridgeDB's commands, so we will
# return bridges even if the request was invalid.
if not request.isValid():
logging.debug("Email request was invalid.")
request.isValid(True)
-# We will respond with our default transport protocol.
-if not len(request.transports):
-# Note that this variable must satisfy TRANSPORT_PATTERN.
-default_transport = "transport %s" % strings._getDefaultTransport()
-request.withPluggableTransportType(default_transport)
logging.debug("Generating hashring filters for request.")
request.generateFilters()
diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 2a1e60d..09eb91b 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -170,9 +170,10 @@ bridge" field."""),
}
EMAIL_COMMANDS = {
-"get bridges": _("(Request unobfuscated Tor bridges.)"),
-"get ipv6": _("(Request IPv6 bridges.)"),
-"get transport obfs4": _("(Request obfs4 obfuscated bridges.)"),
+"get bridges": _("(Request default Tor bridges.)"),
+"get ipv6": _("(Request IPv6 bridges.)"),
+"get transport obfs4": _("(Request obfs4 obfuscated bridges.)"),
+"get vanilla": _("(Request unobfuscated Tor bridges.)"),
# TRANSLATORS: Please DO NOT translate "BridgeDB".
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/main] Install python3 dependencies
commit ede084a1469385e1d8aec38d9eef2d501a6d3350
Author: meskio
Date: Tue Aug 24 11:57:05 2021 +0200
Install python3 dependencies
Fixes the tests on the CI
---
scripts/install-dependencies | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/install-dependencies b/scripts/install-dependencies
index 67dfde5..4b5e435 100755
--- a/scripts/install-dependencies
+++ b/scripts/install-dependencies
@@ -8,7 +8,7 @@ APT_FLAGS='-q --no-install-suggests --no-install-recommends'
PIP=$(which pip)
PIP_FLAGS='--no-binary :all'
-DEPENDS="build-essential openssl sqlite3 python-dev python-setuptools"
+DEPENDS="build-essential openssl sqlite3 python3-dev python3-setuptools"
DEPENDS="${DEPENDS} libgeoip-dev geoip-database libjpeg-dev"
HERE=$(dirname $0)
@@ -19,7 +19,7 @@ if [ "$EUID" != "0" ] ; then SUDO=$(which sudo); fi
if [ "$TRAVIS" == "true" ] ; then
DEPENDS="${DEPENDS} realpath"
else
-DEPENDS="${DEPENDS} python-pip flog"
+DEPENDS="${DEPENDS} python3-pip flog"
fi
if [ "$CI" == "true" ] ; then
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add new Tor Browser version 11.0a5
commit 8a8de60feb9d1df17d4d2396ac3008e3a7099cb8 Author: Matthew Finkel Date: Tue Aug 24 15:48:38 2021 + Add new Tor Browser version 11.0a5 --- databags/versions.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 324bccf2..709099a3 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -12,13 +12,13 @@ version = 10.5.5 version = 10.5.5 [torbrowser-alpha] -version = 11.0a4 +version = 11.0a5 [torbrowser-android-alpha] -version = 11.0a4 +version = 11.0a5 [torbrowser-win-alpha] -version = 11.0a4 +version = 11.0a5 [tor-stable] version = 0.4.6.7 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [snowflake/main] Fix compile bug in client, caught by CI
commit ace8df37ed39d77f9db97ead6e9ebac5a8148285
Author: Cecylia Bocovich
Date: Tue Aug 24 10:27:24 2021 -0400
Fix compile bug in client, caught by CI
---
client/snowflake.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/snowflake.go b/client/snowflake.go
index 4ed4fd6..d952275 100644
--- a/client/snowflake.go
+++ b/client/snowflake.go
@@ -90,7 +90,7 @@ func socksAcceptLoop(ln *pt.SocksListener, config
sf.ClientConfig, shutdown chan
log.Println("Failed to start snowflake
transport: ", err)
return
}
- err := conn.Grant({IP: net.IPv4zero, Port:
0})
+ err = conn.Grant({IP: net.IPv4zero, Port:
0})
if err != nil {
log.Printf("conn.Grant error: %s", err)
return
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
commit 282dd02b0762494396b6c917ae99fd6c30db9ec5 Author: Translation commit bot Date: Tue Aug 24 09:47:49 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed --- en-GB/network-settings.dtd | 13 + 1 file changed, 13 insertions(+) diff --git a/en-GB/network-settings.dtd b/en-GB/network-settings.dtd index b0d38062a7..1b8505478e 100644 --- a/en-GB/network-settings.dtd +++ b/en-GB/network-settings.dtd @@ -66,6 +66,9 @@ + + + @@ -81,3 +84,13 @@ + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
commit fa52be69b0ba04cf9899c53bff59db15d27b41b5 Author: Translation commit bot Date: Tue Aug 24 09:47:46 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed --- en-GB/torlauncher.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en-GB/torlauncher.properties b/en-GB/torlauncher.properties index e77f00e09f..16a8e36ccb 100644 --- a/en-GB/torlauncher.properties +++ b/en-GB/torlauncher.properties @@ -93,3 +93,5 @@ # torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. # torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. # torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. + +# torlauncher.copiedNLogMessagesShort=Copied %S Logs ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
commit e658824e677c37c7479d624cda0dcf8904287441 Author: Translation commit bot Date: Tue Aug 24 09:47:25 2021 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd --- en-GB/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en-GB/torbutton.dtd b/en-GB/torbutton.dtd index 9f65cc0f86..76d6703c08 100644 --- a/en-GB/torbutton.dtd +++ b/en-GB/torbutton.dtd @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
commit 03e512cf805f87219797ab2e0b850dc1d3005887 Author: Translation commit bot Date: Tue Aug 24 09:47:23 2021 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed --- en-GB/torbutton.properties | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/en-GB/torbutton.properties b/en-GB/torbutton.properties index fb0da55b7d..b79f764bba 100644 --- a/en-GB/torbutton.properties +++ b/en-GB/torbutton.properties @@ -124,6 +124,12 @@ # onionServices.authPreferences.removeAll=Remove All # onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor # onionServices.authPreferences.failedToRemoveKey=Unable to remove key +# onionServices.v2Deprecated.pageTitle=V2 Onion Site Deprecation Warning +# onionServices.v2Deprecated.header=Version 2 Onion Sites will be deprecated soon +# onionServices.v2Deprecated=This onion site will not be reachable soon. Please contact the site administrator and encourage them to upgrade. +# onionServices.v2Deprecated.longDescription=Tor is ending its support for version 2 onion services beginning in July 2021, and this onion site will no longer be reachable at this address. If you are the site administrator, upgrade to a version 3 onion service soon. +# onionServices.v2Deprecated.tryAgain=Got it +# onionServices.v2Deprecated.tooltip=This onion site will not be reachable soon # Onion-Location strings. # onionLocation.alwaysPrioritize=Always Prioritize Onions @@ -139,7 +145,7 @@ # onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. # onionLocation.onionServicesTitle=Onion Services -# LOCALIZATION NOTE: %S will be replaced with the crytocurrency address. +# LOCALIZATION NOTE: %S will be replaced with the cryptocurrency address. # cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. # cryptoSafetyPrompt.whatCanHeading=What can you do about it? # cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit f907dac13cfdd888abf961123fe17d7cb914e262 Author: Translation commit bot Date: Tue Aug 24 09:46:46 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- en_GB.po | 5 +++-- es_AR.po | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/en_GB.po b/en_GB.po index d8adfe8f97..6c57752960 100644 --- a/en_GB.po +++ b/en_GB.po @@ -7,13 +7,14 @@ # Billy Humphreys , 2014 # newharha ehrara , 2015 # Richard Shaylor , 2014 +# Waldo Luis Ribeiro, 2021 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-08-18 10:11+0200\n" -"PO-Revision-Date: 2021-08-18 09:25+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-08-24 09:36+\n" +"Last-Translator: Waldo Luis Ribeiro\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/es_AR.po b/es_AR.po index ce2a9f4e18..893a7829b3 100644 --- a/es_AR.po +++ b/es_AR.po @@ -11,14 +11,15 @@ # ezemelano , 2014 # Pablo Di Noto , 2016 # psss , 2016 +# Waldo Luis Ribeiro, 2021 # Zuhualime Akoochimoya, 2018-2021 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-08-18 10:11+0200\n" -"PO-Revision-Date: 2021-08-21 16:19+\n" -"Last-Translator: Zuhualime Akoochimoya\n" +"PO-Revision-Date: 2021-08-24 09:44+\n" +"Last-Translator: Waldo Luis Ribeiro\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit b60e64cf0498089e7672b47721192bf735e68659
Author: Translation commit bot
Date: Tue Aug 24 09:45:54 2021 +
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
en_GB.po | 233 ---
es_AR.po | 59
2 files changed, 147 insertions(+), 145 deletions(-)
diff --git a/en_GB.po b/en_GB.po
index 2fe3edfade..a2d5063dc9 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -7,13 +7,14 @@
# Billy Humphreys , 2014
# newharha ehrara , 2015
# Richard Shaylor , 2014
+# Waldo Luis Ribeiro, 2021
msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-08-18 10:11+0200\n"
-"PO-Revision-Date: 2021-08-18 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-08-24 09:36+\n"
+"Last-Translator: Waldo Luis Ribeiro\n"
"Language-Team: English (United Kingdom)
(http://www.transifex.com/otf/torproject/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +95,7 @@ msgstr "_Exit"
#:
config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/DownloadProgress.pm:59
msgid "Unknown time"
-msgstr ""
+msgstr "Unknown time"
#. Translators: Don't translate {count}, it's a place holder and
#. will be replaced.
@@ -261,7 +262,7 @@ msgstr "The available incremental upgrade requires
{memory_needed} of free memor
msgid ""
"An error ocurred while detecting available upgrades.\n"
"This should not happen. Please report a bug."
-msgstr ""
+msgstr "An error occurred while detecting available upgrades.\nThis should not
happen. Please report a bug."
#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:469
#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:488
@@ -477,16 +478,16 @@ msgstr "_Administration Password"
#:
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:187
msgid "_MAC Address Anonymization"
-msgstr ""
+msgstr "_MAC Address Anonymisation"
#:
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:250
msgid "_Offline Mode"
-msgstr ""
+msgstr "_Offline Mode"
#:
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
#:
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
msgid "Enable networking (default)"
-msgstr ""
+msgstr "Enable networking (default)"
#:
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:261
#:
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:459
@@ -499,7 +500,7 @@ msgstr "_Network Connection"
#:
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:324
msgid "Obsolete"
-msgstr ""
+msgstr "Obsolete"
#:
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:339
msgid "_Unsafe Browser"
@@ -1149,11 +1150,11 @@ msgstr "Language, administration password, and
additional settings"
#:
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
msgid "Tor Bridges"
-msgstr ""
+msgstr "Tor Bridges"
#:
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
msgid "Save the last bridges that you used to connect to Tor"
-msgstr ""
+msgstr "Save the last bridges that you used to connect to Tor"
#:
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
msgid "Browser Bookmarks"
@@ -1229,7 +1230,7 @@ msgstr "Dotfiles"
#:
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:240
msgid "Symlink every file in the Dotfiles folder into the Home folder"
-msgstr ""
+msgstr "Symlink every file in the Dotfiles folder into the Home folder"
#:
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
msgid "Custom"
@@ -1598,7 +1599,7 @@ msgstr "[package not available]"
#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:68
msgid "Failed to synchronize the clock!"
-msgstr "Failed to synchronize the clock!"
+msgstr "Failed to synchronise the clock!"
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
msgid "Lock Screen"
@@ -1640,7 +1641,7 @@ msgstr "Network card ${nic} disabled"
msgid ""
"MAC address anonymization failed for network card ${nic_name} (${nic}) so it
is temporarily disabled.\n"
"You might prefer to restart Tails and disable MAC address anonymization."
-msgstr ""
+msgstr "MAC address anonymisation failed for network card ${nic_name} (${nic})
so it is temporarily disabled.\nYou might prefer to restart Tails and disable
MAC address anonymisation."
#:
[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
commit dcaa7beb76aa17fe799e5f9f9e5160031f238feb Author: Translation commit bot Date: Tue Aug 24 09:45:38 2021 + https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot --- code_of_conduct+en_GB.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code_of_conduct+en_GB.po b/code_of_conduct+en_GB.po index 1c1c37d17a..62555bd833 100644 --- a/code_of_conduct+en_GB.po +++ b/code_of_conduct+en_GB.po @@ -6,6 +6,7 @@ # # Translators: # Andi Chandler , 2020 +# Waldo Luis Ribeiro, 2021 # #, fuzzy msgid "" @@ -13,7 +14,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+\n" "PO-Revision-Date: 2019-08-27 18:54+\n" -"Last-Translator: Andi Chandler , 2020\n" +"Last-Translator: Waldo Luis Ribeiro, 2021\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,7 +84,7 @@ msgid "" "involves sustained effort." msgstr "" "This code of conduct is not exhaustive or complete. It is an ongoing effort " -"to summarize our shared understanding. We want to provide a welcoming, safe " +"to summarise our shared understanding. We want to provide a welcoming, safe " "environment, so we can work together to pursue powerful solutions. We " "reserve the right to deviate from strictly enforcing this code. Any " "deviations must produce an outcome which is fairer, and aligned with our " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
