15 Oct '19
commit c6f7b83915888c9b4b61a8aa6ae39ec1b2248b71
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Mon Sep 30 17:43:22 2019 +0200
Make Jetty listen host configurable.
The default listen host is still 127.0.0.1, but now it's possible to
configure a different listen host, like 0.0.0.0, which can facilitate
local testing.
---
src/main/resources/jetty.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/resources/jetty.xml b/src/main/resources/jetty.xml
index e1e4d4d..56887f7 100644
--- a/src/main/resources/jetty.xml
+++ b/src/main/resources/jetty.xml
@@ -75,7 +75,9 @@
<Set name="port">
<SystemProperty name="exonerator.jetty.port" default="8080" />
</Set>
- <Set name="host">127.0.0.1</Set>
+ <Set name="host">
+ <SystemProperty name="exonerator.jetty.host" default="127.0.0.1" />
+ </Set>
</New>
</Arg>
</Call>
1
0
15 Oct '19
commit b0165cb03138e933a337ddc8400c3a8bbe889b3d
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Mon Sep 30 17:44:38 2019 +0200
Print out a warning if we're missing data.
We're now counting the hours for which we have statuses and exit
lists. More precisely, we're truncating consensus valid-after times
and exit scan times to the hour and counting how many distinct hours
we saw during the requested time. If we're missing 18 or more hours of
statuses or exit lists we're printing out a note in the summary.
Fixes #31071.
---
.../metrics/exonerator/ExoneraTorServlet.java | 43 ++++++++++++++++------
.../metrics/exonerator/QueryResponse.java | 21 ++++++++++-
.../metrics/exonerator/QueryServlet.java | 24 +++++++++++-
src/main/resources/ExoneraTor.properties | 1 +
src/main/sql/exonerator2.sql | 42 +++++++++++++++------
.../metrics/exonerator/ExoneraTorServletTest.java | 2 +-
.../metrics/exonerator/QueryResponseTest.java | 12 ++++--
7 files changed, 112 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index a74aa60..4b0cf16 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -89,6 +89,7 @@ public class ExoneraTorServlet extends HttpServlet {
ExoneraTorDate firstDate = ExoneraTorDate.INVALID;
ExoneraTorDate lastDate = ExoneraTorDate.INVALID;
boolean noRelevantConsensuses = true;
+ boolean missingData = false;
List<String[]> statusEntries = new ArrayList<>();
List<String> addressesInSameNetwork = null;
@@ -105,6 +106,14 @@ public class ExoneraTorServlet extends HttpServlet {
&& queryResponse.relevantStatuses) {
noRelevantConsensuses = false;
}
+ if (null != queryResponse.missingStatuses
+ && queryResponse.missingStatuses) {
+ missingData = true;
+ }
+ if (null != queryResponse.missingExitLists
+ && queryResponse.missingExitLists) {
+ missingData = true;
+ }
if (null != queryResponse.matches) {
for (QueryResponse.Match match : queryResponse.matches) {
StringBuilder sb = new StringBuilder();
@@ -210,15 +219,18 @@ public class ExoneraTorServlet extends HttpServlet {
/* Print out result. */
} else {
if (!statusEntries.isEmpty()) {
- this.writeSummaryPositive(out, rb, relayIp, requestedDate.asString);
+ this.writeSummaryPositive(out, rb, relayIp, requestedDate.asString,
+ missingData);
this.writeTechnicalDetails(out, rb, relayIp, requestedDate.asString,
statusEntries);
} else if (addressesInSameNetwork != null
&& !addressesInSameNetwork.isEmpty()) {
this.writeSummaryAddressesInSameNetwork(out, rb, requestUrl, relayIp,
- requestedDate.asString, langStr, addressesInSameNetwork);
+ requestedDate.asString, langStr, addressesInSameNetwork,
+ missingData);
} else {
- this.writeSummaryNegative(out, rb, relayIp, requestedDate.asString);
+ this.writeSummaryNegative(out, rb, relayIp, requestedDate.asString,
+ missingData);
}
this.writePermanentLink(out, rb, requestUrl, relayIp,
requestedDate.asString, langStr);
@@ -398,13 +410,13 @@ public class ExoneraTorServlet extends HttpServlet {
private void writeSummaryNoTimestamp(PrintWriter out, ResourceBundle rb) {
this.writeSummary(out, rb.getString("summary.heading"),
"panel-danger",
- rb.getString("summary.invalidparams.notimestamp.title"), null,
+ rb.getString("summary.invalidparams.notimestamp.title"), null, null,
rb.getString("summary.invalidparams.notimestamp.body"));
}
private void writeSummaryNoIp(PrintWriter out, ResourceBundle rb) {
this.writeSummary(out, rb.getString("summary.heading"),
- "panel-danger", rb.getString("summary.invalidparams.noip.title"),
+ "panel-danger", rb.getString("summary.invalidparams.noip.title"), null,
null, rb.getString("summary.invalidparams.noip.body"));
}
@@ -413,7 +425,7 @@ public class ExoneraTorServlet extends HttpServlet {
String lastDate) {
this.writeSummary(out, rb.getString("summary.heading"),
"panel-danger",
- rb.getString("summary.invalidparams.timestamprange.title"), null,
+ rb.getString("summary.invalidparams.timestamprange.title"), null, null,
rb.getString("summary.invalidparams.timestamprange.body"),
timestampStr, firstDate, lastDate);
}
@@ -438,7 +450,7 @@ public class ExoneraTorServlet extends HttpServlet {
: StringEscapeUtils.escapeHtml4(timestampParameter);
this.writeSummary(out, rb.getString("summary.heading"),
"panel-danger",
- rb.getString("summary.invalidparams.invalidtimestamp.title"),
+ rb.getString("summary.invalidparams.invalidtimestamp.title"), null,
null, rb.getString("summary.invalidparams.invalidtimestamp.body"),
escapedTimestampParameter, "\"YYYY-MM-DD\"");
}
@@ -446,7 +458,7 @@ public class ExoneraTorServlet extends HttpServlet {
private void writeSummaryTimestampTooRecent(PrintWriter out,
ResourceBundle rb) {
this.writeSummary(out, rb.getString("summary.heading"), "panel-danger",
- rb.getString("summary.invalidparams.timestamptoorecent.title"),
+ rb.getString("summary.invalidparams.timestamptoorecent.title"), null,
null, rb.getString("summary.invalidparams.timestamptoorecent.body"));
}
@@ -465,7 +477,8 @@ public class ExoneraTorServlet extends HttpServlet {
void writeSummaryAddressesInSameNetwork(PrintWriter out,
ResourceBundle rb, String requestUrl, String relayIp, String timestampStr,
- String langStr, List<String> addressesInSameNetwork) {
+ String langStr, List<String> addressesInSameNetwork,
+ boolean missingData) {
Object[][] panelItems = new Object[addressesInSameNetwork.size()][];
for (int i = 0; i < addressesInSameNetwork.size(); i++) {
String addressInSameNetwork = addressesInSameNetwork.get(i);
@@ -486,33 +499,36 @@ public class ExoneraTorServlet extends HttpServlet {
this.writeSummary(out, rb.getString("summary.heading"),
"panel-warning",
rb.getString("summary.negativesamenetwork.title"), panelItems,
+ missingData ? rb.getString("summary.missingdata") : null,
rb.getString("summary.negativesamenetwork.body"),
relayIp, timestampStr, relayIp.contains(":") ? 48 : 24);
}
private void writeSummaryPositive(PrintWriter out, ResourceBundle rb,
- String relayIp, String timestampStr) {
+ String relayIp, String timestampStr, boolean missingData) {
String formattedRelayIp = relayIp.contains(":")
? "[" + relayIp + "]" : relayIp;
this.writeSummary(out, rb.getString("summary.heading"),
"panel-success", rb.getString("summary.positive.title"), null,
+ missingData ? rb.getString("summary.missingdata") : null,
rb.getString("summary.positive.body"), formattedRelayIp,
timestampStr);
}
private void writeSummaryNegative(PrintWriter out, ResourceBundle rb,
- String relayIp, String timestampStr) {
+ String relayIp, String timestampStr, boolean missingData) {
String formattedRelayIp = relayIp.contains(":")
? "[" + relayIp + "]" : relayIp;
this.writeSummary(out, rb.getString("summary.heading"),
"panel-warning", rb.getString("summary.negative.title"), null,
+ missingData ? rb.getString("summary.missingdata") : null,
rb.getString("summary.negative.body"), formattedRelayIp,
timestampStr);
}
private void writeSummary(PrintWriter out, String heading,
String panelContext, String panelTitle, Object[][] panelItems,
- String panelBodyTemplate, Object... panelBodyArgs) {
+ String panelWarning, String panelBodyTemplate, Object... panelBodyArgs) {
out.printf(" <div class=\"row\">\n"
+ " <div class=\"col-xs-12\">\n"
+ " <h2>%s</h2>\n"
@@ -531,6 +547,9 @@ public class ExoneraTorServlet extends HttpServlet {
}
out.print(" </ul>\n");
}
+ if (null != panelWarning) {
+ out.printf(" <p>%s</p>\n", panelWarning);
+ }
out.print(" </div><!-- panel-body -->\n"
+ " </div><!-- panel -->\n"
+ " </div><!-- col -->\n"
diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java
index 6a8976a..d148d0c 100644
--- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java
+++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java
@@ -21,7 +21,7 @@ public class QueryResponse {
private static Logger logger = LoggerFactory.getLogger(QueryResponse.class);
/* Actual version implemented by this class. */
- private static final String VERSION = "1.0";
+ private static final String VERSION = "1.1";
/* Don't accept query responses with versions lower than this. */
private static final String FIRSTRECOGNIZEDVERSION = "1.0";
@@ -60,6 +60,20 @@ public class QueryResponse {
* a day of the requested date; {@code null} if the database is empty. */
Boolean relevantStatuses;
+ /** Whether there are at least 18 hours of statuses missing in the database
+ * within a day of the requested date; {@code null} if the database is
+ * empty.
+ *
+ * @since 1.1 */
+ Boolean missingStatuses;
+
+ /** Whether there are at least 18 hours of exit lists missing in the database
+ * from two days before the requested date until one day after; {@code null}
+ * if the database is empty.
+ *
+ * @since 1.1 */
+ Boolean missingExitLists;
+
/** All matches for the given IP address and date; {@code null} if there
* were no matches at all. */
Match[] matches;
@@ -70,13 +84,16 @@ public class QueryResponse {
/** Constructor for tests. */
QueryResponse(String version, String queryAddress, String queryDate,
String firstDateInDatabase, String lastDateInDatabase,
- Boolean relevantStatuses, Match[] matches, String[] nearbyAddresses) {
+ Boolean relevantStatuses, Boolean missingStatuses,
+ Boolean missingExitLists, Match[] matches, String[] nearbyAddresses) {
this.version = version;
this.queryAddress = queryAddress;
this.queryDate = queryDate;
this.firstDateInDatabase = firstDateInDatabase;
this.lastDateInDatabase = lastDateInDatabase;
this.relevantStatuses = relevantStatuses;
+ this.missingStatuses = missingStatuses;
+ this.missingExitLists = missingExitLists;
this.matches = matches;
this.nearbyAddresses = nearbyAddresses;
}
diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
index 760e385..17980a9 100644
--- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
@@ -54,6 +54,10 @@ public class QueryServlet extends HttpServlet {
= DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
.withZone(ZoneOffset.UTC);
+ private static final int MISSING_STATUSES_IF_LESS_THAN = 3 * 24 - 17;
+
+ private static final int MISSING_EXIT_LISTS_IF_LESS_THAN = 4 * 24 - 17;
+
@Override
public void init() {
this.logger = LoggerFactory.getLogger(QueryServlet.class);
@@ -264,6 +268,14 @@ public class QueryServlet extends HttpServlet {
* {first|last}_date_in_database and relevant_statuses fields. */
SortedSet<LocalDate> allDates = new TreeSet<>();
+ /* Store all hours for which the database contains relevant status
+ * entries. */
+ Set<LocalDateTime> allStatusHours = new HashSet<>();
+
+ /* Store all hours for which the database contains relevant exit list
+ * entries. */
+ Set<LocalDateTime> allExitListHours = new HashSet<>();
+
/* Store all possible matches for the results table by base64-encoded
* fingerprint and valid-after time. This map is first populated by going
* through the result set and adding or updating map entries, so that
@@ -309,12 +321,12 @@ public class QueryServlet extends HttpServlet {
String orAddress = rs.getString(8);
if (null != date) {
allDates.add(date);
- } else if (null != scanned) {
+ } else if (null != scanned && null != fingerprintBase64) {
exitAddressesByFingeprintBase64AndScanned.putIfAbsent(
fingerprintBase64, new TreeMap<>());
exitAddressesByFingeprintBase64AndScanned.get(fingerprintBase64)
.put(scanned, exitAddress);
- } else if (null != validAfter) {
+ } else if (null != validAfter && null != fingerprintBase64) {
matchesByFingerprintBase64AndValidAfter.putIfAbsent(
fingerprintBase64, new TreeMap<>());
if (!matchesByFingerprintBase64AndValidAfter
@@ -338,6 +350,10 @@ public class QueryServlet extends HttpServlet {
}
matchesByAddress.putIfAbsent(orAddress, new HashSet<>());
matchesByAddress.get(orAddress).add(match);
+ } else if (null != validAfter) {
+ allStatusHours.add(validAfter);
+ } else if (null != scanned) {
+ allExitListHours.add(scanned);
}
}
} catch (SQLException e) {
@@ -394,6 +410,10 @@ public class QueryServlet extends HttpServlet {
|| allDates.contains(timestamp.minusDays(1L))
|| allDates.contains(timestamp.plusDays(1L));
}
+ response.missingStatuses = allStatusHours.size()
+ < MISSING_STATUSES_IF_LESS_THAN;
+ response.missingExitLists = allExitListHours.size()
+ < MISSING_EXIT_LISTS_IF_LESS_THAN;
if (matchesByAddress.containsKey(relayIp)) {
List<QueryResponse.Match> matchesList
= new ArrayList<>(matchesByAddress.get(relayIp));
diff --git a/src/main/resources/ExoneraTor.properties b/src/main/resources/ExoneraTor.properties
index 05bb0cb..a67d880 100644
--- a/src/main/resources/ExoneraTor.properties
+++ b/src/main/resources/ExoneraTor.properties
@@ -30,6 +30,7 @@ summary.positive.title=Result is positive
summary.positive.body=We found one or more Tor relays on IP address %s on or within a day of %s that Tor clients were likely to know.
summary.negative.title=Result is negative
summary.negative.body=We did not find IP address %s on or within a day of %s.
+summary.missingdata=However, the database is missing several hours of data for this specific request, so that this result must be interpreted carefully.
technicaldetails.heading=Technical details
technicaldetails.pre=Looking up IP address %s on or within one day of %s. Tor clients could have selected this or these Tor relays to build circuits.
technicaldetails.colheader.timestamp=Timestamp (UTC)
diff --git a/src/main/sql/exonerator2.sql b/src/main/sql/exonerator2.sql
index 397d2bf..ef017d3 100755
--- a/src/main/sql/exonerator2.sql
+++ b/src/main/sql/exonerator2.sql
@@ -279,20 +279,24 @@ CREATE OR REPLACE FUNCTION insert_exitlistentry_exitaddress (
END;
$$ LANGUAGE 'plpgsql';
--- Search for (1) status entries with an IPv4 or IPv6 onion routing address in
--- the same /24 network as the given hex-encoded IP address prefix and with a
--- valid-after date within a day of the given date, (2) exit list entries with
--- an IPv4 exit address in the same /24 network and with a scan time not earlier
--- than two days before and not later than one day after the given date, and (3)
--- the last and first dates in the database as well as the dates for which the
--- database contains relevant data within a day of the given date.
+-- Search by date and /24 IPv4 or IPv6 prefix for:
+-- - exit list entries with an IPv4 exit address in the same /24 network and
+-- with a scan time not earlier than two days before and not later than one
+-- day after the given date,
+-- - status entries with an IPv4 or IPv6 onion routing address in the same /24
+-- network as the given hex-encoded IP address prefix and with a valid-after
+-- date within a day of the given date,
+-- - the first and last dates in the database as well as the dates for which
+-- the database contains relevant data within a day of the given date,
+-- - the hours for which the database contains relevant exit list entries, and
+-- - the hours for which the database contains relevant status entries.
--
-- This function makes heavy use of the date_address24 table in order to reduce
-- query response time by first obtaining all relevant fingerprint identifiers.
--- In the next step it runs three selects to obtain status entries, exit list
--- entries, and relevant dates. Any postprocessing, including filtering by exact
--- IP address or matching status entries and exit list entries, needs to happen
--- at the caller.
+-- In the next step it runs five selects to obtain status entries, exit list
+-- entries, relevant dates, and relevant hours. Any postprocessing, including
+-- filtering by exact IP address or matching status entries and exit list
+-- entries, needs to happen at the caller.
CREATE OR REPLACE FUNCTION search_by_date_address24 (
search_date DATE, search_address24 CHARACTER(6))
RETURNS TABLE(
@@ -339,7 +343,21 @@ CREATE OR REPLACE FUNCTION search_by_date_address24 (
WHERE date IN (SELECT MIN(date) FROM date_address24 UNION
SELECT MAX(date) FROM date_address24 UNION
SELECT date FROM date_address24
- WHERE date >= $1 - 1 AND date <= $1 + 1)'
+ WHERE date >= $1 - 1 AND date <= $1 + 1)
+ UNION
+ SELECT NULL AS date, NULL AS fingerprint_base64,
+ DATE_TRUNC(''hour'', scanned) AS scanned, NULL AS exitaddress,
+ NULL AS validafter, NULL AS nickname, NULL AS exit, NULL AS oraddress
+ FROM exitlistentry_exitaddress
+ WHERE DATE(exitlistentry_exitaddress.scanned) >= $1 - 2
+ AND DATE(exitlistentry_exitaddress.scanned) <= $1 + 1
+ UNION
+ SELECT NULL AS date, NULL AS fingerprint_base64, NULL AS scanned,
+ NULL AS exitaddress, DATE_TRUNC(''hour'', validafter) AS validafter,
+ NULL AS nickname, NULL AS exit, NULL AS oraddress
+ FROM statusentry_oraddress
+ WHERE DATE(statusentry_oraddress.validafter) >= $1 - 1
+ AND DATE(statusentry_oraddress.validafter) <= $1 + 1'
USING search_date, search_address24;
END;
$$ LANGUAGE plpgsql;
diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java
index 1ede590..64656da 100644
--- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java
+++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java
@@ -50,7 +50,7 @@ public class ExoneraTorServletTest {
StringWriter sw = new StringWriter();
es.writeSummaryAddressesInSameNetwork(new PrintWriter(sw), rb,
"http://localhost:8080/", qr.queryAddress, qr.queryDate, "en",
- Arrays.asList(qr.nearbyAddresses));
+ Arrays.asList(qr.nearbyAddresses), false);
String errorMsg = "Test data:" + QueryResponse.toJson(qr)
+ "\nresult:\n" + sw.toString();
assertTrue(errorMsg,
diff --git a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java
index 97ae88d..826da1c 100644
--- a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java
+++ b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java
@@ -42,10 +42,12 @@ public class QueryResponseTest {
+ "\"exit\":false}],\"nearby_addresses\":[\"12.13.14.15\","
+ "\"12.13.14.16\"]}"},
{new QueryResponse("1.1", null, null, null,
- null, false, null, null),
- "{\"version\":\"1.1\",\"relevant_statuses\":false}"},
+ null, false, true, true, null, null),
+ "{\"version\":\"1.1\",\"relevant_statuses\":false,"
+ + "\"missing_statuses\":true,"
+ + "\"missing_exit_lists\":true}"},
{new QueryResponse("1.0", "12.13.14.15", "2016-12-12", "2016-01-01",
- "2016-12-31", true,
+ "2016-12-31", true, false, false,
new QueryResponse.Match[]{new QueryResponse.Match("2016-12-03",
new TreeSet<>(Arrays.asList("12.13.14.15", "12.13.14.16")),
"fingerprint-not-checked", "some name", true),
@@ -59,6 +61,8 @@ public class QueryResponseTest {
+ "\"first_date_in_database\":\"2016-01-01\","
+ "\"last_date_in_database\":\"2016-12-31\","
+ "\"relevant_statuses\":true,"
+ + "\"missing_statuses\":false,"
+ + "\"missing_exit_lists\":false,"
+ "\"matches\":[{\"timestamp\":\"2016-12-03\","
+ "\"addresses\":[\"12.13.14.15\","
+ "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\","
@@ -70,7 +74,7 @@ public class QueryResponseTest {
+ "\"exit\":false}],\"nearby_addresses\":[\"12.13.14.15\","
+ "\"12.13.14.16\"]}"},
{new QueryResponse("1.0", "12.13.14.15", "2016-12-12", "2016-01-01",
- "2016-12-31", false,
+ "2016-12-31", false, null, null,
new QueryResponse.Match[]{new QueryResponse.Match("2016-12-03",
new TreeSet<>(Arrays.asList("12.13.14.15", "12.13.14.16")),
"fingerprint-not-checked", "some name", null),
1
0
commit 45c5285a3514d7c5acc3fcf040eb18dcfd8b7e16
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Mon Sep 30 17:42:33 2019 +0200
Update to latest metrics-base.
---
src/build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/build b/src/build
index 07c2a00..62a964a 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4
+Subproject commit 62a964a7702086ca6ba0e2307809d4f983163b47
1
0
[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 15 Oct '19
by translation＠torproject.org 15 Oct '19
15 Oct '19
commit 984170413b4420f303a81bc4a9df4269569ff85e
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Oct 15 13:52:39 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ…
---
lt/network-settings.dtd | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index fafaba118..2c3c55125 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "">
<!ENTITY torsettings.useProxy.checkbox "">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "">
+<!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas">
<!ENTITY torsettings.useProxy.type.placeholder "">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresas:">
+<!ENTITY torsettings.useProxy.address "">
<!ENTITY torsettings.useProxy.address.placeholder "">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Prievadas:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Naudotojo vardas:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Slaptažodis:">
+<!ENTITY torsettings.useProxy.port "">
+<!ENTITY torsettings.useProxy.username "">
+<!ENTITY torsettings.useProxy.password "">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Šis kompiuteris jungiasi per užkardą, kuri leidžia jungtis tik prie tam tikrų prievadų">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai:">
+<!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai">
<!ENTITY torsettings.useBridges.checkbox "">
<!ENTITY torsettings.useBridges.default "">
<!ENTITY torsettings.useBridges.default.placeholder "">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "">
<!ENTITY torPreferences.bridgesDescription "">
<!ENTITY torPreferences.useBridge "">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "">
<!ENTITY torPreferences.provideBridge "">
<!ENTITY torPreferences.advanced "">
<!ENTITY torPreferences.advancedDescription "">
<!ENTITY torPreferences.firewallPortsPlaceholder "">
<!ENTITY torPreferences.requestBridgeDialogTitle "">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "">
<!ENTITY torPreferences.viewTorLogs "">
<!ENTITY torPreferences.viewLogs "">
1
0
[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 15 Oct '19
by translation＠torproject.org 15 Oct '19
15 Oct '19
commit 623b1bc9a8cf77f03c068852d23b5e8c391ef6c5
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Oct 15 13:52:33 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ…
---
lt/network-settings.dtd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index 878acbf3e..f0af4d9eb 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -26,7 +26,7 @@
<!ENTITY torsettings.optional "Nebūtina">
<!ENTITY torsettings.useProxy.checkbox "Prisijungimui prie interneto aš naudoju įgaliotąjį serverį">
-<!ENTITY torsettings.useProxy.type "Proxy Type">
+<!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas">
<!ENTITY torsettings.useProxy.type.placeholder "pasirinkite įgaliotojo serverio tipą">
<!ENTITY torsettings.useProxy.address "Adresas">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresas arba serverio vardas">
@@ -37,7 +37,7 @@
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Šis kompiuteris jungiasi per užkardą, kuri leidžia jungtis tik prie tam tikrų prievadų">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
+<!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai">
<!ENTITY torsettings.useBridges.checkbox "Mano šalyje Tor yra cenzūruojamas">
<!ENTITY torsettings.useBridges.default "Pasirinkite įtaisytąjį tinklų tiltą">
<!ENTITY torsettings.useBridges.default.placeholder "pasirinkite tinklų tiltą">
1
0
[torspec/master] rend-spec-v3: Update client authorization implementation date
by dgoulet＠torproject.org 15 Oct '19
by dgoulet＠torproject.org 15 Oct '19
15 Oct '19
commit c869fe84851b8393b2b01bc13e90c5ad28e8de33
Author: David Goulet <dgoulet(a)torproject.org>
Date: Tue Oct 15 09:28:43 2019 -0400
rend-spec-v3: Update client authorization implementation date
Signed-off-by: David Goulet <dgoulet(a)torproject.org>
---
rend-spec-v3.txt | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt
index 7c80f1a..a3e0b0a 100644
--- a/rend-spec-v3.txt
+++ b/rend-spec-v3.txt
@@ -468,8 +468,6 @@ Table of contents:
optional client authorization is enabled, the service may additionally
require the client to prove knowledge of a pre-shared private key.
- (NOTE: client authorization is not implemented as of 0.3.2.1-alpha.)
-
1.4. In more detail: Distributing hidden service descriptors. [IMD:DIST]
Periodically, hidden service descriptors become stored at different
@@ -645,7 +643,7 @@ Table of contents:
[TODO: Also specify stealth client authorization.]
- (NOTE: client authorization is not implemented as of 0.3.2.1-alpha.)
+ (NOTE: client authorization is implemented as of 0.3.5.1-alpha.)
2. Generating and publishing hidden service descriptors [HSDIR]
@@ -1194,8 +1192,6 @@ Table of contents:
[Any number]
- (NOTE: client authorization is not implemented as of 0.3.2.1-alpha.)
-
When client authorization is enabled, the hidden service inserts an
"auth-client" line for each of its authorized clients. If client
authorization is disabled, the fields here can be populated with random
@@ -2341,7 +2337,7 @@ Appendix F. Hidden service directory format [HIDSERVDIR-FORMAT]
See section [CLIENT-AUTH-MGMT] for more details and the format of the client file.
- (NOTE: client authorization is not implemented as of 0.3.2.1-alpha.)
+ (NOTE: client authorization is implemented as of 0.3.5.1-alpha.)
Appendix G. Managing authorized client data [CLIENT-AUTH-MGMT]
@@ -2350,7 +2346,7 @@ Appendix G. Managing authorized client data [CLIENT-AUTH-MGMT]
scheme for configuring client authorization. Please see appendix
[HIDSERVDIR-FORMAT] for more information about relevant hidden service files.
- (NOTE: client authorization is not implemented as of 0.3.2.1-alpha.)
+ (NOTE: client authorization is implemented as of 0.3.5.1-alpha.)
G.1. Configuring client authorization using torrc
1
0
[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 15 Oct '19
by translation＠torproject.org 15 Oct '19
15 Oct '19
commit 5516ee0b87bf535a6c63d0fb8febc90d2c4c5dc3
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Oct 15 12:23:51 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ…
---
en/network-settings.dtd | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/en/network-settings.dtd b/en/network-settings.dtd
index c920d3e08..b0d38062a 100644
--- a/en/network-settings.dtd
+++ b/en/network-settings.dtd
@@ -26,23 +26,17 @@
<!ENTITY torsettings.optional "">
<!ENTITY torsettings.useProxy.checkbox "">
-<!-- TODO: remove colon-->
<!ENTITY torsettings.useProxy.type "">
<!ENTITY torsettings.useProxy.type.placeholder "">
-<!-- TODO: remove colon-->
<!ENTITY torsettings.useProxy.address "">
<!ENTITY torsettings.useProxy.address.placeholder "">
-<!-- TODO: remove colon-->
<!ENTITY torsettings.useProxy.port "">
-<!-- TODO: remove colon-->
<!ENTITY torsettings.useProxy.username "">
-<!-- TODO: remove colon-->
<!ENTITY torsettings.useProxy.password "">
<!ENTITY torsettings.useProxy.type.socks4 "">
<!ENTITY torsettings.useProxy.type.socks5 "">
<!ENTITY torsettings.useProxy.type.http "">
<!ENTITY torsettings.firewall.checkbox "">
-<!-- TODO: remove colon-->
<!ENTITY torsettings.firewall.allowedPorts "">
<!ENTITY torsettings.useBridges.checkbox "">
<!ENTITY torsettings.useBridges.default "">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "">
<!ENTITY torPreferences.bridgesDescription "">
<!ENTITY torPreferences.useBridge "">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "">
<!ENTITY torPreferences.provideBridge "">
<!ENTITY torPreferences.advanced "">
<!ENTITY torPreferences.advancedDescription "">
<!ENTITY torPreferences.firewallPortsPlaceholder "">
<!ENTITY torPreferences.requestBridgeDialogTitle "">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "">
<!ENTITY torPreferences.viewTorLogs "">
<!ENTITY torPreferences.viewLogs "">
1
0
[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 15 Oct '19
by translation＠torproject.org 15 Oct '19
15 Oct '19
commit c7035a83e4734767a33d37b4f3d33a7ff1f7944b
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Oct 15 12:23:44 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ…
---
ach/network-settings.dtd | 22 ++++++----------------
af/network-settings.dtd | 22 ++++++----------------
ar/network-settings.dtd | 22 ++++++----------------
ast/network-settings.dtd | 22 ++++++----------------
az/network-settings.dtd | 22 ++++++----------------
be/network-settings.dtd | 22 ++++++----------------
bg/network-settings.dtd | 22 ++++++----------------
bn/network-settings.dtd | 22 ++++++----------------
br/network-settings.dtd | 22 ++++++----------------
bs/network-settings.dtd | 22 ++++++----------------
ca/network-settings.dtd | 22 ++++++----------------
cs/network-settings.dtd | 22 ++++++----------------
cy/network-settings.dtd | 22 ++++++----------------
da/network-settings.dtd | 22 ++++++----------------
de/network-settings.dtd | 22 ++++++----------------
el/network-settings.dtd | 22 ++++++----------------
en/network-settings.dtd | 22 ++++++----------------
en_GB/network-settings.dtd | 22 ++++++----------------
eo/network-settings.dtd | 22 ++++++----------------
es/network-settings.dtd | 22 ++++++----------------
es_AR/network-settings.dtd | 22 ++++++----------------
es_MX/network-settings.dtd | 22 ++++++----------------
et/network-settings.dtd | 22 ++++++----------------
eu/network-settings.dtd | 22 ++++++----------------
fa/network-settings.dtd | 22 ++++++----------------
fi/network-settings.dtd | 22 ++++++----------------
fr/network-settings.dtd | 22 ++++++----------------
fy/network-settings.dtd | 22 ++++++----------------
ga/network-settings.dtd | 22 ++++++----------------
gd/network-settings.dtd | 22 ++++++----------------
gl/network-settings.dtd | 22 ++++++----------------
gu/network-settings.dtd | 22 ++++++----------------
he/network-settings.dtd | 22 ++++++----------------
hi/network-settings.dtd | 20 +++++---------------
hr/network-settings.dtd | 22 ++++++----------------
hu/network-settings.dtd | 22 ++++++----------------
hy/network-settings.dtd | 22 ++++++----------------
id/network-settings.dtd | 22 ++++++----------------
is/network-settings.dtd | 22 ++++++----------------
it/network-settings.dtd | 22 ++++++----------------
ja/network-settings.dtd | 22 ++++++----------------
ka/network-settings.dtd | 18 ++++--------------
kab/network-settings.dtd | 22 ++++++----------------
kk/network-settings.dtd | 22 ++++++----------------
km/network-settings.dtd | 22 ++++++----------------
kn/network-settings.dtd | 22 ++++++----------------
ko/network-settings.dtd | 22 ++++++----------------
lt/network-settings.dtd | 22 ++++++----------------
lv/network-settings.dtd | 22 ++++++----------------
mk/network-settings.dtd | 22 ++++++----------------
ml/network-settings.dtd | 22 ++++++----------------
mr/network-settings.dtd | 22 ++++++----------------
ms_MY/network-settings.dtd | 22 ++++++----------------
my/network-settings.dtd | 22 ++++++----------------
nb/network-settings.dtd | 22 ++++++----------------
ne/network-settings.dtd | 22 ++++++----------------
nl/network-settings.dtd | 22 ++++++----------------
nl_BE/network-settings.dtd | 22 ++++++----------------
nn/network-settings.dtd | 22 ++++++----------------
oc/network-settings.dtd | 22 ++++++----------------
or/network-settings.dtd | 22 ++++++----------------
pa/network-settings.dtd | 22 ++++++----------------
pl/network-settings.dtd | 22 ++++++----------------
pt_BR/network-settings.dtd | 22 ++++++----------------
pt_PT/network-settings.dtd | 22 ++++++----------------
ro/network-settings.dtd | 22 ++++++----------------
ru/network-settings.dtd | 22 ++++++----------------
si_LK/network-settings.dtd | 20 +++++---------------
sk/network-settings.dtd | 22 ++++++----------------
sl/network-settings.dtd | 22 ++++++----------------
son/network-settings.dtd | 22 ++++++----------------
sq/network-settings.dtd | 22 ++++++----------------
sr/network-settings.dtd | 22 ++++++----------------
sv/network-settings.dtd | 22 ++++++----------------
sw/network-settings.dtd | 23 +++++++----------------
ta/network-settings.dtd | 22 ++++++----------------
te/network-settings.dtd | 22 ++++++----------------
th/network-settings.dtd | 22 ++++++----------------
tr/network-settings.dtd | 22 ++++++----------------
uk/network-settings.dtd | 22 ++++++----------------
ur/network-settings.dtd | 22 ++++++----------------
uz/network-settings.dtd | 22 ++++++----------------
vi/network-settings.dtd | 22 ++++++----------------
zh_CN/network-settings.dtd | 22 ++++++----------------
zh_HK/network-settings.dtd | 22 ++++++----------------
zh_TW/network-settings.dtd | 22 ++++++----------------
86 files changed, 513 insertions(+), 1372 deletions(-)
diff --git a/ach/network-settings.dtd b/ach/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/ach/network-settings.dtd
+++ b/ach/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/af/network-settings.dtd b/af/network-settings.dtd
index ca04ccf7f..0a3269ee2 100644
--- a/af/network-settings.dtd
+++ b/af/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Poort:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Gebruikersnaam:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Wagwoord">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Hierdie rekenaar gaan deur 'n firewall wat slegs konneksies na sekere poorte toelaat">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Toegelate Poorte:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd
index 5e1673a8c..9f046c375 100644
--- a/ar/network-settings.dtd
+++ b/ar/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "اختياري">
<!ENTITY torsettings.useProxy.checkbox "أستخدم وسيطا للاتصال بالإنترنت">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "نوع البروكسي:">
+<!ENTITY torsettings.useProxy.type "نوع البروكسي">
<!ENTITY torsettings.useProxy.type.placeholder "اختر نوع الوسيط">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "العنوان:">
+<!ENTITY torsettings.useProxy.address "العنوان">
<!ENTITY torsettings.useProxy.address.placeholder "عنوان الإنترنت IP أو اسم المضيف">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "المنفذ:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "اسم المستخدم:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "كلمة السر:">
+<!ENTITY torsettings.useProxy.port "منفذ">
+<!ENTITY torsettings.useProxy.username "اسم المستخدم">
+<!ENTITY torsettings.useProxy.password "كلمة السّر">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "تور محجوب في بلدي">
<!ENTITY torsettings.useBridges.default "اختر جسرا مُدمَجا في البرنامج">
<!ENTITY torsettings.useBridges.default.placeholder "اختر جسرا">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "الجسور">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "متقدم">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "حل كاباتشا لطلب جسر.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "الحل ليس سليمًا. يُرجى إعادة المحاولة.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ast/network-settings.dtd b/ast/network-settings.dtd
index d51d04b37..1f67c1daf 100644
--- a/ast/network-settings.dtd
+++ b/ast/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Contraseña">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avanzao">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/az/network-settings.dtd b/az/network-settings.dtd
index b3aeaae41..a4b106efc 100644
--- a/az/network-settings.dtd
+++ b/az/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Əlavə">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Tipi:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Ünvan:">
+<!ENTITY torsettings.useProxy.address "Ünvan">
<!ENTITY torsettings.useProxy.address.placeholder "İP ünvanı və ya anakompüterin adı">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "İstifadəçi adı:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Şifrə:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "İstifadəçi adı">
+<!ENTITY torsettings.useProxy.password "Şifrə">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Bu kompüter yalnız müəyyən portlarla əlaqəyə icazə verən təhlükəsizlik divarindan keçir">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "İczaə verilən portlar:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Körpülər">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Qabaqcıl">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/be/network-settings.dtd b/be/network-settings.dtd
index 38e2752cc..4fc669aca 100644
--- a/be/network-settings.dtd
+++ b/be/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Пароль:">
+<!ENTITY torsettings.useProxy.port "Порт">
+<!ENTITY torsettings.useProxy.username "Імя карыстальніка">
+<!ENTITY torsettings.useProxy.password "Пароль">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Масты">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Дадаткова">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd
index 01223d795..0df650617 100644
--- a/bg/network-settings.dtd
+++ b/bg/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Допълнителен">
<!ENTITY torsettings.useProxy.checkbox "Аз използвам прокси за достъп до интернет">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Прокси Тип:">
+<!ENTITY torsettings.useProxy.type "Тип прокси">
<!ENTITY torsettings.useProxy.type.placeholder "Изберете вида на проксито">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Адрес:">
+<!ENTITY torsettings.useProxy.address "Адрес">
<!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Порт:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Потребителско име:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Парола:">
+<!ENTITY torsettings.useProxy.port "Порт">
+<!ENTITY torsettings.useProxy.username "Потребителско име">
+<!ENTITY torsettings.useProxy.password "Парола">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Този компютър се свързва през firewall,който позволява връзки само към определени портове.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Позволени портове:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран в моята страна">
<!ENTITY torsettings.useBridges.default "Избор на вграден бридж">
<!ENTITY torsettings.useBridges.default.placeholder "изберете бридж">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Бриджове">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Напреднали">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете CAPTCHA за заявка на bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението не е правилно. Моля, опитайте пак.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/bn/network-settings.dtd b/bn/network-settings.dtd
index 67680f7be..e8e10016b 100644
--- a/bn/network-settings.dtd
+++ b/bn/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "ঐচ্ছিক">
<!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "ঠিকানা:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "পোর্টঃ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "ব্যবহারকারী নাম:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড:">
+<!ENTITY torsettings.useProxy.port "বন্দর">
+<!ENTITY torsettings.useProxy.username "ব্যবহারকারীর নাম">
+<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়">
<!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন">
<!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "ব্রিজ">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "অগ্রবর্তী">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।...">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/br/network-settings.dtd b/br/network-settings.dtd
index 86eb33d3f..e62c38f04 100644
--- a/br/network-settings.dtd
+++ b/br/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Ger-tremen">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Pontoù">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Araokaet">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/bs/network-settings.dtd b/bs/network-settings.dtd
index ba458c383..f1c40d8bf 100644
--- a/bs/network-settings.dtd
+++ b/bs/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "adresa">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Korisničko ime:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Šifra">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Korisničko ime">
+<!ENTITY torsettings.useProxy.password "Lozinka">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd
index 65d4f1678..cede7c37e 100644
--- a/ca/network-settings.dtd
+++ b/ca/network-settings.dtd
@@ -27,24 +27,18 @@
">
<!ENTITY torsettings.useProxy.checkbox "Utilitzo un servidor intermediari per a accedir a Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local:">
+<!ENTITY torsettings.useProxy.type "Tipus de Servidor intermediari">
<!ENTITY torsettings.useProxy.type.placeholder "seleccioneu un tipus de servidor intermediari">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adreça:">
+<!ENTITY torsettings.useProxy.address "Adreça">
<!ENTITY torsettings.useProxy.address.placeholder "Adreça IP o nom del host">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nom d'usuari:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Contrasenya:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nom d’usuari">
+<!ENTITY torsettings.useProxy.password "Contrasenya">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un tallafoc que només permet connexions a certs ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ports permesos:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor està censurat al meu país">
<!ENTITY torsettings.useBridges.default "Seleccioneu un pont predefinit">
<!ENTITY torsettings.useBridges.default.placeholder "seleccioneu un pont">
@@ -76,18 +70,14 @@
<!ENTITY torPreferences.bridges "Ponts">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avançat">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolgueu el CAPTCHA per a sol·licitar un pont.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solució no és correcta. Torneu a provar-ho.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/cs/network-settings.dtd b/cs/network-settings.dtd
index 61c193fa4..191ab878a 100644
--- a/cs/network-settings.dtd
+++ b/cs/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Volitelné">
<!ENTITY torsettings.useProxy.checkbox "Používám proxy pro připojení k Internetu">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Typ proxy:">
+<!ENTITY torsettings.useProxy.type "Typ proxy">
<!ENTITY torsettings.useProxy.type.placeholder "vyberte typ proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa:">
+<!ENTITY torsettings.useProxy.address "Adresa">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo název serveru">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Uživatel:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Heslo:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Uživatelské jméno">
+<!ENTITY torsettings.useProxy.password "Heslo">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Tento počítač používá firewall, který povoluje připojení pouze přes některé porty.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor je v mé zemi cenzurován">
<!ENTITY torsettings.useBridges.default "Vyberte vestavěný most">
<!ENTITY torsettings.useBridges.default.placeholder "vyberte most">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridge">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Pokročilé">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Pro vyžádání mostu prosím opište kód CAPTCHA.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Neopsali jste kód správně. Zkuste to prosím znovu.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/cy/network-settings.dtd b/cy/network-settings.dtd
index 55cb7db12..741f6cd5d 100644
--- a/cy/network-settings.dtd
+++ b/cy/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Dewisiol">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Math Dirprwy:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Cyfeiriad:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "Cyfeiriad IP neu enw gwesteiwr">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porth:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Enw defnyddiwr:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Cyfrinair:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Enw defnyddiwr">
+<!ENTITY torsettings.useProxy.password "Cyfrinair">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Pyrth a ganiateir:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/da/network-settings.dtd b/da/network-settings.dtd
index 9cde33f2f..800b30788 100644
--- a/da/network-settings.dtd
+++ b/da/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Valgfri">
<!ENTITY torsettings.useProxy.checkbox "Jeg bruger en proxy til at oprette forbindelse til internettet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxytype:">
+<!ENTITY torsettings.useProxy.type "Proxy-type">
<!ENTITY torsettings.useProxy.type.placeholder "vælg en proxytype">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresse:">
+<!ENTITY torsettings.useProxy.address "Adresse">
<!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller værtsnavn">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Brugernavn:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Adgangskode:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Brugernavn">
+<!ENTITY torsettings.useProxy.password "Adgangskode">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS">
<!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Tilladte porte:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land">
<!ENTITY torsettings.useBridges.default "Vælg en indbygget bro">
<!ENTITY torsettings.useBridges.default.placeholder "vælg en bro">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Broer">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avanceret">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA'en for at anmode om en bro.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke korrekt. Prøv venligst igen.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/de/network-settings.dtd b/de/network-settings.dtd
index 33e1bf427..18e0e767e 100644
--- a/de/network-settings.dtd
+++ b/de/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "Ich benutze einen Proxy, um mich mit dem Internet zu verbinden">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy-Typ:">
+<!ENTITY torsettings.useProxy.type "Proxy-Typ">
<!ENTITY torsettings.useProxy.type.placeholder "Proxy-Typ auswählen">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresse:">
+<!ENTITY torsettings.useProxy.address "Adresse">
<!ENTITY torsettings.useProxy.address.placeholder "IP-Adresse oder Rechnername">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Anschluss:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nutzername:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Passwort:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Benutzername">
+<!ENTITY torsettings.useProxy.password "Passwort">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte Anschlüsse zulässt">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor wird in meinem Land blockiert.">
<!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen">
<!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Brücken">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Fortgeschritten">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Löse das CAPTCHA, um eine Brücke anzufordern.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/el/network-settings.dtd b/el/network-settings.dtd
index 740406b57..6e71464cc 100644
--- a/el/network-settings.dtd
+++ b/el/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Προεραιτικα">
<!ENTITY torsettings.useProxy.checkbox "Χρησιμοποιώ διακομιστή μεσολάβησης για να συνδεθώ στο ίντερνετ.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "Επιλέξτε τύπο διακομιστή μεσολάβησης.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Διεύθυνση:">
+<!ENTITY torsettings.useProxy.address "Διεύθυνση">
<!ENTITY torsettings.useProxy.address.placeholder "Διεύθυνση ΙΡ η όνομα υπολογιστή ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Θύρα συστήματος:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Όνομα Χρήστη:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Κωδικός:">
+<!ENTITY torsettings.useProxy.port "Θύρα">
+<!ENTITY torsettings.useProxy.username "Όνομα χρήστη">
+<!ENTITY torsettings.useProxy.password "Κωδικός Πρόσβασης">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου">
<!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενταγμένο bridge">
<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε ένα bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Γέφυρες">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Ρυθμίσεις για προχωρημένους">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Λύστε το CAPTCHA για να ζητήσετε γέφυρα.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Η λύση δεν είναι σωστή. Παρακαλώ προσπαθήστε ξανά.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/en/network-settings.dtd b/en/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/en/network-settings.dtd
+++ b/en/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/en_GB/network-settings.dtd b/en_GB/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/en_GB/network-settings.dtd
+++ b/en_GB/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/eo/network-settings.dtd b/eo/network-settings.dtd
index 123b293a1..224f4740b 100644
--- a/eo/network-settings.dtd
+++ b/eo/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adreso:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Pordo:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Pasvorto:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Uzantonomo">
+<!ENTITY torsettings.useProxy.password "Pasvorto">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Pontoj">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Altnivela">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/es/network-settings.dtd b/es/network-settings.dtd
index ade6e5dfc..55e774077 100644
--- a/es/network-settings.dtd
+++ b/es/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opcional">
<!ENTITY torsettings.useProxy.checkbox "Utilizo un proxy para conectar a Internet.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipo de proxy:">
+<!ENTITY torsettings.useProxy.type "Tipo de proxy">
<!ENTITY torsettings.useProxy.type.placeholder "seleccionar un tipo de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Dirección:">
+<!ENTITY torsettings.useProxy.address "Dirección">
<!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de máquina (host)">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Puerto:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nombre de usuario:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Contraseña:">
+<!ENTITY torsettings.useProxy.port "Puerto">
+<!ENTITY torsettings.useProxy.username "Nombre de usuario">
+<!ENTITY torsettings.useProxy.password "Contraseña">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos(firewall) que sólo permite conexiones a ciertos puertos">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "En mi país se censura a Tor">
<!ENTITY torsettings.useBridges.default "Seleccionar un puente construido">
<!ENTITY torsettings.useBridges.default.placeholder "seleccionar un puente">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Puentes">
<!ENTITY torPreferences.bridgesDescription "Los puentes te ayudan a acceder a la Red Tor en lugares donde Tor está bloqueado. Dependiendo de dónde te encuentres, un puente puede funcionar mejor que otro.">
<!ENTITY torPreferences.useBridge "Usa un puente">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Solicite un Nuevo Puente&#x2026;">
<!ENTITY torPreferences.provideBridge "Proporcionar un puente">
<!ENTITY torPreferences.advanced "Avanzado">
<!ENTITY torPreferences.advancedDescription "Configura cómo el Navegador Tor se conecta a Internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por comas">
<!ENTITY torPreferences.requestBridgeDialogTitle "Solicitar Puente">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando con BridgeDB. Espera por favor.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resuelve el CAPTCHA para solicitar un puente.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor, inténtalo de nuevo.">
<!ENTITY torPreferences.viewTorLogs "Ver los registros de Tor.">
<!ENTITY torPreferences.viewLogs "Ver registros&#x2026;">
diff --git a/es_AR/network-settings.dtd b/es_AR/network-settings.dtd
index f796d84bb..fa412724d 100644
--- a/es_AR/network-settings.dtd
+++ b/es_AR/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opcional">
<!ENTITY torsettings.useProxy.checkbox "Uso un proxy para conectar a Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipo de proxy:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "seleccioná un tipo de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Dirección:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de equipo">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Puerto:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Usuario:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Contraseña:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nombre de usuario">
+<!ENTITY torsettings.useProxy.password "Contraseña">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Esta computadora pasa a través de un cortafuegos que sólo permite conexiones a ciertos puertos">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Puerto permitidos:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor está censurado en mi país">
<!ENTITY torsettings.useBridges.default "Seleccioná un puente incorporado">
<!ENTITY torsettings.useBridges.default.placeholder "seleccioná un puente">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Puentes">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solucioná el CAPTCHA para solicitar un puente.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor intentá de nuevo.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/es_MX/network-settings.dtd b/es_MX/network-settings.dtd
index 02fef6203..f2460de64 100644
--- a/es_MX/network-settings.dtd
+++ b/es_MX/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opcional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Tipo de proxy">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Puerto:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Contraseña:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nombre de usuario">
+<!ENTITY torsettings.useProxy.password "Contraseña">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Puentes">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/et/network-settings.dtd b/et/network-settings.dtd
index e4f9b2e30..8fcdff25a 100644
--- a/et/network-settings.dtd
+++ b/et/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Valikuline">
<!ENTITY torsettings.useProxy.checkbox "Ma kasutan proksit et ühenduda internetti">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proksi tüüp:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "valige proksi tüüp">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Aadress:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP aadress või haldaja nimi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Kasutajanimi:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Parool:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Kasutajanimi">
+<!ENTITY torsettings.useProxy.password "Salasõna">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "See arvuti läheb läbi tulemüüri mis lubab ainult ühendusi kindlatesse portidesse.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Lubatud pordid:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor on minu riigis tsensoreeritud">
<!ENTITY torsettings.useBridges.default "Valige sisseehitatud sild">
<!ENTITY torsettings.useBridges.default.placeholder "valige sild">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Sillad">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Peenhäälestus">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lahenda CAPTCHA, et taotleda silda.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd
index e04cc7ef1..6a7eb5de2 100644
--- a/eu/network-settings.dtd
+++ b/eu/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Hautazkoa">
<!ENTITY torsettings.useProxy.checkbox "Proxy bat erabiltzen dut Internetera sartzeko">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy mota:">
+<!ENTITY torsettings.useProxy.type "Proxy mota">
<!ENTITY torsettings.useProxy.type.placeholder "proxy mota aukeratu">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Helbidea:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP helbide edo ostalari izena">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Ataka:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Erabiltzaile izena:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Pasahitza:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Erabiltzaile-izena">
+<!ENTITY torsettings.useProxy.password "Pasahitza">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor zentsuratuta dago nire herrialdean">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "aukeratu zubia">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Zubiak">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Aurreratua">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "CAPTCHAa ebatzi ezazu zubi bat eskatzeko.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ebazpena ez da zuzena. Mesedez saiatu berriro.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd
index 89dd4d46c..4ef23bb42 100644
--- a/fa/network-settings.dtd
+++ b/fa/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "اختیاری">
<!ENTITY torsettings.useProxy.checkbox "من برای دسترسی به اینترنت از پروکسی استفاده میکنم.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "نوع پراکسی:">
+<!ENTITY torsettings.useProxy.type "نوع پروکسی">
<!ENTITY torsettings.useProxy.type.placeholder "یک نوع پروکسی را انتخاب کنید">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "آدرس:">
+<!ENTITY torsettings.useProxy.address "آدرس">
<!ENTITY torsettings.useProxy.address.placeholder "آدرس آیپی یا نام میزبان">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "پورت:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "نام کاربری:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "رمز عبور">
+<!ENTITY torsettings.useProxy.port "پورت">
+<!ENTITY torsettings.useProxy.username "نام کاربری">
+<!ENTITY torsettings.useProxy.password "گذرواژه">
<!ENTITY torsettings.useProxy.type.socks4 "ساکس ۴">
<!ENTITY torsettings.useProxy.type.socks5 "ساکس ۵">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "تور در کشور من فیلتر یا سانسور شده است">
<!ENTITY torsettings.useBridges.default "پل ساخته شده را انتخاب کنید">
<!ENTITY torsettings.useBridges.default.placeholder "یک پل انتخاب کنید">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "پل ها">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "پیشرفته ">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "برای درخواست یک پل کپچا را حل کنید.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "راه حل درست نیست. لطفا دوباره تلاش کنید.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd
index 75c4ad3bd..2ac6e04af 100644
--- a/fi/network-settings.dtd
+++ b/fi/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Vaihtoehtoinen">
<!ENTITY torsettings.useProxy.checkbox "Käytän välityspalvelinta yhdistääkseni internetiin">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Välityspalvelintyyppi:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "valitse välityspalvelintyyppi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Osoite:">
+<!ENTITY torsettings.useProxy.address "Osoite">
<!ENTITY torsettings.useProxy.address.placeholder "IP-osoite tai palvelinnimi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Portti:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Käyttäjätunnus:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Salasana:">
+<!ENTITY torsettings.useProxy.port "Portti">
+<!ENTITY torsettings.useProxy.username "Käyttäjätunnus">
+<!ENTITY torsettings.useProxy.password "Salasana">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Tämän tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Maani sensuroi Tor'ia">
<!ENTITY torsettings.useBridges.default "Valitse sisäänrakennettu silta">
<!ENTITY torsettings.useBridges.default.placeholder "valitse silta">
@@ -76,18 +70,14 @@ Tässä saattaa kestää muutama minuutti.">
<!ENTITY torPreferences.bridges "Sillat">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Lisätietoja">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ratkaise CAPTCHA jotta voit pyytää sillan.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ratkaisu ei ollut oikein. Yritä uudelleen.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd
index 82a935316..17db9d969 100644
--- a/fr/network-settings.dtd
+++ b/fr/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "facultatif">
<!ENTITY torsettings.useProxy.checkbox "J’utilise un mandataire pour accéder à Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Type de mandataire :">
+<!ENTITY torsettings.useProxy.type "Type de proxy">
<!ENTITY torsettings.useProxy.type.placeholder "sélectionner un type de mandataire">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresse :">
+<!ENTITY torsettings.useProxy.address "Adresse">
<!ENTITY torsettings.useProxy.address.placeholder "adresse IP ou nom d’hôte">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port :">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Mot de passe :">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nom d’utilisateur">
+<!ENTITY torsettings.useProxy.password "Mot de passe">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays">
<!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré">
<!ENTITY torsettings.useBridges.default.placeholder "Sélectionner un pont">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Ponts">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avancé">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résoudre le captcha pour demander un pont.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez ressayer.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/fy/network-settings.dtd b/fy/network-settings.dtd
index 74c947eb6..4424b9194 100644
--- a/fy/network-settings.dtd
+++ b/fy/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Wachtwurd:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ga/network-settings.dtd b/ga/network-settings.dtd
index e83332efb..713f4ecc9 100644
--- a/ga/network-settings.dtd
+++ b/ga/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Roghnach">
<!ENTITY torsettings.useProxy.checkbox "Úsáidim seachfhreastalaí chun ceangal leis an Idirlíon">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Cineál an tSeachfhreastalaí:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "roghnaigh cineál an tseachfhreastalaí">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Seoladh:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Ainm úsáideora:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Focal faire:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Focal faire">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo">
<!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite">
<!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Droichid">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Réitigh an CAPTCHA le droichead a iarraidh.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Níl an freagra sin ceart. Bain triail eile as.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/gd/network-settings.dtd b/gd/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/gd/network-settings.dtd
+++ b/gd/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/gl/network-settings.dtd b/gl/network-settings.dtd
index 88b07803d..1c623d4c0 100644
--- a/gl/network-settings.dtd
+++ b/gl/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opcional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipo de Proxy:">
+<!ENTITY torsettings.useProxy.type "Tipo de Proxy">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Enderezo:">
+<!ENTITY torsettings.useProxy.address "Enderezo">
<!ENTITY torsettings.useProxy.address.placeholder "Enderezo IP ou nome da máquina">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porto:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nome de usuario:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Contrasinal:">
+<!ENTITY torsettings.useProxy.port "Porto">
+<!ENTITY torsettings.useProxy.username "Nome de usuario">
+<!ENTITY torsettings.useProxy.password "Contrasinal">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Este computador pasa por un firewall que só permite conexións a certos portos">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Pontes">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avanzados">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/gu/network-settings.dtd b/gu/network-settings.dtd
index 9a46a2a27..f2581983f 100644
--- a/gu/network-settings.dtd
+++ b/gu/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "પોર્ટ:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "પાસવર્ડ">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "અદ્યતન">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/he/network-settings.dtd b/he/network-settings.dtd
index 148f6cf67..b053543df 100644
--- a/he/network-settings.dtd
+++ b/he/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "רשותי">
<!ENTITY torsettings.useProxy.checkbox "אני משתמש בייפוי־כוח כדי להתחבר לאינטרנט">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "סוג ייפוי־כוח:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "בחר סוג ייפוי־כוח">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "כתובת:">
+<!ENTITY torsettings.useProxy.address "כתובת">
<!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "פתחה:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "שם משתמש:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "סיסמה:">
+<!ENTITY torsettings.useProxy.port "פתחה">
+<!ENTITY torsettings.useProxy.username "שם משתמש">
+<!ENTITY torsettings.useProxy.password "סיסמה">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "מחשב זה עובר דרך חומת אש המתירה חיבורים רק אל פתחות מסוימות">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "פתחות מותרות:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי">
<!ENTITY torsettings.useBridges.default "בחר גשר מובנה">
<!ENTITY torsettings.useBridges.default.placeholder "בחר גשר">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "גשרים">
<!ENTITY torPreferences.bridgesDescription "גשרים עוזרים לך להשיג גישה אל רשת Tor במקומות בהם Tor חסום. על סמך המקום שאתה נמצא בו, גשר אחד עשוי לעבוד בצורה טובה יותר מאחד אחר.">
<!ENTITY torPreferences.useBridge "השתמש בגשר">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "בקש גשר חדש&#x2026;">
<!ENTITY torPreferences.provideBridge "סַפֵּק גשר">
<!ENTITY torPreferences.advanced "מתקדם">
<!ENTITY torPreferences.advancedDescription "תצר כיצד דפדפן Tor מתחבר אל האינטרנט.">
<!ENTITY torPreferences.firewallPortsPlaceholder "ערכים מופרדי־פסיק">
<!ENTITY torPreferences.requestBridgeDialogTitle "בקש גשר">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "יוצר קשר עם BridgeDB. אנא המתן.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "פתור את ה־CAPTCHA כדי לבקש גשר.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "הפתרון אינו נכון. אנא נסה שוב.">
<!ENTITY torPreferences.viewTorLogs "הצג את יומני Tor.">
<!ENTITY torPreferences.viewLogs "הצג יומנים&#x2026;">
diff --git a/hi/network-settings.dtd b/hi/network-settings.dtd
index 6ef9422e0..8696c9491 100644
--- a/hi/network-settings.dtd
+++ b/hi/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "ऐच्छिक">
<!ENTITY torsettings.useProxy.checkbox "मैं इंटरनेट से कनेक्ट करने के लिए प्रॉक्सी का उपयोग करता हूं">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार:">
+<!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार">
<!ENTITY torsettings.useProxy.type.placeholder "प्रॉक्सी प्रकार का चयन करें">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "पता :">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP पता या मेजबाननाम">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "पोर्ट/द्वार :">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "उपयोगकर्ता नाम">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
<!ENTITY torsettings.useProxy.password "पासवर्ड">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "यह कंप्यूटर फ़ायरवॉल के माध्यम से जाता है जो केवल कुछ पोर्ट्स के कनेक्शन की अनुमति देता है...">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "अनुमति प्राप्त पोर्ट्स ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "टोर मेरे देश में सेंसर किया गया है">
<!ENTITY torsettings.useBridges.default "एक अंतर्निर्मित पुल का चयन करें">
<!ENTITY torsettings.useBridges.default.placeholder "एक पुल का चयन करें">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "पुल">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "उन्नत">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "पुल का अनुरोध करने के लिए कैप्चा को हल करें।">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "समाधान सही नहीं है। कृपया पुन: प्रयास करें।">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/hr/network-settings.dtd b/hr/network-settings.dtd
index 5a5dcf90b..f1ab21ecf 100644
--- a/hr/network-settings.dtd
+++ b/hr/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Neobavezno">
<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tip proxy-a:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili poslužitelj">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Korisničko ime:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Lozinka:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Korisničko ime">
+<!ENTITY torsettings.useProxy.password "Lozinka">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Ovo raučunalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Dopušteni portovi:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji">
<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most">
<!ENTITY torsettings.useBridges.default.placeholder "odaberite most">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Mostovi">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Napredno">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
index 487fd657d..3b77a306a 100644
--- a/hu/network-settings.dtd
+++ b/hu/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opcionális">
<!ENTITY torsettings.useProxy.checkbox "Proxy-t használok az Internetre való kapcsolódáshoz">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Típus:">
+<!ENTITY torsettings.useProxy.type "Proxy típus">
<!ENTITY torsettings.useProxy.type.placeholder " válaszon ki egy proxy típust">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Cím:">
+<!ENTITY torsettings.useProxy.address "Cím">
<!ENTITY torsettings.useProxy.address.placeholder "IP cím vagy gépnév">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Felhasználónév:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Jelszó:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Felhasználónév">
+<!ENTITY torsettings.useProxy.password "Jelszó">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál, ami csak adott portokon keresztül engedélyezi a kapcsolatotokat.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "A Tor cenzúrázva van az országomban">
<!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat">
<!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Hidak">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Speciális">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Oldjon meg egy CAPTCHA-t a híd kéréséhez.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "A megoldás nem helyes. Kérjük próbálja újra.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/hy/network-settings.dtd b/hy/network-settings.dtd
index 958b4c460..039ad1ddf 100644
--- a/hy/network-settings.dtd
+++ b/hy/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Օգտագործողիանուն">
+<!ENTITY torsettings.useProxy.password "Գաղտնագիր">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/id/network-settings.dtd b/id/network-settings.dtd
index 5fefae6a9..353a66caa 100644
--- a/id/network-settings.dtd
+++ b/id/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opsional">
<!ENTITY torsettings.useProxy.checkbox "Saya menggunakan proxy untuk terhubung ke Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipe Proksi:">
+<!ENTITY torsettings.useProxy.type "Tipe Proxy">
<!ENTITY torsettings.useProxy.type.placeholder "pilih jenis proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Alamat:">
+<!ENTITY torsettings.useProxy.address "Alamat">
<!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nama User:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Kata sandi:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nama Pengguna">
+<!ENTITY torsettings.useProxy.password "Kata sandi">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Komputer ini pergi melalui firewall yang hanya mengizinkan koneksi untuk beberapa port">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor disensor di negara saya">
<!ENTITY torsettings.useBridges.default "Pilih satu built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "pilih satu bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Jembatan-jembatan">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced ">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta sebuah bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Solusinya tidak tepat. Silakan coba lagi.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/is/network-settings.dtd b/is/network-settings.dtd
index 300510009..0b1c4082c 100644
--- a/is/network-settings.dtd
+++ b/is/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Valkvætt">
<!ENTITY torsettings.useProxy.checkbox "Ég nota milliþjón (proxy) til að tengjast við internetið">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Gerð milliþjóns:">
+<!ENTITY torsettings.useProxy.type "Tegund milliþjóns (proxy)">
<!ENTITY torsettings.useProxy.type.placeholder "veldu tegund milliþjóns">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Vistfang:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP-vistfang eða vélarheiti">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Gátt:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Notandanafn:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Lykilorð:">
+<!ENTITY torsettings.useProxy.port "Gátt">
+<!ENTITY torsettings.useProxy.username "Notandanafn">
+<!ENTITY torsettings.useProxy.password "Lykilorð">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Þessi tölva tengist í gegnum eldvegg sem leyfir einungis tengingar í gegnum tilteknar gáttir">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Leyfðar gáttir:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor er ritskoðað í landinu mínu">
<!ENTITY torsettings.useBridges.default "Veldu innbyggða brú">
<!ENTITY torsettings.useBridges.default.placeholder "veldu brú">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Brýr">
<!ENTITY torPreferences.bridgesDescription "Brýr hjálpa þér við að fá aðgang að Tor-netkerfinu á stöðum þar sem lokað er á Tor. Það fer eftir því hvar þú ert hvaða brú virkar betur en einhver önnur.">
<!ENTITY torPreferences.useBridge "Nota brú">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Biðja um nýja brú&#x2026;">
<!ENTITY torPreferences.provideBridge "Útvega brú">
<!ENTITY torPreferences.advanced "Ítarlegra">
<!ENTITY torPreferences.advancedDescription "Stilltu hvernig Tor-vafrinn tengist við internetið.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Gildi aðgreind með kommum">
<!ENTITY torPreferences.requestBridgeDialogTitle "Biðja um brú">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Tengist BridgeDB. Bíddu aðeins.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Leystu CAPTCHA-þrautina til að biðja um brú.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Þessi lausn er ekki rétt. Reyndu aftur.">
<!ENTITY torPreferences.viewTorLogs "Skoða atvikaskrár Tor.">
<!ENTITY torPreferences.viewLogs "Skoða atvikaskrár&#x2026;">
diff --git a/it/network-settings.dtd b/it/network-settings.dtd
index eccf9b263..1c2bed6b7 100644
--- a/it/network-settings.dtd
+++ b/it/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Facoltativo">
<!ENTITY torsettings.useProxy.checkbox "Uso un proxy per connettermi a internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipo di proxy:">
+<!ENTITY torsettings.useProxy.type "Tipo proxy">
<!ENTITY torsettings.useProxy.type.placeholder "Seleziona un tipo di proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Indirizzo:">
+<!ENTITY torsettings.useProxy.address "Indirizzo">
<!ENTITY torsettings.useProxy.address.placeholder "Indirizzo IP oppure hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porta:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nome utente:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Porta">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Porte consentite:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese">
<!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato">
<!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Ponti">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avanzate">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione è sbagliata. Riprova.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd
index 3eb98a7f6..8560d67b4 100644
--- a/ja/network-settings.dtd
+++ b/ja/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "オプション">
<!ENTITY torsettings.useProxy.checkbox "インターネットに接続するのにプロキシを使用します">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "プロキシの種類:">
+<!ENTITY torsettings.useProxy.type "プロキシ種類">
<!ENTITY torsettings.useProxy.type.placeholder "プロキシの種類を選択">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "アドレス:">
+<!ENTITY torsettings.useProxy.address "住所">
<!ENTITY torsettings.useProxy.address.placeholder "IP アドレスまたはホスト名">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "ポート:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "ユーザー名:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "パスワード:">
+<!ENTITY torsettings.useProxy.port "ポート">
+<!ENTITY torsettings.useProxy.username "ユーザー名">
+<!ENTITY torsettings.useProxy.password "パスワード">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "許可されたポート:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています">
<!ENTITY torsettings.useBridges.default "内蔵ブリッジを選択する">
<!ENTITY torsettings.useBridges.default.placeholder "ブリッジを選択">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "ブリッジ">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "詳細">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt " ブリッジをリクエストするにはCAPTCHAを解いて下さい。">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "その解答は正しくありません。再度実行してください。">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ka/network-settings.dtd b/ka/network-settings.dtd
index b0612a4ad..fc28f441e 100644
--- a/ka/network-settings.dtd
+++ b/ka/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "არასავალდებულო">
<!ENTITY torsettings.useProxy.checkbox "ინტერნეტთან დასაკავშირებლად პროქსის ვიყენებ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "პროქსის სახეობა:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "მიუთითეთ პროქსის სახეობა">
-<!-- TODO: remove colon-->
<!ENTITY torsettings.useProxy.address "მისამართი">
<!ENTITY torsettings.useProxy.address.placeholder "IP-მისამართი ან დასახელება">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "პორტი:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "მომხმარებლის სახელი:">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "ნიკი">
<!ENTITY torsettings.useProxy.password "პაროლი">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "კომპიუტერი ინტერნეტს უკავშირდება ქსელის ფარის გავლით, რომელშიც მხოლოდ ცალკეული პორტებია დაშვებული">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "დაშვებული პორტები:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor შეზღუდულია ჩემს ქვეყანაში">
<!ENTITY torsettings.useBridges.default "ჩაშენებული გადამცემი ხიდის მითითება">
<!ENTITY torsettings.useBridges.default.placeholder "ხიდის მითითება">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "გადამცემი ხიდები">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/kab/network-settings.dtd b/kab/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/kab/network-settings.dtd
+++ b/kab/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/kk/network-settings.dtd b/kk/network-settings.dtd
index 832326930..db23ec84d 100644
--- a/kk/network-settings.dtd
+++ b/kk/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Порт нөмірі">
+<!ENTITY torsettings.useProxy.username "Пайдаланушы аты">
+<!ENTITY torsettings.useProxy.password "Құпиясөз">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Кеңейтілген">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Көпірді сұрату үшін CAPTCHA-ны дұрыс жазыңыз">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Шешім дұрыс емес. Әрекетті қайталап көріңіз.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/km/network-settings.dtd b/km/network-settings.dtd
index ff360289b..51837873d 100644
--- a/km/network-settings.dtd
+++ b/km/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "ជាជម្រើស">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "ប្រភេទប្រូកស៊ី៖">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "អាយដ្ឋាន៖">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "អាសយដ្ឋាន IP ឬឈ្មោះម៉ាស៊ីន">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "ច្រក៖">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "ឈ្មោះអ្នកប្រើ៖">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "ពាក្យសម្ងាត់៖">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "ឈ្មោះអ្នកប្រើប្រាស់">
+<!ENTITY torsettings.useProxy.password "លេខកូដសម្ងាត់">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "កុំព្យូទ័រនេះឆ្លងកាត់ជញ្ជាំងភ្លើងដែលអនុញ្ញាតតែការភ្ជាប់ទៅច្រកជាក់លាក់">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "ច្រកបានអនុញ្ញាត៖">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "កម្រិតខ្ពស់">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/kn/network-settings.dtd b/kn/network-settings.dtd
index d31b5c1b3..4424b9194 100644
--- a/kn/network-settings.dtd
+++ b/kn/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "ಗುಪ್ತಪದ:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ko/network-settings.dtd b/ko/network-settings.dtd
index fbb93cf83..ec4adc4b2 100644
--- a/ko/network-settings.dtd
+++ b/ko/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "옵션">
<!ENTITY torsettings.useProxy.checkbox "인터넷에 연결할 때 프록시를 사용합니다">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "프록시 종류:">
+<!ENTITY torsettings.useProxy.type "프록시 종류">
<!ENTITY torsettings.useProxy.type.placeholder "프록시 유형을 선택해 주세요.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "주소:">
+<!ENTITY torsettings.useProxy.address "주소">
<!ENTITY torsettings.useProxy.address.placeholder "IP 주소 또는 호스트 네임">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "포트:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "사용자명:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "비밀번호:">
+<!ENTITY torsettings.useProxy.port "포트">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "비밀번호">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 허용하는 방화벽을 통해서 연결됩니다.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "허용된 포트:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "우리나라에서는 Tor를 검열합니다.">
<!ENTITY torsettings.useBridges.default "제공된 브릿지를 선택하세요.">
<!ENTITY torsettings.useBridges.default.placeholder "브릿지를 선택하세요.">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "중계서버">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "고급">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "브릿지를 요청하기 위해 CAPCHA를 풀어주세요.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "풀이가 맞지 않습니다. 다시 시도해주세요.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index 3619ee2ac..878acbf3e 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Nebūtina">
<!ENTITY torsettings.useProxy.checkbox "Prisijungimui prie interneto aš naudoju įgaliotąjį serverį">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "pasirinkite įgaliotojo serverio tipą">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresas:">
+<!ENTITY torsettings.useProxy.address "Adresas">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresas arba serverio vardas">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Prievadas:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Naudotojo vardas:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Slaptažodis:">
+<!ENTITY torsettings.useProxy.port "Prievadas">
+<!ENTITY torsettings.useProxy.username "Naudotojo vardas">
+<!ENTITY torsettings.useProxy.password "Slaptažodis">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Šis kompiuteris jungiasi per užkardą, kuri leidžia jungtis tik prie tam tikrų prievadų">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Mano šalyje Tor yra cenzūruojamas">
<!ENTITY torsettings.useBridges.default "Pasirinkite įtaisytąjį tinklų tiltą">
<!ENTITY torsettings.useBridges.default.placeholder "pasirinkite tinklų tiltą">
@@ -75,18 +69,14 @@
<!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.">
<!ENTITY torPreferences.useBridge "Naudokite tinklo tiltą">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Pateikite užklausą naujam tinklo tiltui&#x2026;">
<!ENTITY torPreferences.provideBridge "Pateikite tinklų tiltą">
<!ENTITY torPreferences.advanced "Išplėstiniai">
<!ENTITY torPreferences.advancedDescription "Sukonfigūruokite kaip Tor naršyklė jungsis prie interneto.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Kableliais atskirtos reikšmės">
<!ENTITY torPreferences.requestBridgeDialogTitle "Užklausti tinklų tiltą…">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Susisiekiama su BridgeDB. Palaukite.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Norėdami užklausti tinklų tiltą, išspręskite saugos kodą.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartą.">
<!ENTITY torPreferences.viewTorLogs "Žiūrėti Tor žurnalą.">
<!ENTITY torPreferences.viewLogs "Žiūrėti žurnalą&#x2026;">
diff --git a/lv/network-settings.dtd b/lv/network-settings.dtd
index c7feeb9cf..85bef23d9 100644
--- a/lv/network-settings.dtd
+++ b/lv/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Neobligāts">
<!ENTITY torsettings.useProxy.checkbox "Lai izveidotu savienojumu ar internetu, es lietoju starpniekseveri">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Starpnieka tips:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "izvēlieties starpniekservera veidu">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adrese:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Ports:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Lietotājvārds:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Parole:">
+<!ENTITY torsettings.useProxy.port "Ports">
+<!ENTITY torsettings.useProxy.username "Lietotājvārds">
+<!ENTITY torsettings.useProxy.password "Parole">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Šis dators iet caur ugunsmūri, kurš atļauj tikai savienojumus ar noteiktiem portiem.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Atļautie porti:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Manā valstī Tor tiek cenzēts">
<!ENTITY torsettings.useBridges.default "Izvēlieties iebūvētu tiltu">
<!ENTITY torsettings.useBridges.default.placeholder "izvēlieties tiltu">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Tilti">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Lietpratīgs">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/mk/network-settings.dtd b/mk/network-settings.dtd
index 70becabb6..4e9a19846 100644
--- a/mk/network-settings.dtd
+++ b/mk/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Опционално">
<!ENTITY torsettings.useProxy.checkbox "Користам прокси за поврзување на Интернет">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Тип на прокси:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "одбери тип на прокси">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Адреси:">
+<!ENTITY torsettings.useProxy.address "Адреса">
<!ENTITY torsettings.useProxy.address.placeholder "IP адреси или име на хост">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Порта:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Корисничко име:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Лозинка:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Корисничко име">
+<!ENTITY torsettings.useProxy.password "Лозинка">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува поврзувања до одредени порти">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Дозволени порти:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран во мојата држава">
<!ENTITY torsettings.useBridges.default "Одбери вграден мост">
<!ENTITY torsettings.useBridges.default.placeholder "одбери мост">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Мостови">
<!ENTITY torPreferences.bridgesDescription "Мостовите ви помагаат да пристапите на Tor мрежата на места каде Tor е блокиран. Зависно од тоа каде сте, еден мост може да работи подобро од друг.">
<!ENTITY torPreferences.useBridge "Користи мост">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Побарај Нов мост&#x2026;">
<!ENTITY torPreferences.provideBridge "Овозможи мост">
<!ENTITY torPreferences.advanced "Напредно">
<!ENTITY torPreferences.advancedDescription "Конфигурирајте како Tor Browser да се поврзува на Интернет.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Разделени-со-запирка вредности">
<!ENTITY torPreferences.requestBridgeDialogTitle "Побарај Мост">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Контактирај BridgeDB. Ве молиме почекајте.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете ја ЗАДАЧАТА за да побарате мост.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението е погрешно. Ве молиме обидете се повторно.">
<!ENTITY torPreferences.viewTorLogs "Види ги Tor логовите.">
<!ENTITY torPreferences.viewLogs "Види логови&#x2026;">
diff --git a/ml/network-settings.dtd b/ml/network-settings.dtd
index de2a7aeca..180a6b189 100644
--- a/ml/network-settings.dtd
+++ b/ml/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "നിര്ബന്ധമില്ലാത്തത് ">
<!ENTITY torsettings.useProxy.checkbox "ഞാൻ ഇന്റർനൈറ്റിലെക് ബന്ധപ്പെടാൻ ഒരു പ്രോക്സി ഉപയോഗിക്കുന്നു ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "പ്രോക്സി ഇനം :">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "ഒരു പ്രോക്സി ഇനം തിരഞ്ഞെടുക്കുക :">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "മേൽവിലാസം :">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "ഐ പി മേൽവിലാസം അല്ലെങ്കിൽ ഹോസ്റ്റ് നെയിം ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "യൂസർ നെയിം :">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "പാസ്സ്വേർഡ് ">
+<!ENTITY torsettings.useProxy.port "പോര്ട്ട്">
+<!ENTITY torsettings.useProxy.username "ഉപയോക്താവിന്റെ പേർ ">
+<!ENTITY torsettings.useProxy.password "രഹസ്യവാക്കു്">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "എച് ടി ടി പി /എച് ടി ടി പി എസ് ">
<!ENTITY torsettings.firewall.checkbox "ഈ കംപ്യൂട്ടർ ചില പ്രത്യേക പോർട്ടുകളിലൂടെ മാത്രം ബന്ധം അനുവദിക്കുന്ന ഫയർവാൾ വഴിയാണ് പോകുന്നത്">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "അനുവദിച്ചിട്ടുള്ള പോർട്ടുകൾ ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "എന്റെ രാജ്യത്തു ടോർ സെൻസർ ചെയ്തിട്ടുള്ളതാണ് ">
<!ENTITY torsettings.useBridges.default "ഇതിനകത്തു തന്നെയുള്ള ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക ">
<!ENTITY torsettings.useBridges.default.placeholder "ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക ">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "ബ്രിഡ്ജുകൾ ">
<!ENTITY torPreferences.bridgesDescription "ബ്രിഡ്ജുകൾ ടോർ തടഞ്ഞിട്ടുള്ള സ്ഥലങ്ങളിൽ ടോർ നെറ്റർക് ഉപയോഗിക്കാൻ സഹായിക്കുന്നു . ഒരു ബ്രിഡ്ജ് മറ്റ്റൊന്നിനേക്കാൾ നന്നായി പ്രേവര്തിക്കുന്നത് നിങ്ങൾ എവിടെയാണെന്നതിനെ ആശ്രയിച്ചിരിക്കും .">
<!ENTITY torPreferences.useBridge "ഒരു ബ്രിഡ്ജ് ഉപയോഗിക്കുക ">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "ഒരു പുതിയ ബ്രിഡ്ജിനെ ചോദിക്കുക &#x2026;">
<!ENTITY torPreferences.provideBridge "ഒരു ബ്രിഡ്ജ് നല്കുക">
<!ENTITY torPreferences.advanced "പുരോഗമിച്ച">
<!ENTITY torPreferences.advancedDescription "ടോർ ബ്രൗസർ എങ്ങനെയാണ് ഇന്റർനെറ്റിലേക്കു ബന്ധപ്പെടുന്നത് എന്ന് കോൺഫിഗർ ചെയ്യുക .">
<!ENTITY torPreferences.firewallPortsPlaceholder "കോമ വേര്തിരിച്ചിരിക്കുന്ന വാൽയൂ">
<!ENTITY torPreferences.requestBridgeDialogTitle "ബ്രിഡ്ജിനെ ചോദിക്കുക ">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ബ്രിഡ്ജ് ഡി ബിയെ ബന്ധപ്പെടുന്നു , ദയവായി കാത്തിരിക്കുക .">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ബ്രിഡ്ജിനെ കിട്ടാൻ തന്നിരിക്കുന്ന കാപ്ച പരിഹരിക്കുക ">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "പരിഹാരം ശെരിയല്ല . ദയവായി ഒന്നുകൂടെ ശ്രെമിക്കുക ">
<!ENTITY torPreferences.viewTorLogs "ടോർ ലോഗ്സ് കാണുക .">
<!ENTITY torPreferences.viewLogs "ലോഗ്സ് കാണുക &#x2026;">
diff --git a/mr/network-settings.dtd b/mr/network-settings.dtd
index e372640d2..409ed224d 100644
--- a/mr/network-settings.dtd
+++ b/mr/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "पोर्ट">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "पुलाची विनंती करण्यासाठी कॅप्चाचे निरसन करा.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "उपाय बरोबर नाही. कृपया पुन्हा प्रयत्न करा.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ms_MY/network-settings.dtd b/ms_MY/network-settings.dtd
index 9c6299eea..92d3ea942 100644
--- a/ms_MY/network-settings.dtd
+++ b/ms_MY/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Pilihan">
<!ENTITY torsettings.useProxy.checkbox "Saya guna proksi untuk bersambung dengan Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Jenis Proksi:">
+<!ENTITY torsettings.useProxy.type "Jenis Proxy">
<!ENTITY torsettings.useProxy.type.placeholder "pilih sejenis proksi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Alamat:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "Alamat IP atau nama hos">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nama Pengguna:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Kata Laluan:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Kata Laluan">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Komputer ini melalui tembok api yang hanya membolehkan sambungan ke port tertentu">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Port Dibenarkan:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor dilarang penggunaannya di negara saya">
<!ENTITY torsettings.useBridges.default "Pilih satu titi terbina-dalam">
<!ENTITY torsettings.useBridges.default.placeholder "pilih satu titi">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Jambatan, ataupun Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta satu titi.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Jawapan salah. Cuba sekali lagi.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/my/network-settings.dtd b/my/network-settings.dtd
index e461e30c6..fe6c103be 100644
--- a/my/network-settings.dtd
+++ b/my/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "နေရပ်လိပ်စာ -">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "သုံးစွဲသူအမည် -">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "စကားဝှက် - ">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "အသုံးပြုသူအမည်">
+<!ENTITY torsettings.useProxy.password "စကားဝှက်">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "ခွင့်ပြုထားသော Ports များ -">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "အဆင့်မြင့်">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd
index a6c10b27e..04cffb2e5 100644
--- a/nb/network-settings.dtd
+++ b/nb/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Valgfritt">
<!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for å koble til Internett">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Mellomtjeningstype:">
+<!ENTITY torsettings.useProxy.type "Mellomtjeningstype">
<!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresse:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Brukernavn:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Passord:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Brukernavn">
+<!ENTITY torsettings.useProxy.password "Passord">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land">
<!ENTITY torsettings.useBridges.default "Velg en bro med flere innfartsårer">
<!ENTITY torsettings.useBridges.default.placeholder "velg en bro">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Broer">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avansert">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA-en for å forespørre en bro.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke riktig. Vær så snill, prøv på nytt.">
<!ENTITY torPreferences.viewTorLogs "Se Tor-loggene.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ne/network-settings.dtd b/ne/network-settings.dtd
index 57042065a..12812a4f0 100644
--- a/ne/network-settings.dtd
+++ b/ne/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index b930b5c95..bc3d87099 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optioneel">
<!ENTITY torsettings.useProxy.checkbox "I gebruik een proxy om met het internet te verbinden.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxytype:">
+<!ENTITY torsettings.useProxy.type "Proxy type">
<!ENTITY torsettings.useProxy.type.placeholder "selecteer een proxytype">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adres:">
+<!ENTITY torsettings.useProxy.address "Adres 2">
<!ENTITY torsettings.useProxy.address.placeholder "IP-adres of hostnaam">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Poort:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Gebruikersnaam:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Wachtwoord:">
+<!ENTITY torsettings.useProxy.port "Poort">
+<!ENTITY torsettings.useProxy.username "Gebruikersnaam">
+<!ENTITY torsettings.useProxy.password "Wachtwoord">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die alleen verbindingen naar bepaalde poorten toestaat">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is in mijn land gecensureerd.">
<!ENTITY torsettings.useBridges.default "Een ingebouwde bridge selecteren">
<!ENTITY torsettings.useBridges.default.placeholder "selecteer een bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges helpen u toegang te krijgen tot het Tor-netwerk op plaatsen waar Tor is geblokkeerd. Afhankelijke van waar u zich bevindt, werkt de ene bridge mogelijk beter dan de andere.">
<!ENTITY torPreferences.useBridge "Een bridge gebruiken">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Een nieuwe bridge aanvragen&#x2026;">
<!ENTITY torPreferences.provideBridge "Een bridge aanbieden">
<!ENTITY torPreferences.advanced "Geavanceerd">
<!ENTITY torPreferences.advancedDescription "Configureren hoe Tor Browser verbinding maakt met het internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Kommagescheiden waarden">
<!ENTITY torPreferences.requestBridgeDialogTitle "Een bridge aanvragen">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contact maken met BridgeDB. Even geduld.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Los de CAPTCHA op om een bridge aan te vragen.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "De oplossing is niet juist. Probeer het opnieuw.">
<!ENTITY torPreferences.viewTorLogs "De Tor-logboeken weergeven">
<!ENTITY torPreferences.viewLogs "Logboeken weergeven&#x2026;">
diff --git a/nl_BE/network-settings.dtd b/nl_BE/network-settings.dtd
index d6ec3f7dc..41d63c39d 100644
--- a/nl_BE/network-settings.dtd
+++ b/nl_BE/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optioneel">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy-type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adres:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP adres of hostnaam">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Poort:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Gebruikersnaam:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Wachtwoord:">
+<!ENTITY torsettings.useProxy.port "Poort">
+<!ENTITY torsettings.useProxy.username "Gebruikersnaam">
+<!ENTITY torsettings.useProxy.password "Wachtwoord">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -76,18 +70,14 @@ Dit kan enkele minuten duren.">
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Geavanceerd">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd
index d94e449d6..ceef0a5cc 100644
--- a/nn/network-settings.dtd
+++ b/nn/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Valfritt">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Mellomtenartype:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Addresse:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller vertsnamn">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Brukarnamn:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Passord:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Brukarnamn">
+<!ENTITY torsettings.useProxy.password "Passord">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Tillatne portar:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bruer">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/oc/network-settings.dtd b/oc/network-settings.dtd
index da2e5c85d..6ce1579ce 100644
--- a/oc/network-settings.dtd
+++ b/oc/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Senhal">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/or/network-settings.dtd b/or/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/or/network-settings.dtd
+++ b/or/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/pa/network-settings.dtd b/pa/network-settings.dtd
index 17f12d890..9537f7e1f 100644
--- a/pa/network-settings.dtd
+++ b/pa/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "ਚੋਣਵਾਂ">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "ਪਰਾਕਸੀ ਕਿਸਮ:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "ਪਤਾ:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP ਸਿਰਨਾਵਾਂ ਜਾਂ ਹੋਸਟ-ਨਾਂ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "ਯੂਜ਼ਰ-ਨਾਂ:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "ਪਾਸਵਰਡ:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "ਉੱਨਤ">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd
index e8c508d75..37133aa35 100644
--- a/pl/network-settings.dtd
+++ b/pl/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "(opcjonalnie)">
<!ENTITY torsettings.useProxy.checkbox "Używam proxy do łączenia się z Internetem">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Typ Proxy:">
+<!ENTITY torsettings.useProxy.type "Typ Proxy">
<!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adres:">
+<!ENTITY torsettings.useProxy.address "Adres">
<!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Użytkownik:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Hasło:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Użytkownik">
+<!ENTITY torsettings.useProxy.password "Hasło">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju">
<!ENTITY torsettings.useBridges.default "Wybierz wbudowany most">
<!ENTITY torsettings.useBridges.default.placeholder "wybierz most">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Mostki">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Zaawansowane">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rozwiąż CAPTCHA, aby poprosić o most.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index 4cf2969f9..971ae963b 100644
--- a/pt_BR/network-settings.dtd
+++ b/pt_BR/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opcional">
<!ENTITY torsettings.useProxy.checkbox "Eu uso proxy para me conectar à Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipo de Proxy:">
+<!ENTITY torsettings.useProxy.type "Tipo de Proxy">
<!ENTITY torsettings.useProxy.type.placeholder "Selecione um tipo de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Endereço:">
+<!ENTITY torsettings.useProxy.address "Endereço">
<!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou Servidor">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porta:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Usuário:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Senha:">
+<!ENTITY torsettings.useProxy.port "Porta">
+<!ENTITY torsettings.useProxy.username "Nome de usuário">
+<!ENTITY torsettings.useProxy.password "Palavra-passe">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente a determinadas portas.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor é censurado no país onde estou">
<!ENTITY torsettings.useBridges.default "Selecione uma ponte embutida">
<!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Pontes">
<!ENTITY torPreferences.bridgesDescription "As pontes ajudam você a acessar a rede Tor em locais onde o Tor está bloqueado. Dependendo de onde você estiver, uma ponte pode funcionar melhor que outra.">
<!ENTITY torPreferences.useBridge "Use uma ponte">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Solicitar uma nova ponte&#x2026;">
<!ENTITY torPreferences.provideBridge "Fornecer uma ponte">
<!ENTITY torPreferences.advanced "Avançado">
<!ENTITY torPreferences.advancedDescription "Configure como o Navegador Tor se conecta à Internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Valores Separados Por Virgula">
<!ENTITY torPreferences.requestBridgeDialogTitle "Ponte de solicitação">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Entrando em contato com o BridgeDB. Por favor, espere.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente.">
<!ENTITY torPreferences.viewTorLogs "Veja os logs do Tor.">
<!ENTITY torPreferences.viewLogs "Ver Logs&#x2026;">
diff --git a/pt_PT/network-settings.dtd b/pt_PT/network-settings.dtd
index ba3cedd0d..baa23ba9d 100644
--- a/pt_PT/network-settings.dtd
+++ b/pt_PT/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opcional">
<!ENTITY torsettings.useProxy.checkbox "Eu utilizo um proxy para ligar à Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tipo de proxy:">
+<!ENTITY torsettings.useProxy.type "Tipo de proxy">
<!ENTITY torsettings.useProxy.type.placeholder "selecionar um tipo de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Endereço:">
+<!ENTITY torsettings.useProxy.address "Morada">
<!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do hospedeiro">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porta:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nome do utilizador:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Palavra-passe:">
+<!ENTITY torsettings.useProxy.port "Porta">
+<!ENTITY torsettings.useProxy.username "nome de utilizador">
+<!ENTITY torsettings.useProxy.password "Palavra-passe">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "O Tor é censurado no meu país">
<!ENTITY torsettings.useBridges.default "Selecionar uma ponte integrada">
<!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Pontes">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avançado">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd
index 602aa09d5..320b9b94a 100644
--- a/ro/network-settings.dtd
+++ b/ro/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Opțional">
<!ENTITY torsettings.useProxy.checkbox "Folosesc un proxy pentru a mă conecta la Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Tip proxy:">
+<!ENTITY torsettings.useProxy.type "Tip proxy">
<!ENTITY torsettings.useProxy.type.placeholder "alege un tip de proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresă:">
+<!ENTITY torsettings.useProxy.address "Adresa">
<!ENTITY torsettings.useProxy.address.placeholder "Adresă IP sau hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Nume utilizator:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Parola:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Nume utilizator">
+<!ENTITY torsettings.useProxy.password "Parola">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Acest computer trece printr-un firewall care permite doar conexiuni către anumite porturi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Porturi permise:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor este cenzurat în țara mea">
<!ENTITY torsettings.useBridges.default "Selectează o punte integrată">
<!ENTITY torsettings.useBridges.default.placeholder "selectează o punte">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Punți">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avansat">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rezolvă acest CAPTCHA pentru a cere o punte.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Soluția nu este corectă. Încearcă din nou.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd
index 112aa0973..4cc49f69d 100644
--- a/ru/network-settings.dtd
+++ b/ru/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Необязательно">
<!ENTITY torsettings.useProxy.checkbox "Я использую прокси для подключения к интернету">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Тип прокси:">
+<!ENTITY torsettings.useProxy.type "Тип Прокси">
<!ENTITY torsettings.useProxy.type.placeholder "выбор типа прокси">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Адрес:">
+<!ENTITY torsettings.useProxy.address "Адрес">
<!ENTITY torsettings.useProxy.address.placeholder "IP-адрес или имя узла">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Порт:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Имя пользователя:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Пароль:">
+<!ENTITY torsettings.useProxy.port "Порт">
+<!ENTITY torsettings.useProxy.username "Имя пользователя">
+<!ENTITY torsettings.useProxy.password "Пароль">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor запрещен в моей стране">
<!ENTITY torsettings.useBridges.default "Выбрать встроенный мост">
<!ENTITY torsettings.useBridges.default.placeholder "выбор моста">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Мосты">
<!ENTITY torPreferences.bridgesDescription "Мосты помогают получить доступ к сети Tor в местах, где он заблокирован. В зависимости от места, где вы находитесь, один мост может работать лучше другого.">
<!ENTITY torPreferences.useBridge "Использовать мост">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Запрос нового моста&#x2026;">
<!ENTITY torPreferences.provideBridge "Предоставить мост">
<!ENTITY torPreferences.advanced "Дополнительно">
<!ENTITY torPreferences.advancedDescription "Настройка подключения Tor Browser к интернету.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Значения, разделённые запятыми">
<!ENTITY torPreferences.requestBridgeDialogTitle "Запрос моста">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Обращение к BridgeDB. Пожалуйста, подождите.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решите CAPTCHA для запроса моста.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решение не является правильным. Попробуйте еще раз.">
<!ENTITY torPreferences.viewTorLogs "Просмотр журналов Tor.">
<!ENTITY torPreferences.viewLogs "Просмотр журналов&#x2026;">
diff --git a/si_LK/network-settings.dtd b/si_LK/network-settings.dtd
index bbc63226e..d9c3f2339 100644
--- a/si_LK/network-settings.dtd
+++ b/si_LK/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "අමතර">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "නියුතු සේවාදායක වර්ගය:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "ලිපිනය:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP ලිපිනය හෝ සත්කාරක නාමය">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "පොර්ටය:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "පරිශීලක නාමය">
-<!-- TODO: remove colon-->
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
<!ENTITY torsettings.useProxy.password "මුරපදය">
<!ENTITY torsettings.useProxy.type.socks4 "4 වැනි සොකට්ටුව">
<!ENTITY torsettings.useProxy.type.socks5 "5 වැනි සොකට්ටුව">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "මෙම පරිගණකය විශේෂිත ports සදහා සම්බන්ධ වීමට ඉඩදෙන පරිදි firewall එකක් හරහා ගමන් කරයි.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "අනුමත Ports">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "සේතු">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "උසස් ">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/sk/network-settings.dtd b/sk/network-settings.dtd
index f73bc29f3..32c7e0c90 100644
--- a/sk/network-settings.dtd
+++ b/sk/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Voliteľné">
<!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Typ Proxy:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "vybrať typ proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa:">
+<!ENTITY torsettings.useProxy.address "Adresa">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Už.názov:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Heslo?">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Používateľské meno">
+<!ENTITY torsettings.useProxy.password "Heslo">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Tento počítač ide cez firewall, ktorý povoľuje iba niektoré porty">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný">
<!ENTITY torsettings.useBridges.default "Zvoľte zabudované premostenie">
<!ENTITY torsettings.useBridges.default.placeholder "zvoľte premostenie">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Mosty">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Pokročilé">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Vyrieš CAPTCHA na vyžiadanie premostenia.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Riešenie nie je správne. Prosím skúste znova.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/sl/network-settings.dtd b/sl/network-settings.dtd
index d3119fdcf..52fab8134 100644
--- a/sl/network-settings.dtd
+++ b/sl/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Po izbiri">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy tip:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Naslov:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "vrata:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Uporabniško ime:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Geslo:">
+<!ENTITY torsettings.useProxy.port "Vrata">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Geslo">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Računalnik uporablja požarni zid, ki dovoljuje povezavo le na določena vrata">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Mostovi">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Napredno">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/son/network-settings.dtd b/son/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/son/network-settings.dtd
+++ b/son/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/sq/network-settings.dtd b/sq/network-settings.dtd
index e5ca0fc16..4a059ea71 100644
--- a/sq/network-settings.dtd
+++ b/sq/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Me zgjedhje">
<!ENTITY torsettings.useProxy.checkbox "Unë përdor një proxy për tu lidhur në Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Lloji i Proxy-t:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa:">
+<!ENTITY torsettings.useProxy.address "Adresë">
<!ENTITY torsettings.useProxy.address.placeholder "Adresa IP ose emri i pritësit">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Porta:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Emri i përdoruesit:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Fjalëkalimi:">
+<!ENTITY torsettings.useProxy.port "Portë">
+<!ENTITY torsettings.useProxy.username "Emër përdoruesi">
+<!ENTITY torsettings.useProxy.password "Fjalëkalim">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "TOR është i çensuruar në vëndin tim">
<!ENTITY torsettings.useBridges.default "Zgjidh një urë të paracaktuar">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Urat">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Të mëtejshme">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/sr/network-settings.dtd b/sr/network-settings.dtd
index 8c46da87e..1a21a609d 100644
--- a/sr/network-settings.dtd
+++ b/sr/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Опционо">
<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za povezivanje na internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Врста proxyja:">
+<!ENTITY torsettings.useProxy.type "Тип проксија">
<!ENTITY torsettings.useProxy.type.placeholder "изаберите тип проксија">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adresa:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP адреса или hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Порт:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Корисничко име:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Lozinka:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Lozinka">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Овај рачунар пролази кроз firewall који дозвољава само конекције на одређене портове.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Тор је цензурисан у мојој земљи">
<!ENTITY torsettings.useBridges.default "Odaberi ugrađeni most">
<!ENTITY torsettings.useBridges.default.placeholder "Odaberi most">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Mostovi">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Напредно">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rešite CAPTCHA da biste zahtevali most.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Rešenje nije ispravno. Molimo pokušajte ponovo.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index 09616d1c2..c4ccf7b86 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Valfritt">
<!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxytyp:">
+<!ENTITY torsettings.useProxy.type "Proxy-typ">
<!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adress:">
+<!ENTITY torsettings.useProxy.address "Adress">
<!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Användarnamn:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Lösenord:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Användarnamn">
+<!ENTITY torsettings.useProxy.password "Lösenord">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Denna dator går genom en brandvägg som bara tillåter anslutningar på vissa specifika portar.">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor är censurerat i mitt land">
<!ENTITY torsettings.useBridges.default "Välj en inbyggd bro">
<!ENTITY torsettings.useBridges.default.placeholder "Välj en bro">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Broar">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Avancerat">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lös CAPTCHA:n för att begära en bro.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Lösningen är inte korrekt. Vänligen försök igen.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/sw/network-settings.dtd b/sw/network-settings.dtd
index 879715c34..306747ac0 100644
--- a/sw/network-settings.dtd
+++ b/sw/network-settings.dtd
@@ -26,24 +26,19 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Kituo:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Nywila
+nenosiri">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +70,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ta/network-settings.dtd b/ta/network-settings.dtd
index 544797f59..b79991b60 100644
--- a/ta/network-settings.dtd
+++ b/ta/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "விருப்பத்தேர்வு">
<!ENTITY torsettings.useProxy.checkbox "நான் இணையத்துடன் இணைய ஒரு பதிலாளைப் பயன்படுத்துகிறேன்">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "பதிலாள் வகை:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "ஒரு பதிலாள் வகையைத் தேர்ந்தெடுங்கள்">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "முகவரி:">
+<!ENTITY torsettings.useProxy.address "முகவரி">
<!ENTITY torsettings.useProxy.address.placeholder "IP முகவரி அல்லது ஹோஸ்ட்பெயர்">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "பயனர்பெயர்:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "கடவுச்சொல்:">
+<!ENTITY torsettings.useProxy.port "பெயர்த்துவை">
+<!ENTITY torsettings.useProxy.username "பயனர்பெயர்">
+<!ENTITY torsettings.useProxy.password "கடவுச்சொல்">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "இந்த கணினி ஒரு தீயரண் வழியே செல்கிறது அது குறிப்பிட்ட முனைகளுக்கான இணைப்புகளை மட்டுமே அனுமதிக்கிறது">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "அனுமதிக்கப்பட்ட முனைகள்:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor எனது நாட்டின் தணிக்கையிடப்படுகிறது">
<!ENTITY torsettings.useBridges.default "ஒரு உள்ளமை bridge தேர்ந்தெடுங்கள்">
<!ENTITY torsettings.useBridges.default.placeholder "ஒரு bridge தேர்ந்தெடுங்கள்">
@@ -76,18 +70,14 @@
<!ENTITY torPreferences.bridges "Bridgeகள்">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/te/network-settings.dtd b/te/network-settings.dtd
index da2e5c85d..4424b9194 100644
--- a/te/network-settings.dtd
+++ b/te/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Optional">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Username:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.password "Password">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/th/network-settings.dtd b/th/network-settings.dtd
index e4fa0b1b1..12d1662e9 100644
--- a/th/network-settings.dtd
+++ b/th/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "ไม่จำเป็น">
<!ENTITY torsettings.useProxy.checkbox "ฉันใช้พร็อกซีเพื่อเชื่อมต่อกับอินเทอร์เน็ต">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "ชนิดพร็อกซีคือ">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "เลือกชนิดพร็อกซี">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "ที่อยู่คือ">
+<!ENTITY torsettings.useProxy.address "ที่อยู่">
<!ENTITY torsettings.useProxy.address.placeholder "ที่อยู่ IP หรือชื่อโฮสต์">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "พอร์ตคือ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "ชื่อผู้ใช้คือ">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "รหัสผ่านคือ">
+<!ENTITY torsettings.useProxy.port "พอร์ต">
+<!ENTITY torsettings.useProxy.username "ชื่อผู้ใช้">
+<!ENTITY torsettings.useProxy.password "รหัสผ่าน">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP หรือ HTTPS">
<!ENTITY torsettings.firewall.checkbox "คอมพิวเตอร์เครื่องนี้ใช้งานผ่านไฟร์วอลล์ที่อนุญาตให้เชื่อมต่อกับเฉพาะบางพอร์ตเท่านั้น">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "พอร์ตที่อนุญาตคือ ">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor ถูกเซ็นเซอร์ในประเทศของฉัน">
<!ENTITY torsettings.useBridges.default "เลือกสะพานที่มีมาให้ในตัว">
<!ENTITY torsettings.useBridges.default.placeholder "เลือกสะพาน">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "สะพาน">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "ขั้นสูง">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "แก้ปัญหา CAPTCHA เพื่อขอสะพาน">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "วิธีแก้ไขไม่ถูกต้อง กรุณาลองอีกครั้ง">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index a0179c496..4e811d2b7 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "İsteğe bağlı">
<!ENTITY torsettings.useProxy.checkbox "Internete erişmek için vekil sunucu kullanıyorum">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:">
+<!ENTITY torsettings.useProxy.type "Proxy Türü">
<!ENTITY torsettings.useProxy.type.placeholder "vekil sunucu türünü seçin">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Adres:">
+<!ENTITY torsettings.useProxy.address "Adres">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Kapı Numarası:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Kullanıcı Adı:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Parola:">
+<!ENTITY torsettings.useProxy.port "Kapı No">
+<!ENTITY torsettings.useProxy.username "Kullanıcı adı">
+<!ENTITY torsettings.useProxy.password "Parola">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Bu bilgisayarda yalnız belirli kapı numaralarından bağlanılmasına izin veren bir güvenlik duvarı kullanılıyor">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Kullanılabilecek Kapı Numaraları:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor ağı engelleniyor">
<!ENTITY torsettings.useBridges.default "Hazır Köprülerden Seçin">
<!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Köprüler">
<!ENTITY torPreferences.bridgesDescription "Köprüler Tor bağlantısının engellendiği yerlerden Tor Ağına erişmek için kullanılır.. Bulunduğunuz konuma göre bir köprü türü diğerinden daha uygun olabilir.">
<!ENTITY torPreferences.useBridge "Bir köprü kullanın">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Yeni Köprü İsteğinde Bulunun&#x2026;">
<!ENTITY torPreferences.provideBridge "Bir köprü adresi yazın">
<!ENTITY torPreferences.advanced "Gelişmiş">
<!ENTITY torPreferences.advancedDescription "Tor Browser uygulamasının İnternete nasıl bağlanacağını yapılandırın.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Virgül ile ayrılmış değerler">
<!ENTITY torPreferences.requestBridgeDialogTitle "Köprü İsteğinde Bulunun">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Köprü veritabanına bağlanılıyor. Lütfen bekleyin.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Köprü isteği yapmak için güvenlik kodunu çözün.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Çözüm doğru değil. Lütfen yeniden deneyin.">
<!ENTITY torPreferences.viewTorLogs "Tor günlük kayıtlarına bakın.">
<!ENTITY torPreferences.viewLogs "Günlüğü Görüntüle&#x2026;">
diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd
index e7a986294..42c4bba28 100644
--- a/uk/network-settings.dtd
+++ b/uk/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Додатково">
<!ENTITY torsettings.useProxy.checkbox "Я використовую проксі для з'єднання з Інтернетом">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Тип проксі:">
+<!ENTITY torsettings.useProxy.type "Тип проксі">
<!ENTITY torsettings.useProxy.type.placeholder "оберіть тип проксі">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Адреса:">
+<!ENTITY torsettings.useProxy.address "Адреса">
<!ENTITY torsettings.useProxy.address.placeholder "ІР адреса або ім'я хосту">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Порт:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Ім'я користувача:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Пароль:">
+<!ENTITY torsettings.useProxy.port "Порт">
+<!ENTITY torsettings.useProxy.username "Ім'я користувача">
+<!ENTITY torsettings.useProxy.password "Пароль">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Мій брандмауер дозволяє підключення тільки до певних портів">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Тор цензується в моїй країні">
<!ENTITY torsettings.useBridges.default "Виберіть вбудований міст">
<!ENTITY torsettings.useBridges.default.placeholder "Виберіть міст">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Мости">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Розширений">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Розв'яжіть CAPTCHA, щоб надіслати запит на отримання мосту.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Розв'язання невірне. Спробуйте знову.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/ur/network-settings.dtd b/ur/network-settings.dtd
index 7b763244e..f22dc3f5b 100644
--- a/ur/network-settings.dtd
+++ b/ur/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "اختیاری">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "پتہ">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "صارف کا نام:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "پاس ورڈ :">
+<!ENTITY torsettings.useProxy.port "پورٹ">
+<!ENTITY torsettings.useProxy.username "صارف کا نام">
+<!ENTITY torsettings.useProxy.password "پاس ورڈ">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "ترقی یافتہ">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "پل کی گزارش کرنے کیلئے کیپچا کو حل کریں۔">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/uz/network-settings.dtd b/uz/network-settings.dtd
index aaae5c131..6750724ee 100644
--- a/uz/network-settings.dtd
+++ b/uz/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Qo'shimcha">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Proksi turi:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Manzil:">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP manzil yoki host nomi">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Port:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Foydalanuvchi nomi:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Maxfiy so'z:">
+<!ENTITY torsettings.useProxy.port "Port">
+<!ENTITY torsettings.useProxy.username "Foydalanuvchi nomi">
+<!ENTITY torsettings.useProxy.password "Пароль">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Qo‘shimcha">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/vi/network-settings.dtd b/vi/network-settings.dtd
index 1910e2aa7..09ff182b9 100644
--- a/vi/network-settings.dtd
+++ b/vi/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "Tuỳ chọn">
<!ENTITY torsettings.useProxy.checkbox "Tôi sử dụng proxy để kết nối tới Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "Dạng proxy:">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "chọn loại proxy">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "Địa chỉ:">
+<!ENTITY torsettings.useProxy.address "Địa chỉ nhà">
<!ENTITY torsettings.useProxy.address.placeholder "Địa chỉ IP hoặc hostname">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "Cổng:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "Tên đăng nhập:">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "Mật khẩu:">
+<!ENTITY torsettings.useProxy.port "Cổng">
+<!ENTITY torsettings.useProxy.username "Tên đăng nhập">
+<!ENTITY torsettings.useProxy.password "Mật mã">
<!ENTITY torsettings.useProxy.type.socks4 "SOCK 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCK 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Máy tính này đi qua một tường lửa mà chỉ cho phép tới một vài cổng">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "Những Cổng Được phép:">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor đã bị kiểm duyệt ở quốc gia của tôi">
<!ENTITY torsettings.useBridges.default "Sử dụng cầu nối có sẵn">
<!ENTITY torsettings.useBridges.default.placeholder "chọn loại cầu nối">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Cầu Nối">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Nâng cao">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 203a3a286..8f8a16954 100644
--- a/zh_CN/network-settings.dtd
+++ b/zh_CN/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "可选">
<!ENTITY torsettings.useProxy.checkbox "使用代理访问互联网">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "代理类型：">
+<!ENTITY torsettings.useProxy.type "代理服务器类型">
<!ENTITY torsettings.useProxy.type.placeholder "选择代理类型">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "地址：">
+<!ENTITY torsettings.useProxy.address "地址">
<!ENTITY torsettings.useProxy.address.placeholder "IP 地址或主机名">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "端口：">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "用户名：">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "密码：">
+<!ENTITY torsettings.useProxy.port "端口">
+<!ENTITY torsettings.useProxy.username "用户名">
+<!ENTITY torsettings.useProxy.password "密码">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "允许的端口：">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查">
<!ENTITY torsettings.useBridges.default "选择内置网桥">
<!ENTITY torsettings.useBridges.default.placeholder "选择网桥">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "网桥">
<!ENTITY torPreferences.bridgesDescription "网桥帮助你在 Tor 被阻塞的地方连接 Tor 网络。取决于你在哪里，有的网桥的效果可能比另一个要好。">
<!ENTITY torPreferences.useBridge "使用网桥">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "正在请求新网桥&#x2026;">
<!ENTITY torPreferences.provideBridge "添加网桥">
<!ENTITY torPreferences.advanced "高级">
<!ENTITY torPreferences.advancedDescription "配置 Tor 浏览器如何接入网络。">
<!ENTITY torPreferences.firewallPortsPlaceholder "逗号分隔值">
<!ENTITY torPreferences.requestBridgeDialogTitle "正在请求网桥">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在连接到 BridgeDB，请等待。">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。">
<!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。">
<!ENTITY torPreferences.viewLogs "查看日志&#x2026;">
diff --git a/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd
index 4e4e3591a..9b808de8f 100644
--- a/zh_HK/network-settings.dtd
+++ b/zh_HK/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "選用">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "代理伺服器類型：">
+<!ENTITY torsettings.useProxy.type "Proxy Type">
<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "位址：">
+<!ENTITY torsettings.useProxy.address "Address">
<!ENTITY torsettings.useProxy.address.placeholder "IP位址或主機名稱">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "連接埠：">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "用戶名：">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "密碼：">
+<!ENTITY torsettings.useProxy.port "連接埠">
+<!ENTITY torsettings.useProxy.username "用戶名">
+<!ENTITY torsettings.useProxy.password "密碼">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "http╱https">
<!ENTITY torsettings.firewall.checkbox "呢部電腦通過某個只容許連接至特定連線埠嘅防火牆">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "容許嘅連接埠：">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "Bridges">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "Advanced">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index 01f2e2984..729db6cc8 100644
--- a/zh_TW/network-settings.dtd
+++ b/zh_TW/network-settings.dtd
@@ -26,24 +26,18 @@
<!ENTITY torsettings.optional "選用">
<!ENTITY torsettings.useProxy.checkbox "使用代理服務連線到網際網路">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.type "代理伺服器類型：">
+<!ENTITY torsettings.useProxy.type "Proxy類型">
<!ENTITY torsettings.useProxy.type.placeholder "選擇代理伺服器類型">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.address "位址：">
+<!ENTITY torsettings.useProxy.address "地址">
<!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.port "連接埠：">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.username "使用者名稱：">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.useProxy.password "密碼：">
+<!ENTITY torsettings.useProxy.port "埠">
+<!ENTITY torsettings.useProxy.username "用戶名">
+<!ENTITY torsettings.useProxy.password "密碼">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連接埠的防火牆">
-<!-- TODO: remove colon-->
-<!ENTITY torsettings.firewall.allowedPorts "允許的連接埠：">
+<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
<!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查">
<!ENTITY torsettings.useBridges.default "選擇內建的橋接">
<!ENTITY torsettings.useBridges.default.placeholder "選擇橋接">
@@ -75,18 +69,14 @@
<!ENTITY torPreferences.bridges "橋接器">
<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
<!ENTITY torPreferences.useBridge "Use a bridge">
-<!-- torlauncher.request_a_new_bridge -->
<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;">
<!ENTITY torPreferences.provideBridge "Provide a bridge">
<!ENTITY torPreferences.advanced "進階的">
<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
-<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -->
<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
-<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -->
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "解決驗證碼來請求橋接">
-<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.-->
<!ENTITY torPreferences.requestBridgeErrorBadSolution "解答不正確。請再試一次。">
<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
<!ENTITY torPreferences.viewLogs "View Logs&#x2026;">
1
0
[translation/tor-and-https_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_completed
by translation＠torproject.org 15 Oct '19
by translation＠torproject.org 15 Oct '19
15 Oct '19
commit 6784736e743324bc50b8bd8e1e12804c4c4b5575
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Oct 15 11:50:22 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_compl…
---
hr.po | 2 +-
hu.po | 2 +-
mk.po | 2 +-
pl.po | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hr.po b/hr.po
index 49a5bdd98..bf0129461 100644
--- a/hr.po
+++ b/hr.po
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2019-04-17 20:44+0000\n"
"Last-Translator: erinm\n"
-"Language-Team: Croatian (http://beta.transifex.com/otf/torproject/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/hu.po b/hu.po
index cfe981584..b9f20963c 100644
--- a/hu.po
+++ b/hu.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2018-09-12 20:52+0000\n"
"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n"
-"Language-Team: Hungarian (http://beta.transifex.com/otf/torproject/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/mk.po b/mk.po
index 31b940b5a..563830cea 100644
--- a/mk.po
+++ b/mk.po
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2018-11-15 23:12+0000\n"
"Last-Translator: Liljana Ackovska <liljanagjurova(a)gmail.com>\n"
-"Language-Team: Macedonian (http://beta.transifex.com/otf/torproject/language/mk/)\n"
+"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/pl.po b/pl.po
index ed85ac318..5aeaa1033 100644
--- a/pl.po
+++ b/pl.po
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2018-04-12 19:08+0000\n"
"Last-Translator: Krzys <kborzychowski(a)gmail.com>\n"
-"Language-Team: Polish (http://beta.transifex.com/otf/torproject/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
1
0
[translation/tor-and-https_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_completed
by translation＠torproject.org 15 Oct '19
by translation＠torproject.org 15 Oct '19
15 Oct '19
commit 2cfed0a1f23f4576dfda223eefa0ec2cce55c753
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Oct 15 11:20:42 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_compl…
---
hr.po | 2 +-
hu.po | 2 +-
mk.po | 2 +-
pl.po | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hr.po b/hr.po
index bf0129461..49a5bdd98 100644
--- a/hr.po
+++ b/hr.po
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2019-04-17 20:44+0000\n"
"Last-Translator: erinm\n"
-"Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
+"Language-Team: Croatian (http://beta.transifex.com/otf/torproject/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/hu.po b/hu.po
index b9f20963c..cfe981584 100644
--- a/hu.po
+++ b/hu.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2018-09-12 20:52+0000\n"
"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
+"Language-Team: Hungarian (http://beta.transifex.com/otf/torproject/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/mk.po b/mk.po
index 563830cea..31b940b5a 100644
--- a/mk.po
+++ b/mk.po
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2018-11-15 23:12+0000\n"
"Last-Translator: Liljana Ackovska <liljanagjurova(a)gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
+"Language-Team: Macedonian (http://beta.transifex.com/otf/torproject/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/pl.po b/pl.po
index 5aeaa1033..ed85ac318 100644
--- a/pl.po
+++ b/pl.po
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2014-07-17 14:23+0000\n"
"PO-Revision-Date: 2018-04-12 19:08+0000\n"
"Last-Translator: Krzys <kborzychowski(a)gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
+"Language-Team: Polish (http://beta.transifex.com/otf/torproject/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
1
0