tor-commits
Threads by month
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
September 2017
- 16 participants
- 2951 discussions
01 Sep '17
commit 0ba44ec1c767b6faeb76b53c11a3aaefa33e0c83
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Thu Aug 31 21:45:32 2017 +0200
Use try-with-resources in more places.
---
.../org/torproject/metrics/hidserv/Aggregator.java | 8 +++-----
.../torproject/metrics/hidserv/DocumentStore.java | 16 +++++-----------
.../org/torproject/metrics/hidserv/Parser.java | 14 +++++---------
.../org/torproject/ernie/cron/Configuration.java | 4 +---
.../cron/network/ConsensusStatsFileHandler.java | 22 +++++++++-------------
.../metrics/web/graphs/RObjectGenerator.java | 15 ++++++---------
.../metrics/web/research/ResearchStatsServlet.java | 11 ++++-------
7 files changed, 33 insertions(+), 57 deletions(-)
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java
index ea09a78..c438ea2 100644
--- a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java
+++ b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java
@@ -184,12 +184,10 @@ public class Aggregator {
}
/* Write all aggregated results to the output file. */
- try {
- this.hidservStatsCsvFile.getParentFile().mkdirs();
- BufferedWriter bw = new BufferedWriter(new FileWriter(
- this.hidservStatsCsvFile));
+ this.hidservStatsCsvFile.getParentFile().mkdirs();
+ try (BufferedWriter bw = new BufferedWriter(new FileWriter(
+ this.hidservStatsCsvFile))) {
bw.write(sb.toString());
- bw.close();
} catch (IOException e) {
System.err.printf("Unable to write results to %s. Ignoring.");
}
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java
index db60f83..5ecb849 100644
--- a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java
+++ b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java
@@ -74,10 +74,9 @@ public class DocumentStore<T extends Document> {
/* Write to a new temporary file, then move it into place, possibly
* overwriting an existing file. */
- try {
- documentTempFile.getParentFile().mkdirs();
- BufferedWriter bw = new BufferedWriter(new FileWriter(
- documentTempFile));
+ documentTempFile.getParentFile().mkdirs();
+ try (BufferedWriter bw = new BufferedWriter(new FileWriter(
+ documentTempFile))) {
for (Map.Entry<String, SortedSet<String>> e
: formattedDocuments.entrySet()) {
bw.write(e.getKey() + "\n");
@@ -85,7 +84,6 @@ public class DocumentStore<T extends Document> {
bw.write(" " + s + "\n");
}
}
- bw.close();
documentFile.delete();
documentTempFile.renameTo(documentFile);
} catch (IOException e) {
@@ -116,9 +114,8 @@ public class DocumentStore<T extends Document> {
/* Parse the document file line by line and de-serialize contained
* documents. */
- try {
- LineNumberReader lnr = new LineNumberReader(new BufferedReader(
- new FileReader(documentFile)));
+ try (LineNumberReader lnr = new LineNumberReader(new BufferedReader(
+ new FileReader(documentFile)))) {
String line;
String formattedString0 = null;
while ((line = lnr.readLine()) != null) {
@@ -128,7 +125,6 @@ public class DocumentStore<T extends Document> {
System.err.printf("First line in %s must not start with a "
+ "space. Not retrieving any previously stored "
+ "documents.%n", documentFile.getAbsolutePath());
- lnr.close();
return null;
} else if (prefix.length() > formattedString0.length()
&& !(formattedString0 + line.substring(1))
@@ -146,13 +142,11 @@ public class DocumentStore<T extends Document> {
System.err.printf("Unable to read line %d from %s. Not "
+ "retrieving any previously stored documents.%n",
lnr.getLineNumber(), documentFile.getAbsolutePath());
- lnr.close();
return null;
}
result.add(document);
}
}
- lnr.close();
} catch (IOException e) {
System.err.printf("Unable to read %s. Not retrieving any "
+ "previously stored documents.%n",
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java
index ebfe869..3195dd8 100644
--- a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java
+++ b/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java
@@ -96,9 +96,8 @@ public class Parser {
if (this.parseHistoryFile.exists()
&& this.parseHistoryFile.isFile()) {
SortedMap<String, Long> excludedFiles = new TreeMap<>();
- try {
- BufferedReader br = new BufferedReader(new FileReader(
- this.parseHistoryFile));
+ try (BufferedReader br = new BufferedReader(new FileReader(
+ this.parseHistoryFile))) {
String line;
while ((line = br.readLine()) != null) {
try {
@@ -111,7 +110,6 @@ public class Parser {
+ "Skipping line.%n", line);
}
}
- br.close();
} catch (IOException e) {
System.err.printf("Could not read history file '%s'. Not "
+ "excluding descriptors in this execution.",
@@ -135,10 +133,9 @@ public class Parser {
excludedAndParsedFiles.putAll(
this.descriptorReader.getExcludedFiles());
excludedAndParsedFiles.putAll(this.descriptorReader.getParsedFiles());
- try {
- this.parseHistoryFile.getParentFile().mkdirs();
- BufferedWriter bw = new BufferedWriter(new FileWriter(
- this.parseHistoryFile));
+ this.parseHistoryFile.getParentFile().mkdirs();
+ try (BufferedWriter bw = new BufferedWriter(new FileWriter(
+ this.parseHistoryFile))) {
for (Map.Entry<String, Long> e
: excludedAndParsedFiles.entrySet()) {
/* Each line starts with the last-modified time of the descriptor
@@ -148,7 +145,6 @@ public class Parser {
bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath
+ "\n");
}
- bw.close();
} catch (IOException e) {
System.err.printf("Could not write history file '%s'. Not "
+ "excluding descriptors in next execution.",
diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java b/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java
index d1bc63b..0c40293 100644
--- a/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java
+++ b/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java
@@ -57,8 +57,7 @@ public class Configuration {
return;
}
String line = null;
- try {
- BufferedReader br = new BufferedReader(new FileReader(configFile));
+ try (BufferedReader br = new BufferedReader(new FileReader(configFile))) {
while ((line = br.readLine()) != null) {
if (line.startsWith("#") || line.length() < 1) {
continue;
@@ -97,7 +96,6 @@ public class Configuration {
System.exit(1);
}
}
- br.close();
} catch (ArrayIndexOutOfBoundsException e) {
logger.severe("Configuration file contains configuration key "
+ "without value in line '" + line + "'. Exiting!");
diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java b/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java
index c06acc3..fd77fa9 100644
--- a/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java
+++ b/modules/legacy/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java
@@ -120,11 +120,10 @@ public class ConsensusStatsFileHandler {
/* Read in number of running bridges per bridge status. */
if (this.bridgeConsensusStatsRawFile.exists()) {
- try {
- this.logger.fine("Reading file "
- + this.bridgeConsensusStatsRawFile.getAbsolutePath() + "...");
- BufferedReader br = new BufferedReader(new FileReader(
- this.bridgeConsensusStatsRawFile));
+ this.logger.fine("Reading file "
+ + this.bridgeConsensusStatsRawFile.getAbsolutePath() + "...");
+ try (BufferedReader br = new BufferedReader(new FileReader(
+ this.bridgeConsensusStatsRawFile))) {
String line = null;
while ((line = br.readLine()) != null) {
if (line.startsWith("date")) {
@@ -151,7 +150,6 @@ public class ConsensusStatsFileHandler {
} /* No more cases as we already checked the range above. */
this.bridgesRaw.put(key, value);
}
- br.close();
this.logger.fine("Finished reading file "
+ this.bridgeConsensusStatsRawFile.getAbsolutePath() + ".");
} catch (IOException e) {
@@ -299,19 +297,17 @@ public class ConsensusStatsFileHandler {
}
/* Write raw numbers of running bridges to disk. */
- try {
- this.logger.fine("Writing file "
- + this.bridgeConsensusStatsRawFile.getAbsolutePath() + "...");
- this.bridgeConsensusStatsRawFile.getParentFile().mkdirs();
- BufferedWriter bw = new BufferedWriter(
- new FileWriter(this.bridgeConsensusStatsRawFile));
+ this.logger.fine("Writing file "
+ + this.bridgeConsensusStatsRawFile.getAbsolutePath() + "...");
+ this.bridgeConsensusStatsRawFile.getParentFile().mkdirs();
+ try (BufferedWriter bw = new BufferedWriter(
+ new FileWriter(this.bridgeConsensusStatsRawFile))) {
bw.append("datetime,authority,brunning,brunningec2");
bw.newLine();
for (String line : this.bridgesRaw.values()) {
bw.append(line);
bw.newLine();
}
- bw.close();
this.logger.fine("Finished writing file "
+ this.bridgeConsensusStatsRawFile.getAbsolutePath() + ".");
} catch (IOException e) {
diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java b/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java
index aa6ab4f..fa9e1d8 100644
--- a/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java
+++ b/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java
@@ -214,11 +214,9 @@ public class RObjectGenerator implements ServletContextListener {
tableFilename, checkCache).getBytes();
/* Write the table content to a map. */
- List<Map<String, String>> result = null;
- try {
- result = new ArrayList<>();
- BufferedReader br = new BufferedReader(new InputStreamReader(
- new ByteArrayInputStream(tableBytes)));
+ List<Map<String, String>> result = new ArrayList<>();
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(
+ new ByteArrayInputStream(tableBytes)))) {
String line = br.readLine();
if (line != null) {
List<String> headers = new ArrayList<>(Arrays.asList(line.split(",")));
@@ -321,10 +319,9 @@ public class RObjectGenerator implements ServletContextListener {
/* Read the R object from disk and write it to a byte array. */
long lastModified = this.objectFile.lastModified();
- try {
- BufferedInputStream bis = new BufferedInputStream(
- new FileInputStream(this.objectFile), 1024);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try (BufferedInputStream bis = new BufferedInputStream(
+ new FileInputStream(this.objectFile), 1024);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
byte[] buffer = new byte[1024];
int length;
while ((length = bis.read(buffer)) > 0) {
diff --git a/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java b/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java
index 0a37c04..4d657c9 100644
--- a/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java
+++ b/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java
@@ -102,18 +102,15 @@ public class ResearchStatsServlet extends HttpServlet {
statsFile.length()));
response.setHeader("Content-Disposition",
"inline; filename=\"" + statsFile.getName() + "\"");
- try {
- BufferedInputStream bis = new BufferedInputStream(
- new FileInputStream(statsFile), 8192);
- BufferedOutputStream bos = new BufferedOutputStream(
- response.getOutputStream());
+ try (BufferedInputStream bis = new BufferedInputStream(
+ new FileInputStream(statsFile), 8192);
+ BufferedOutputStream bos = new BufferedOutputStream(
+ response.getOutputStream())) {
byte[] buffer = new byte[8192];
int length;
while ((length = bis.read(buffer)) > 0) {
bos.write(buffer, 0, length);
}
- bos.close();
- bis.close();
} catch (IOException e) {
return false;
}
1
0
01 Sep '17
commit 59b315716133f5da7c11c724cb7be9b3f3c3464a
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Thu Aug 31 21:57:22 2017 +0200
Use switch-on-String in multiple places.
---
.../java/org/torproject/metrics/clients/Main.java | 42 ++++++----
.../cron/RelayDescriptorDatabaseImporter.java | 31 ++++---
.../org/torproject/metrics/web/GraphServlet.java | 95 ++++++++++------------
.../org/torproject/metrics/web/NewsServlet.java | 29 ++++---
.../metrics/web/graphs/RObjectGenerator.java | 13 ++-
5 files changed, 117 insertions(+), 93 deletions(-)
diff --git a/modules/clients/src/main/java/org/torproject/metrics/clients/Main.java b/modules/clients/src/main/java/org/torproject/metrics/clients/Main.java
index 384c621..ea198ff 100644
--- a/modules/clients/src/main/java/org/torproject/metrics/clients/Main.java
+++ b/modules/clients/src/main/java/org/torproject/metrics/clients/Main.java
@@ -296,12 +296,18 @@ public class Main {
* greater than 4, put in a default that we'll attribute all responses
* to. */
if (total == 0) {
- if (category.equals("country")) {
- frequenciesCopy.put("??", 4.0);
- } else if (category.equals("transport")) {
- frequenciesCopy.put("<OR>", 4.0);
- } else if (category.equals("version")) {
- frequenciesCopy.put("v4", 4.0);
+ switch (category) {
+ case "country":
+ frequenciesCopy.put("??", 4.0);
+ break;
+ case "transport":
+ frequenciesCopy.put("<OR>", 4.0);
+ break;
+ case "version":
+ frequenciesCopy.put("v4", 4.0);
+ break;
+ default:
+ /* Ignore any other categories. */
}
total = 4.0;
}
@@ -309,15 +315,21 @@ public class Main {
double intervalFraction = ((double) (toMillis - fromMillis))
/ ((double) dirreqStatsIntervalLengthMillis);
double val = resp * intervalFraction * e.getValue() / total;
- if (category.equals("country")) {
- writeOutputLine(fingerprint, "bridge", "responses", e.getKey(),
- "", "", fromMillis, toMillis, val, publishedMillis);
- } else if (category.equals("transport")) {
- writeOutputLine(fingerprint, "bridge", "responses", "",
- e.getKey(), "", fromMillis, toMillis, val, publishedMillis);
- } else if (category.equals("version")) {
- writeOutputLine(fingerprint, "bridge", "responses", "", "",
- e.getKey(), fromMillis, toMillis, val, publishedMillis);
+ switch (category) {
+ case "country":
+ writeOutputLine(fingerprint, "bridge", "responses", e.getKey(),
+ "", "", fromMillis, toMillis, val, publishedMillis);
+ break;
+ case "transport":
+ writeOutputLine(fingerprint, "bridge", "responses", "",
+ e.getKey(), "", fromMillis, toMillis, val, publishedMillis);
+ break;
+ case "version":
+ writeOutputLine(fingerprint, "bridge", "responses", "", "",
+ e.getKey(), fromMillis, toMillis, val, publishedMillis);
+ break;
+ default:
+ /* Ignore any other categories. */
}
}
}
diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
index f214f4c..a05c86c 100644
--- a/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
+++ b/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
@@ -747,18 +747,25 @@ public final class RelayDescriptorDatabaseImporter {
int offset = (int) (lastIntervalTime / (15L * 60L * 1000L))
- longValues.length + 1;
String type = parts[2];
- if (type.equals("read-history")) {
- readArray = longValues;
- readOffset = offset;
- } else if (type.equals("write-history")) {
- writtenArray = longValues;
- writtenOffset = offset;
- } else if (type.equals("dirreq-read-history")) {
- dirreadArray = longValues;
- dirreadOffset = offset;
- } else if (type.equals("dirreq-write-history")) {
- dirwrittenArray = longValues;
- dirwrittenOffset = offset;
+ switch (type) {
+ case "read-history":
+ readArray = longValues;
+ readOffset = offset;
+ break;
+ case "write-history":
+ writtenArray = longValues;
+ writtenOffset = offset;
+ break;
+ case "dirreq-read-history":
+ dirreadArray = longValues;
+ dirreadOffset = offset;
+ break;
+ case "dirreq-write-history":
+ dirwrittenArray = longValues;
+ dirwrittenOffset = offset;
+ break;
+ default:
+ /* Ignore any other types. */
}
lastDate = currentDate;
}
diff --git a/website/src/main/java/org/torproject/metrics/web/GraphServlet.java b/website/src/main/java/org/torproject/metrics/web/GraphServlet.java
index 12652dc..b376be5 100644
--- a/website/src/main/java/org/torproject/metrics/web/GraphServlet.java
+++ b/website/src/main/java/org/torproject/metrics/web/GraphServlet.java
@@ -166,58 +166,53 @@ public class GraphServlet extends MetricServlet {
request.getParameterMap());
StringBuilder urlBuilder = new StringBuilder();
for (String parameter : this.parameters.get(requestedId)) {
- if (parameter.equals("start") || parameter.equals("end")) {
- String[] requestParameter;
- if (checkedParameters != null
- && checkedParameters.containsKey(parameter)) {
- requestParameter = checkedParameters.get(parameter);
- } else {
- requestParameter = new String[] {
- dateFormat.format(parameter.equals("start")
- ? defaultStartDate : defaultEndDate) };
- }
- urlBuilder.append(String.format("&%s=%s", parameter,
- requestParameter[0]));
- request.setAttribute(parameter, requestParameter);
- } else if (parameter.equals("p")
- || parameter.equals("n")
- || parameter.equals("flag")
- || parameter.equals("country")
- || parameter.equals("events")
- || parameter.equals("transport")
- || parameter.equals("version")
- || parameter.equals("source")
- || parameter.equals("server")
- || parameter.equals("filesize")) {
- String[][] defaultParameters =
- this.defaultParameters.get(parameter);
- String[][] requestParameters =
- new String[defaultParameters.length][];
- Set<String> checked = null;
- if (checkedParameters != null
- && checkedParameters.containsKey(parameter)) {
- checked = new HashSet<>(Arrays.asList(
- checkedParameters.get(parameter)));
- }
- String checkedOrSelected = parameter.equals("country")
- || parameter.equals("events") || parameter.equals("version")
- ? " selected" : " checked";
- for (int i = 0; i < defaultParameters.length; i++) {
- requestParameters[i] =
- new String[defaultParameters[i].length];
- System.arraycopy(defaultParameters[i], 0,
- requestParameters[i], 0, defaultParameters[i].length);
- if (checked != null) {
- if (checked.contains(requestParameters[i][0])) {
- requestParameters[i][1] = checkedOrSelected;
- urlBuilder.append(String.format("&%s=%s", parameter,
- requestParameters[i][0]));
- } else {
- requestParameters[i][1] = "";
+ switch (parameter) {
+ case "start":
+ case "end":
+ String[] requestParameter;
+ if (checkedParameters != null
+ && checkedParameters.containsKey(parameter)) {
+ requestParameter = checkedParameters.get(parameter);
+ } else {
+ requestParameter = new String[] {
+ dateFormat.format(parameter.equals("start")
+ ? defaultStartDate : defaultEndDate) };
+ }
+ urlBuilder.append(String.format("&%s=%s", parameter,
+ requestParameter[0]));
+ request.setAttribute(parameter, requestParameter);
+ break;
+ default:
+ String[][] defaultParameters =
+ this.defaultParameters.get(parameter);
+ String[][] requestParameters =
+ new String[defaultParameters.length][];
+ Set<String> checked = null;
+ if (checkedParameters != null
+ && checkedParameters.containsKey(parameter)) {
+ checked = new HashSet<>(Arrays.asList(
+ checkedParameters.get(parameter)));
+ }
+ String checkedOrSelected = parameter.equals("country")
+ || parameter.equals("events") || parameter.equals("version")
+ ? " selected" : " checked";
+ for (int i = 0; i < defaultParameters.length; i++) {
+ requestParameters[i] =
+ new String[defaultParameters[i].length];
+ System.arraycopy(defaultParameters[i], 0,
+ requestParameters[i], 0, defaultParameters[i].length);
+ if (checked != null) {
+ if (checked.contains(requestParameters[i][0])) {
+ requestParameters[i][1] = checkedOrSelected;
+ urlBuilder.append(String.format("&%s=%s", parameter,
+ requestParameters[i][0]));
+ } else {
+ requestParameters[i][1] = "";
+ }
}
}
- }
- request.setAttribute(parameter, requestParameters);
+ request.setAttribute(parameter, requestParameters);
+ break;
}
}
if (urlBuilder.length() > 5) {
diff --git a/website/src/main/java/org/torproject/metrics/web/NewsServlet.java b/website/src/main/java/org/torproject/metrics/web/NewsServlet.java
index 6dfaba7..1dfea4c 100644
--- a/website/src/main/java/org/torproject/metrics/web/NewsServlet.java
+++ b/website/src/main/java/org/torproject/metrics/web/NewsServlet.java
@@ -103,18 +103,23 @@ public class NewsServlet extends AnyServlet {
}
if (news.getProtocols() != null) {
for (String protocol : news.getProtocols()) {
- if (protocol.equals("relay")) {
- sb.append(" <span class=\"label label-success\">"
- + "Relays</span>");
- } else if (protocol.equals("bridge")) {
- sb.append(" <span class=\"label label-primary\">"
- + "Bridges</span>");
- } else if (protocol.equals("<OR>")) {
- sb.append(" <span class=\"label label-info\">"
- + "<OR></span>");
- } else {
- sb.append(" <span class=\"label label-info\">"
- + protocol + "</span>");
+ switch (protocol) {
+ case "relay":
+ sb.append(" <span class=\"label label-success\">"
+ + "Relays</span>");
+ break;
+ case "bridge":
+ sb.append(" <span class=\"label label-primary\">"
+ + "Bridges</span>");
+ break;
+ case "<OR>":
+ sb.append(" <span class=\"label label-info\">"
+ + "<OR></span>");
+ break;
+ default:
+ sb.append(" <span class=\"label label-info\">"
+ + protocol + "</span>");
+ break;
}
}
}
diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java b/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java
index fa9e1d8..719a5c4 100644
--- a/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java
+++ b/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java
@@ -62,10 +62,15 @@ public class RObjectGenerator implements ServletContextListener {
for (Metric metric : ContentProvider.getInstance().getMetricsList()) {
String type = metric.getType();
String id = metric.getId();
- if ("Graph".equals(type)) {
- this.availableGraphs.put(id, metric);
- } else if ("Table".equals(type)) {
- this.availableTables.put(id, metric);
+ switch (type) {
+ case "Graph":
+ this.availableGraphs.put(id, metric);
+ break;
+ case "Table":
+ this.availableTables.put(id, metric);
+ break;
+ default:
+ /* Just skip any other types. */
}
}
1
0
[tor-messenger-build/master] Stop building linux with debug symbols
by arlo@torproject.org 01 Sep '17
by arlo@torproject.org 01 Sep '17
01 Sep '17
commit cdde464b75dae553cf8ac4e6dfc17256e58caf46
Author: Arlo Breault <arlolra(a)gmail.com>
Date: Fri Sep 1 10:01:06 2017 -0400
Stop building linux with debug symbols
---
projects/instantbird/mozconfig-linux-i686 | 9 ++-------
projects/instantbird/mozconfig-linux-x86_64 | 8 --------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686
index ef6a5f2..ae90209 100644
--- a/projects/instantbird/mozconfig-linux-i686
+++ b/projects/instantbird/mozconfig-linux-i686
@@ -1,13 +1,8 @@
-export CFLAGS="-m32 -gdwarf-2 -Wno-sign-compare"
-export CXXFLAGS="-m32 -gdwarf-2"
+export CFLAGS=-m32
+export CXXFLAGS=-m32
export LDFLAGS=-m32
export XLDOPTS=-m32
export ASFLAGS=-m32
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
ac_add_options --host=i686-linux-gnu
ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-strip
diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64
index 39a36eb..63b610b 100644
--- a/projects/instantbird/mozconfig-linux-x86_64
+++ b/projects/instantbird/mozconfig-linux-x86_64
@@ -1,9 +1 @@
-export CFLAGS="-gdwarf-2 -Wno-sign-compare"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-strip
1
0
[tor-messenger-build/master] Update the changelog for various pushed commits
by arlo@torproject.org 01 Sep '17
by arlo@torproject.org 01 Sep '17
01 Sep '17
commit d24a4c67709d952bc42abc62b21ab3be42ec7718
Author: Arlo Breault <arlolra(a)gmail.com>
Date: Fri Sep 1 09:43:31 2017 -0400
Update the changelog for various pushed commits
* Should have been part of,
67cf5ed57e2186a5baace53191450d0be2628ae6
a0c459f20779f10a13d9045ae7ef63efeb8423e5
bbded9cef95914552735e0fa4c8779bc07b15911
---
ChangeLog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 5b97025..5c74e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@ Tor Messenger 0.5.0b1 --
* Use the THUNDERBIRD_52_3_0_RELEASE tag on comm-esr52
* Update tor-browser to 7.0.4
* Update tor-launcher to 0.2.12.3
+ * Trac 22005: Move to ESR 52
+ * Trac 16606: Temporary XMPP accounts
+ * Trac 13855: Use known onions for XMPP servers
+ * Mac
+ * Trac 20316: Update OS X toolchain
+ * Windows
+ * Trac 17469: Tor Messenger is not working on Windows XP
Tor Messenger 0.4.0b3 -- June 13, 2017
* All Platforms
1
0
[tor-browser-bundle/maint-7.0] Let's pick up a new HTTPS-E version and do a build2
by gk@torproject.org 01 Sep '17
by gk@torproject.org 01 Sep '17
01 Sep '17
commit af77e037638b93853a15653772cc973846055c9e
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 1 08:57:54 2017 +0000
Let's pick up a new HTTPS-E version and do a build2
---
Bundle-Data/Docs/ChangeLog.txt | 4 ++--
gitian/versions | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 6c541ef..53c52b7 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,9 +1,9 @@
-Tor Browser 7.0.5 -- August 30 2017
+Tor Browser 7.0.5 -- September 2 2017
* All Platforms
* Update Torbutton to 1.9.7.6
* Bug 22989: Fix dimensions of new windows on macOS
* Translations update
- * Update HTTPS-Everywhere to 2017.8.19
+ * Update HTTPS-Everywhere to 2017.8.31
* Update NoScript to 5.0.9
* Bug 23166: Add new obfs4 bridge to the built-in ones
* Bug 23258: Fix broken HTTPS-Everywhere on higher security levels
diff --git a/gitian/versions b/gitian/versions
index 56ff0db..d6e1dd4 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -18,7 +18,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1
TOR_TAG=tor-0.3.0.10
TORLAUNCHER_TAG=0.2.12.3
TORBUTTON_TAG=1.9.7.6
-HTTPSE_TAG=2017.8.19
+HTTPSE_TAG=2017.8.31
NSIS_TAG=v0.3.1
ZLIB_TAG=v1.2.8
LIBEVENT_TAG=release-2.0.22-stable
1
0
[translation/tails-greeter] Update translations for tails-greeter
by translation@torproject.org 01 Sep '17
by translation@torproject.org 01 Sep '17
01 Sep '17
commit 005d055b7476a06e61c2861784d03a10b8bed172
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Sep 1 05:16:25 2017 +0000
Update translations for tails-greeter
---
es_AR/es_AR.po | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 7c5e4958b..802081bb6 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 08:28+0200\n"
-"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"POT-Creation-Date: 2017-06-10 12:27+0200\n"
+"PO-Revision-Date: 2017-08-17 03:47+0000\n"
"Last-Translator: carolyn <carolyn(a)anhalt.org>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr ""
#: ../data/greeter.ui.h:13
msgid "MAC Address Spoofing"
-msgstr ""
+msgstr "Spoofing de Direcciones MAC"
#: ../data/greeter.ui.h:14
msgid ""
@@ -73,15 +73,15 @@ msgid ""
"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
" as it helps you hide your geographical location. But it might also create "
"connectivity problems or look suspicious."
-msgstr ""
+msgstr "La suplantación de direcciones MAC esconde el número de serie de la interfaz de red (Wi-Fi o cableada) a la red local. La suplantación de direcciones MAC generalmente es más segura ya que te ayuda a esconder tu ubicación geográfica. Pero también puede crear problemas de conectividad o parecer sospechoso."
#: ../data/greeter.ui.h:15
msgid "Spoof all MAC addresses (default)"
-msgstr ""
+msgstr "Suplantar todas las direcciones MAC (por defecto)"
#: ../data/greeter.ui.h:16
msgid "Don't spoof MAC addresses"
-msgstr ""
+msgstr "No suplantar las direcciones MAC"
#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
msgid "Cannot unlock encrypted storage with this passphrase."
1
0
[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation@torproject.org 01 Sep '17
by translation@torproject.org 01 Sep '17
01 Sep '17
commit a21023bbd724f260e039ad947f759303a829c043
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Sep 1 05:16:12 2017 +0000
Update translations for liveusb-creator_completed
---
pt_BR/pt_BR.po | 845 +++++++++++++++++++++++++++------------------------------
tr/tr.po | 6 +-
2 files changed, 410 insertions(+), 441 deletions(-)
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index dc768f164..1198f39d4 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Communia <ameaneantie(a)riseup.net>, 2013-2016
+# Communia <ameaneantie(a)riseup.net>, 2013-2017
# carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014
# carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014
# Carlos Villela, 2014
@@ -12,6 +12,7 @@
# Daniel Messias dos Santos <danielms97(a)outlook.com>, 2013
# Daniel S. Koda <danielskoda(a)gmail.com>, 2008
# Danton Medrado, 2015
+# Eduardo Addad de Oliveira <duduaddad(a)gmail.com>, 2017
# Eduardo Bonsi, 2013
# Eduardo Luis Voltolini Tafner, 2013
# Augustine <evandro(a)geocities.com>, 2013
@@ -27,9 +28,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-12-04 23:53+0000\n"
-"Last-Translator: Communia <ameaneantie(a)riseup.net>\n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-08-10 17:18+0000\n"
+"Last-Translator: Eduardo Addad de Oliveira <duduaddad(a)gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,591 +38,559 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../liveusb/gui.py:451
-msgid "\"Clone & Install\""
-msgstr "\"Clonar e Instalar\""
+#: ../tails_installer/creator.py:100
+msgid "You must run this application as root"
+msgstr "Você deve executar este aplicativo como Administrador"
-#: ../liveusb/gui.py:453
-msgid "\"Install from ISO\""
-msgstr "\"Instalar a partir de uma ISO\""
+#: ../tails_installer/creator.py:146
+msgid "Extracting live image to the target device..."
+msgstr "Extraindo imagem Live para o dispositivo indicado..."
-#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153
+#: ../tails_installer/creator.py:153
#, python-format
-msgid "%(distribution)s Installer"
-msgstr "Instalador do %(distribution)s"
+msgid "Wrote to device at %(speed)d MB/sec"
+msgstr "Gravou no dispositivo a uma velocidade de %(speed)d MB/s"
-#: ../liveusb/gui.py:804
-#, python-format
-msgid "%(filename)s selected"
-msgstr "%(filename)s selecionado"
+#: ../tails_installer/creator.py:183
+msgid "Setting up OLPC boot file..."
+msgstr "Configurando o arquivo de inicialização do OLPC ..."
-#: ../liveusb/gui.py:424
+#: ../tails_installer/creator.py:302
#, python-format
-msgid "%(size)s %(label)s"
-msgstr "%(size)s %(label)s"
+msgid ""
+"There was a problem executing the following command: `%(command)s`.\n"
+"A more detailed error log has been written to '%(filename)s'."
+msgstr "Problema encontrado ao executar o seguinte comando: `%(command)s`.\nUm arquivo de registro mais detalhado foi criado em '%(filename)s'."
-#: ../liveusb/gui.py:430
-#, python-format
-msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
-msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+#: ../tails_installer/creator.py:321
+msgid "Verifying SHA1 checksum of LiveCD image..."
+msgstr "Verificando o SHA1 (Secure Hash Algorithm-1) da imagem do LiveCD..."
-#: ../liveusb/creator.py:1097
-#, python-format
-msgid "%s already bootable"
-msgstr "%s pronto para iniciar"
+#: ../tails_installer/creator.py:325
+msgid "Verifying SHA256 checksum of LiveCD image..."
+msgstr "Examinando a soma de verificação do SHA256 (Secure Hash Algorithm-256) da imagem do LiveCD..."
-#: ../liveusb/launcher_ui.py:160
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n"
-"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>"
-msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Você precisa de ajuda? Leia <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentação</span></a>.</p></body></html>"
-
-#: ../liveusb/launcher_ui.py:155
+#: ../tails_installer/creator.py:341
msgid ""
-"<ul>\n"
-"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n"
-"\n"
-"<li>The USB stick that you install on is formatted and all data is lost.</li>\n"
-"\n"
-"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n"
-"\n"
-"</ul>"
-msgstr "<ul>\n<li>Instalar o Tails em outro drive USB, copiando o sistema Tails que você está usando agora..</li>\n\n<li> O drive USB que você usar será formatado e todos os dados serão perdidos.</li>\n\n<li>O volume de armazenamento criptografado Persistent do drive USB do Tails que você está usando agora não será copiado.</li>\n\n</ul>"
-
-#: ../liveusb/launcher_ui.py:157
-msgid ""
-"<ul>\n"
-"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n"
-"\n"
-"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n"
-"\n"
-"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n"
-"\n"
-"\n"
-"</ul>"
-msgstr "<ul>\n<li>Atualizar outra unidade USB-Tails para a mesma versão do Tails que você está usando agora.</li>\n\n<li>O espaço de armazenamento persistente criptografado da unidade USB-Tails a ser atualizado será mantido.</li>\n\n<li>O espaço de armazenamento persistente criptografado da unidade USB-Tails que você está usando agora não será copiado.</li>\n\n\n</ul>"
-
-#: ../liveusb/launcher_ui.py:159
-msgid ""
-"<ul>\n"
-"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n"
-"\n"
-"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n"
-"\n"
-"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n"
-"\n"
-"</ul>"
-msgstr "<ul>\n<li>Atualizar outra unidade USB-Tails a partir de uma imagem ISO.</li>\n\n<li>O espaço de armazenamento persistente criptografado da unidade USB-Tails a ser atualizado será mantido.</li>\n\n<li>O espaço de armazenamento persistente criptografado na unidade USB-Tails que você está usando agora não será copiada.</li>\n\n</ul>"
-
-#: ../liveusb/dialog.py:161
-msgid "Alt+B"
-msgstr "Alt+N"
-
-#: ../liveusb/dialog.py:160
-msgid "Browse"
-msgstr "Navegar"
-
-#: ../liveusb/dialog.py:167
-msgid ""
-"By allocating extra space on your USB stick for a persistent overlay, you "
-"will be able to store data and make permanent modifications to your live "
-"operating system. Without it, you will not be able to save data that will "
-"persist after a reboot."
-msgstr "Reservando espaço extra para uma sobrecamada persistente na memória USB, você poderá armazenar dados e fazer modificações permanentes no seu sistema operacional. Caso contrário, você não poderá salvar os dados que restarem após uma reinicialização."
-
-#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459
-#, python-format
-msgid "Calculating the SHA1 of %s"
-msgstr "Calculando o SHA1 (Secure Hash Algorithm) de %s"
+"Error: The SHA1 of your Live CD is invalid. You can run this program with "
+"the --noverify argument to bypass this verification check."
+msgstr "Erro: o SHA1 do seu LiveCD é inválido. Você pode executar este programa com a opção `--noverify' para contornar essa verificação."
-#: ../liveusb/creator.py:1407
-msgid "Cannot find"
-msgstr "Não foi possível localizar"
+#: ../tails_installer/creator.py:347
+msgid "Unknown ISO, skipping checksum verification"
+msgstr "Imagem ISO desconhecida, ignorando o exame da soma de verificação "
-#: ../liveusb/creator.py:560
+#: ../tails_installer/creator.py:358
#, python-format
-msgid "Cannot find device %s"
-msgstr "Não foi possível localizar o dispositivo %s"
+msgid ""
+"Not enough free space on device.\n"
+"%dMB ISO + %dMB overlay > %dMB free space"
+msgstr "Não há espaço livre suficiente no dispositivo.\n%dMB ISO + %dMB superfície > %dMB de espaço livre"
-#: ../liveusb/creator.py:417
+#: ../tails_installer/creator.py:365
#, python-format
msgid "Creating %sMB persistent overlay"
msgstr "Criando sobrecamada persistente de %sMB..."
-#: ../liveusb/gui.py:582
-msgid ""
-"Device is not yet mounted, so we cannot determine the amount of free space."
-msgstr "O dispositivo ainda não está montado, por isso não podemos determinar a sua quantidade de espaço livre."
-
-#: ../liveusb/dialog.py:164
+#: ../tails_installer/creator.py:426
#, python-format
-msgid "Download %(distribution)s"
-msgstr "Fazer o download %(distribution)s"
-
-#: ../liveusb/gui.py:778
-msgid "Download complete!"
-msgstr "Download concluído!"
+msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s"
+msgstr "Não foi possível copiar %(infile)s para %(outfile)s: %(message)s"
-#: ../liveusb/gui.py:782
-msgid "Download failed: "
-msgstr "O download falhou: "
+#: ../tails_installer/creator.py:440
+msgid "Removing existing Live OS"
+msgstr "Removendo o sistema operacional Live existente"
-#: ../liveusb/gui.py:89
+#: ../tails_installer/creator.py:449 ../tails_installer/creator.py:460
#, python-format
-msgid "Downloading %s..."
-msgstr "Fazendo download %s..."
-
-#: ../liveusb/creator.py:1192
-msgid "Drive is a loopback, skipping MBR reset"
-msgstr "O dispositivo é um loopback. Pulando a reinicialização do MBR"
+msgid "Unable to chmod %(file)s: %(message)s"
+msgstr "Não foi possível modificar as permissões de %(file)s: %(message)s"
-#: ../liveusb/creator.py:837
+#: ../tails_installer/creator.py:453
#, python-format
-msgid "Entering unmount_device for '%(device)s'"
-msgstr "Adicionando dispositivo_desmontado ao '%(device)s'"
-
-#: ../liveusb/creator.py:1272
-msgid "Error probing device"
-msgstr "Erro ao sondar o dispositivo"
-
-#: ../liveusb/gui.py:213
-msgid ""
-"Error: Cannot set the label or obtain the UUID of your device. Unable to "
-"continue."
-msgstr "Erro: não foi possível definir o rótulo ou obter o UUID (Universal Unique identifier) do seu dispositivo. Impossível continuar."
-
-#: ../liveusb/creator.py:393
-msgid ""
-"Error: The SHA1 of your Live CD is invalid. You can run this program with "
-"the --noverify argument to bypass this verification check."
-msgstr "Erro: o SHA1 do seu LiveCD é inválido. Você pode executar este programa com a opção `--noverify' para contornar essa verificação."
-
-#: ../liveusb/creator.py:155
-msgid "Extracting live image to the target device..."
-msgstr "Extraindo imagem Live para o dispositivo indicado..."
+msgid "Unable to remove file from previous LiveOS: %(message)s"
+msgstr "Não foi possível remover um arquivo do sistema operacional Live anterior: %(message)s"
-#: ../liveusb/creator.py:1140
+#: ../tails_installer/creator.py:465
#, python-format
-msgid "Formatting %(device)s as FAT32"
-msgstr "Formatando %(device)s como FAT32"
-
-#: ../liveusb/creator.py:150
-msgid "ISO MD5 checksum passed"
-msgstr "A soma de verificação MD5 da imagem ISO foi bem-sucedida"
+msgid "Unable to remove directory from previous LiveOS: %(message)s"
+msgstr "Não foi possível remover um diretório do sistema operacional Live anterior: %(message)s"
-#: ../liveusb/creator.py:148
-msgid "ISO MD5 checksum verification failed"
-msgstr "O exame da soma de verificação MD5 da imagem ISO falhou"
+#: ../tails_installer/creator.py:513
+#, python-format
+msgid "Cannot find device %s"
+msgstr "Não foi possível localizar o dispositivo %s"
-#: ../liveusb/dialog.py:163
-msgid ""
-"If you do not select an existing Live ISO, the selected release will be "
-"downloaded for you."
-msgstr "Se você não selecionar uma Live ISO já existente, a versão selecionada será baixada para você."
+#: ../tails_installer/creator.py:678
+#, python-format
+msgid "Unable to write on %(device)s, skipping."
+msgstr "Não foi possível gravar no dispositivo %(device)s. Pulando"
-#: ../liveusb/launcher_ui.py:154
+#: ../tails_installer/creator.py:697
+#, python-format
msgid ""
-"Install\n"
-"by cloning"
-msgstr "Instalar\npor clonagem"
+"Some partitions of the target device %(device)s are mounted. They will be "
+"unmounted before starting the installation process."
+msgstr "Algumas partições do dispositivo indicado %(device)s estão montadas. Elas serão desmontadas antes do processo de instalação iniciar."
-#: ../liveusb/dialog.py:172
-msgid "Install Tails"
-msgstr "Instalar Tails"
+#: ../tails_installer/creator.py:740 ../tails_installer/creator.py:964
+msgid "Unknown filesystem. Your device may need to be reformatted."
+msgstr "Sistema de arquivos desconhecido. Talvez o seu dispositivo precise ser formatado novamente."
-#: ../liveusb/gui.py:645
-msgid "Installation complete!"
-msgstr "Instalação concluída!"
+#: ../tails_installer/creator.py:743 ../tails_installer/creator.py:967
+#, python-format
+msgid "Unsupported filesystem: %s"
+msgstr "Sistema de arquivos não possui suporte: %s"
-#: ../liveusb/gui.py:265
+#: ../tails_installer/creator.py:760
#, python-format
-msgid "Installation complete! (%s)"
-msgstr "Instalação concluída! (%s)"
+msgid "Unknown GLib exception while trying to mount device: %(message)s"
+msgstr "Exceção GLib desconhecida ao tentar montar o dispositivo: %(message)s"
-#: ../liveusb/gui.py:646
-msgid "Installation was completed. Press OK to close this program."
-msgstr "A instalação foi concluída. Clique em OK para fechar este programa."
+#: ../tails_installer/creator.py:764
+#, python-format
+msgid "Unable to mount device: %(message)s"
+msgstr "Não foi possível montar o dispositivo: %(message)s"
-#: ../liveusb/creator.py:990 ../liveusb/creator.py:1313
-msgid "Installing bootloader..."
-msgstr "Instalando reinicializador..."
+#: ../tails_installer/creator.py:769
+msgid "No mount points found"
+msgstr "Nenhum ponto de montagem encontrado"
-#: ../liveusb/gui.py:454
+#: ../tails_installer/creator.py:780
#, python-format
-msgid ""
-"It is impossible to upgrade the device %(pretty_name)s because it was not "
-"created using Tails Installer. You should instead use %(action)s to upgrade "
-"Tails on this device."
-msgstr "Impossível atualizar o dispositivo %(pretty_name)s porque ele não foi criado usando o Instalador Tails. Tente utilizar %(action)s para atualizar o Tails neste dispositivo."
-
-#: ../liveusb/gui.py:270
-msgid "LiveUSB creation failed!"
-msgstr "A criação da LiveUSB falhou!"
+msgid "Entering unmount_device for '%(device)s'"
+msgstr "Adicionando dispositivo_desmontado ao '%(device)s'"
-#: ../liveusb/creator.py:1408
-msgid ""
-"Make sure to extract the entire liveusb-creator zip file before running this"
-" program."
-msgstr "Tenha certeza de ter extraído todos os arquivos .zip do liveusb-creator antes de executar este programa."
+#: ../tails_installer/creator.py:790
+#, python-format
+msgid "Unmounting mounted filesystems on '%(device)s'"
+msgstr "Desmontando os sistemas de arquivos montados em '%(device)s'"
-#: ../liveusb/creator.py:1284
-msgid ""
-"Make sure your USB key is plugged in and formatted with the FAT filesystem"
-msgstr "Certifique-se de que a sua memória USB esteja conectada e formatada com o sistema de arquivos FAT"
+#: ../tails_installer/creator.py:794
+#, python-format
+msgid "Unmounting '%(udi)s' on '%(device)s'"
+msgstr "Desmontando '%(udi)s' no (s) '%(device)s'"
-#: ../liveusb/creator.py:859
+#: ../tails_installer/creator.py:804
#, python-format
msgid "Mount %s exists after unmounting"
msgstr "O ponto de montagem %s existe mesmo após ter sido desmontado"
-#: ../liveusb/gui.py:588
+#: ../tails_installer/creator.py:817
#, python-format
-msgid "No free space on device %(device)s"
-msgstr "Não há espaço suficiente no dispositivo %(device)s."
+msgid "Partitioning device %(device)s"
+msgstr "Particionando o dispositivo %(device)s"
-#: ../liveusb/creator.py:826
-msgid "No mount points found"
-msgstr "Nenhum ponto de montagem encontrado"
+#: ../tails_installer/creator.py:895
+#, python-format
+msgid "Updating properties of system partition %(system_partition)s"
+msgstr "Atualizando as propriedades da partição de sistema %(system_partition)s"
-#: ../liveusb/creator.py:410
+#: ../tails_installer/creator.py:949
#, python-format
-msgid ""
-"Not enough free space on device.\n"
-"%dMB ISO + %dMB overlay > %dMB free space"
-msgstr "Não há espaço livre suficiente no dispositivo.\n%dMB ISO + %dMB superfície > %dMB de espaço livre"
+msgid "Unsupported device '%(device)s', please report a bug."
+msgstr "Dispositivo incompatível '%(device)s', por favor reporte o bug."
-#: ../liveusb/gui.py:569
-msgid "Partition is FAT16; Restricting overlay size to 2G"
-msgstr "A partição é FAT16; Restringindo o tamanho da sobrecamada a 2GB"
+#: ../tails_installer/creator.py:952
+msgid "Trying to continue anyway."
+msgstr "Tentando continuar de qualquer maneira."
-#: ../liveusb/gui.py:565
-msgid "Partition is FAT32; Restricting overlay size to 4G"
-msgstr "A partição é FAT32; Restringindo o tamanho da sobrecamada a 4G"
+#: ../tails_installer/creator.py:961 ../tails_installer/creator.py:1354
+msgid "Verifying filesystem..."
+msgstr "Verificando o sistema de arquivos..."
-#: ../liveusb/creator.py:236 ../liveusb/creator.py:866
+#: ../tails_installer/creator.py:985
#, python-format
-msgid "Partitioning device %(device)s"
-msgstr "Particionando o dispositivo %(device)s"
+msgid "Unable to change volume label: %(message)s"
+msgstr "Não foi possível alterar o rótulo do dispositivo: %(message)s"
-#: ../liveusb/gui.py:636
-msgid "Persistent Storage"
-msgstr "Armazenamento Persistente"
+#: ../tails_installer/creator.py:990 ../tails_installer/creator.py:1387
+msgid "Installing bootloader..."
+msgstr "Instalando reinicializador..."
-#: ../liveusb/dialog.py:168
-msgid "Persistent Storage (0 MB)"
-msgstr "Armazenamento permanente (0 MB)"
+#: ../tails_installer/creator.py:1016
+#, python-format
+msgid "Could not find the '%s' COM32 module"
+msgstr "Não foi possível encontrar o módulo '%s' COM32 "
-#: ../liveusb/gui.py:698 ../liveusb/gui.py:727
-msgid "Please confirm your device selection"
-msgstr "Por favor, confirme a seleção do seu dispositivo"
+#: ../tails_installer/creator.py:1024 ../tails_installer/creator.py:1405
+#, python-format
+msgid "Removing %(file)s"
+msgstr "Removendo %(file)s"
-#: ../liveusb/gui.py:481
-msgid "Refreshing releases..."
-msgstr "Atualizando versões..."
+#: ../tails_installer/creator.py:1136
+#, python-format
+msgid "%s already bootable"
+msgstr "%s pronto para iniciar"
-#: ../liveusb/gui.py:486
-msgid "Releases updated!"
-msgstr "Versões atualizadas!"
+#: ../tails_installer/creator.py:1156
+msgid "Unable to find partition"
+msgstr "Não foi possível localizar a partição"
-#: ../liveusb/creator.py:997 ../liveusb/creator.py:1331
+#: ../tails_installer/creator.py:1179
#, python-format
-msgid "Removing %(file)s"
-msgstr "Removendo %(file)s"
+msgid "Formatting %(device)s as FAT32"
+msgstr "Formatando %(device)s como FAT32"
-#: ../liveusb/creator.py:492
-msgid "Removing existing Live OS"
-msgstr "Removendo o sistema operacional Live existente"
+#: ../tails_installer/creator.py:1239
+msgid "Could not find syslinux' gptmbr.bin"
+msgstr "Não foi possível encontrar syslinux' gptmbr.bin"
+
+#: ../tails_installer/creator.py:1252
+#, python-format
+msgid "Reading extracted MBR from %s"
+msgstr "Lendo MBR extraído de %s"
-#: ../liveusb/creator.py:1186
+#: ../tails_installer/creator.py:1256
+#, python-format
+msgid "Could not read the extracted MBR from %(path)s"
+msgstr "Não foi possível ler o MBR extraído de %(path)s"
+
+#: ../tails_installer/creator.py:1269 ../tails_installer/creator.py:1270
#, python-format
msgid "Resetting Master Boot Record of %s"
msgstr "Reinicializando o Master Boot Record (MBR) de %s"
-#: ../liveusb/gui.py:789
-msgid "Select Live ISO"
-msgstr "Selecione Live ISO"
-
-#: ../liveusb/creator.py:192
-msgid "Setting up OLPC boot file..."
-msgstr "Configurando o arquivo de inicialização do OLPC ..."
+#: ../tails_installer/creator.py:1275
+msgid "Drive is a loopback, skipping MBR reset"
+msgstr "O dispositivo é um loopback. Pulando a reinicialização do MBR"
-#: ../liveusb/creator.py:742
+#: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1533
#, python-format
-msgid ""
-"Some partitions of the target device %(device)s are mounted. They will be "
-"unmounted before starting the installation process."
-msgstr "Algumas partições do dispositivo indicado %(device)s estão montadas. Elas serão desmontadas antes do processo de instalação iniciar."
-
-#: ../liveusb/creator.py:141
-msgid ""
-"Source type does not support verification of ISO MD5 checksum, skipping"
-msgstr "Tipo de código fonte não permite examinar a soma de verificação MD5 (Message-Digest algorithm 5) da ISO. Pulando"
+msgid "Calculating the SHA1 of %s"
+msgstr "Calculando o SHA1 (Secure Hash Algorithm) de %s"
-#: ../liveusb/creator.py:1220
+#: ../tails_installer/creator.py:1304
msgid "Synchronizing data on disk..."
msgstr "Sincronizando dados no disco..."
-#: ../liveusb/dialog.py:166
-msgid "Target Device"
-msgstr "Dispositivo de destino"
+#: ../tails_installer/creator.py:1346
+msgid "Error probing device"
+msgstr "Erro ao sondar o dispositivo"
-#: ../liveusb/gui.py:438
-#, python-format
-msgid ""
-"The device \"%(pretty_name)s\" is too small to install Tails (at least "
-"%(size)s GB is required)."
-msgstr "O dispositivo \"%(pretty_name)s\" é muito restrito para instalar Tails (no mínimo, %(size)s GB são necessários)."
+#: ../tails_installer/creator.py:1348
+msgid "Unable to find any supported device"
+msgstr "Não foi possível encontrar nenhum dispositivo compatível"
-#: ../liveusb/gui.py:792
+#: ../tails_installer/creator.py:1358
msgid ""
-"The selected file is unreadable. Please fix its permissions or select "
-"another file."
-msgstr "O arquivo selecionado não pode ser lido. Por favor, corrija suas permissões ou selecione outro arquivo."
+"Make sure your USB key is plugged in and formatted with the FAT filesystem"
+msgstr "Certifique-se de que a sua memória USB esteja conectada e formatada com o sistema de arquivos FAT"
-#: ../liveusb/creator.py:354
+#: ../tails_installer/creator.py:1361
#, python-format
msgid ""
-"There was a problem executing the following command: `%(command)s`.\n"
-"A more detailed error log has been written to '%(filename)s'."
-msgstr "Problema encontrado ao executar o seguinte comando: `%(command)s`.\nUm arquivo de registro mais detalhado foi criado em '%(filename)s'."
+"Unsupported filesystem: %s\n"
+"Please backup and format your USB key with the FAT filesystem."
+msgstr "Sistema de arquivos não possui suporte: %s\nPor favor, faça um backup e formate a sua memória USB com o sistema de arquivos FAT."
-#: ../liveusb/dialog.py:158
+#: ../tails_installer/creator.py:1428
msgid ""
-"This button allows you to browse for an existing Live system ISO that you "
-"have previously downloaded. If you do not select one, a release will be "
-"downloaded for you automatically."
-msgstr "Este botão permite procurar um sistema Live ISO cujo download já foi feito. Se nenhuma ISO for selecionada, o download de uma versão será feito para você automaticamente."
+"Unable to get Win32_LogicalDisk; win32com query did not return any results"
+msgstr "Não foi possível obter Win32_LogicalDisk; a consulta com win32com não obteve nenhum resultado"
+
+#: ../tails_installer/creator.py:1481
+msgid "Cannot find"
+msgstr "Não foi possível localizar"
-#: ../liveusb/dialog.py:171
+#: ../tails_installer/creator.py:1482
msgid ""
-"This button will begin the LiveUSB creation process. This entails "
-"optionally downloading a release (if an existing one wasn't selected), "
-"extracting the ISO to the USB device, creating the persistent overlay, and "
-"installing the bootloader."
-msgstr "Este botão iniciará o processo de criação da LiveUSB. Opcionalmente, o download de uma versão será feito (se nenhuma versão existente tiver sido selecionada), extraindo a ISO na memória USB, criando uma sobrecamada persistente e instalando o inicializador."
+"Make sure to extract the entire tails-installer zip file before running this"
+" program."
+msgstr "Verifique se você extraiu todo o arquivo tails-installer zip antes de executar este programa."
-#: ../liveusb/dialog.py:165
+#: ../tails_installer/gui.py:69
+#, python-format
+msgid "Unknown release: %s"
+msgstr "Versão desconhecida: %s"
+
+#: ../tails_installer/gui.py:73
+#, python-format
+msgid "Downloading %s..."
+msgstr "Fazendo download %s..."
+
+#: ../tails_installer/gui.py:204
msgid ""
-"This is the USB stick that you want to install your Live system on. This "
-"device must be formatted with the FAT filesystem."
-msgstr "Esta é a memória USB na qual você deseja instalar um sistema Live. Este dispositivo deve estar formatado com o sistema de arquivos FAT."
+"Error: Cannot set the label or obtain the UUID of your device. Unable to "
+"continue."
+msgstr "Erro: não foi possível definir o rótulo ou obter o UUID (Universal Unique identifier) do seu dispositivo. Impossível continuar."
-#: ../liveusb/dialog.py:170
+#: ../tails_installer/gui.py:253
+#, python-format
+msgid "Installation complete! (%s)"
+msgstr "Instalação concluída! (%s)"
+
+#: ../tails_installer/gui.py:258
+msgid "Tails installation failed!"
+msgstr "A instalação do Tails falhou!"
+
+#: ../tails_installer/gui.py:353
msgid ""
-"This is the progress bar that will indicate how far along in the LiveUSB "
-"creation process you are"
-msgstr "Esta é a barra de progressão que vai indicar o quanto falta para terminar o processo de criação da LiveUSB"
+"Warning: This tool needs to be run as an Administrator. To do this, right "
+"click on the icon and open the Properties. Under the Compatibility tab, "
+"check the \"Run this program as an administrator\" box."
+msgstr "Atenção: Esta ferramenta deve ser executada pelo Administrador. Para isso, clique com o botão direito no ícone e abra a função 'Propriedades'. Na janela Compatibilidade, marque a opção \"Executar este programa como Administrador\"."
-#: ../liveusb/dialog.py:169
-msgid "This is the status console, where all messages get written to."
-msgstr "Este é o console de status, no qual todas as mensagens são registradas."
+#: ../tails_installer/gui.py:365 ../tails_installer/launcher.py:31
+msgid "Tails Installer"
+msgstr "Tails Installer"
-#: ../liveusb/creator.py:952
-msgid "Trying to continue anyway."
-msgstr "Tentando continuar de qualquer maneira."
+#: ../tails_installer/gui.py:440
+msgid "No device suitable to install Tails could be found"
+msgstr "Não foi encontrado nenhum dispositivo adequado à instalação do Tails"
-#: ../liveusb/gui.py:464
-msgid "USB drive found"
-msgstr "memória USB encontrada"
+#: ../tails_installer/gui.py:442
+#, python-format
+msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
+msgstr "Por favor, plugue um volume USB ou um cartão SD de ao menos %0.1f GB."
-#: ../liveusb/creator.py:985
+#: ../tails_installer/gui.py:474
#, python-format
-msgid "Unable to change volume label: %(message)s"
-msgstr "Não foi possível alterar o rótulo do dispositivo: %(message)s"
+msgid "%(size)s %(label)s"
+msgstr "%(size)s %(label)s"
-#: ../liveusb/creator.py:501 ../liveusb/creator.py:512
+#: ../tails_installer/gui.py:480
#, python-format
-msgid "Unable to chmod %(file)s: %(message)s"
-msgstr "Não foi possível modificar as permissões de %(file)s: %(message)s"
+msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
-#: ../liveusb/creator.py:478
+#: ../tails_installer/gui.py:488
#, python-format
-msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s"
-msgstr "Não foi possível copiar %(infile)s para %(outfile)s: %(message)s"
+msgid ""
+"The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
+"manufacturer and Tails will fail to start on it. Please try installing on a "
+"different model."
+msgstr "A memória USB \"%(pretty_name)s\" está configurado como 'não-removível' pelo fabricante e o Tais não funcionará nele. Por favor, tente instalar Tails em um outro modelo de memória USB.."
-#: ../liveusb/gui.py:403
-msgid "Unable to find any USB drive"
-msgstr "Não foi possível localizar nenhuma memória USB"
+#: ../tails_installer/gui.py:498
+#, python-format
+msgid ""
+"The device \"%(pretty_name)s\" is too small to install Tails (at least "
+"%(size)s GB is required)."
+msgstr "O dispositivo \"%(pretty_name)s\" é muito restrito para instalar Tails (no mínimo, %(size)s GB são necessários)."
-#: ../liveusb/creator.py:1274
-msgid "Unable to find any supported device"
-msgstr "Não foi possível encontrar nenhum dispositivo compatível"
+#: ../tails_installer/gui.py:511
+msgid "\"Install by cloning\""
+msgstr "\"Instalação por clonagem\""
-#: ../liveusb/creator.py:1117
-msgid "Unable to find partition"
-msgstr "Não foi possível localizar a partição"
+#: ../tails_installer/gui.py:513
+msgid "\"Install from ISO\""
+msgstr "\"Instalar a partir de uma ISO\""
-#: ../liveusb/creator.py:1354
+#: ../tails_installer/gui.py:514
+#, python-format
msgid ""
-"Unable to get Win32_LogicalDisk; win32com query did not return any results"
-msgstr "Não foi possível obter Win32_LogicalDisk; a consulta com win32com não obteve nenhum resultado"
+"It is impossible to upgrade the device %(pretty_name)s because it was not "
+"created using Tails Installer. You should instead use %(action)s to upgrade "
+"Tails on this device."
+msgstr "Impossível atualizar o dispositivo %(pretty_name)s porque ele não foi criado usando o Instalador Tails. Tente utilizar %(action)s para atualizar o Tails neste dispositivo."
+
+#: ../tails_installer/gui.py:533
+msgid "An error happened while installing Tails"
+msgstr "Um erro ocorreu durante a instalacao do Tails"
+
+#: ../tails_installer/gui.py:545
+msgid "Refreshing releases..."
+msgstr "Atualizando versões..."
+
+#: ../tails_installer/gui.py:550
+msgid "Releases updated!"
+msgstr "Versões atualizadas!"
-#: ../liveusb/gui.py:691
+#: ../tails_installer/gui.py:589
+msgid "Installation complete!"
+msgstr "Instalação concluída!"
+
+#: ../tails_installer/gui.py:590
+msgid "Installation was completed."
+msgstr "Instalação concluída."
+
+#: ../tails_installer/gui.py:635
msgid "Unable to mount device"
msgstr "Não foi possível montar o dispositivo"
-#: ../liveusb/creator.py:814
-#, python-format
-msgid "Unable to mount device: %(message)s"
-msgstr "Não foi possível montar o dispositivo: %(message)s"
+#: ../tails_installer/gui.py:642 ../tails_installer/gui.py:670
+msgid "Please confirm your device selection"
+msgstr "Por favor, confirme a seleção do seu dispositivo"
-#: ../liveusb/creator.py:517
+#: ../tails_installer/gui.py:643
#, python-format
-msgid "Unable to remove directory from previous LiveOS: %(message)s"
-msgstr "Não foi possível remover um diretório do sistema operacional Live anterior: %(message)s"
+msgid ""
+"You are going to install Tails on the %(size)s %(vendor)s %(model)s device "
+"(%(device)s). All data on the selected device will be lost. Continue?"
+msgstr "Você está prestes a instalar o Tails no %(size)s %(vendor)s %(model)s dispositivo (%(device)s). Todos os dados contidos no dispositivo selecionado serão perdidos. Continuar?"
-#: ../liveusb/creator.py:505
+#: ../tails_installer/gui.py:660
#, python-format
-msgid "Unable to remove file from previous LiveOS: %(message)s"
-msgstr "Não foi possível remover um arquivo do sistema operacional Live anterior: %(message)s"
+msgid ""
+"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s "
+"device (%(device)s). Any persistent volume on this device will remain "
+"unchanged. Continue?"
+msgstr "Você está prestes a atualizar o Tails no %(parent_size)s %(vendor)s %(model)s dispositivo (%(device)s). Se houver volumes persistentes neste dispositivo, eles permanecerão inalterados. Continuar?"
+
+#: ../tails_installer/gui.py:716
+msgid "Download complete!"
+msgstr "Download concluído!"
+
+#: ../tails_installer/gui.py:720
+msgid "Download failed: "
+msgstr "O download falhou: "
+
+#: ../tails_installer/gui.py:721
+msgid "You can try again to resume your download"
+msgstr "Você pode tentar recomeçar o download novamente"
-#: ../liveusb/creator.py:1189
+#: ../tails_installer/gui.py:729
msgid ""
-"Unable to reset MBR. You may not have the `syslinux` package installed."
-msgstr "Não foi possível reinicializar o MBR. Talvez você não possua o pacote `syslinux' instalado."
+"The selected file is unreadable. Please fix its permissions or select "
+"another file."
+msgstr "O arquivo selecionado não pode ser lido. Por favor, corrija suas permissões ou selecione outro arquivo."
-#: ../liveusb/gui.py:798
+#: ../tails_installer/gui.py:735
msgid ""
"Unable to use the selected file. You may have better luck if you move your "
"ISO to the root of your drive (ie: C:\\)"
msgstr "Não foi possível utilizar o arquivo selecionado. Talvez você tenha mais sorte se mover a imagem ISO para a raiz do seu dispositivo (por exemplo, `C:\\')"
-#: ../liveusb/creator.py:723
-#, python-format
-msgid "Unable to write on %(device)s, skipping."
-msgstr "Não foi possível escrever no dispositivo %(device)s. Pulando"
-
-#: ../liveusb/creator.py:399
-msgid "Unknown ISO, skipping checksum verification"
-msgstr "Imagem ISO desconhecida, ignorando o exame da soma de verificação "
-
-#: ../liveusb/creator.py:810
+#: ../tails_installer/gui.py:741
#, python-format
-msgid "Unknown dbus exception while trying to mount device: %(message)s"
-msgstr "Exceção d-bus desconhecida ao tentar montar o dispositivo: %(message)s"
+msgid "%(filename)s selected"
+msgstr "%(filename)s selecionado"
-#: ../liveusb/creator.py:791 ../liveusb/creator.py:964
-msgid "Unknown filesystem. Your device may need to be reformatted."
-msgstr "Sistema de arquivos desconhecido. Talvez o seu dispositivo precise ser formatado novamente."
+#: ../tails_installer/source.py:28
+msgid "Unable to find LiveOS on ISO"
+msgstr "Não foi possível encontrar nenhum Sistema Operacional Live em ISO"
-#: ../liveusb/gui.py:85
+#: ../tails_installer/source.py:34
#, python-format
-msgid "Unknown release: %s"
-msgstr "Versão desconhecida: %s"
+msgid "Could not guess underlying block device: %s"
+msgstr "Não foi possível adivinhar o dispositivo do bloco subjacente: %s"
-#: ../liveusb/creator.py:851
+#: ../tails_installer/source.py:49
#, python-format
-msgid "Unmounting '%(udi)s' on '%(device)s'"
-msgstr "Desmontando '%(udi)s' no (s) '%(device)s'"
+msgid ""
+"There was a problem executing `%s`.\n"
+"%s\n"
+"%s"
+msgstr "Houve um problema ao executar `%s`.\n%s\n%s"
-#: ../liveusb/creator.py:847
+#: ../tails_installer/source.py:63
#, python-format
-msgid "Unmounting mounted filesystems on '%(device)s'"
-msgstr "Desmontando os sistemas de arquivos montados em '%(device)s'"
+msgid "'%s' does not exist"
+msgstr "'%s' nao existe"
-#: ../liveusb/creator.py:949
+#: ../tails_installer/source.py:65
#, python-format
-msgid "Unsupported device '%(device)s', please report a bug."
-msgstr "Dispositivo incompatível '%(device)s', por favor reporte o bug."
+msgid "'%s' is not a directory"
+msgstr "'%s' nao é um diretório"
-#: ../liveusb/creator.py:794 ../liveusb/creator.py:967
+#: ../tails_installer/source.py:75
#, python-format
-msgid "Unsupported filesystem: %s"
-msgstr "Sistema de arquivos não possui suporte: %s"
+msgid "Skipping '%(filename)s'"
+msgstr "Ignorando '%(filename)s'"
-#: ../liveusb/creator.py:1287
+#: ../tails_installer/utils.py:44
#, python-format
msgid ""
-"Unsupported filesystem: %s\n"
-"Please backup and format your USB key with the FAT filesystem."
-msgstr "Sistema de arquivos não possui suporte: %s\nPor favor, faça um backup e formate a sua memória USB com o sistema de arquivos FAT."
+"There was a problem executing `%s`.%s\n"
+"%s"
+msgstr "Houve um problema ao executar `%s`.%s\n%s"
-#: ../liveusb/creator.py:892
-#, python-format
-msgid "Updating properties of system partition %(system_partition)s"
-msgstr "Atualizando as propriedades da partição de sistema %(system_partition)s"
+#: ../tails_installer/utils.py:119
+msgid "Could not open device for writing."
+msgstr "Não foi abrir o dispositivo para registrar. "
-#: ../liveusb/launcher_ui.py:156
-msgid ""
-"Upgrade\n"
-"by cloning"
-msgstr "Atualizar\npor clonagem"
+#: ../data/tails-installer.ui.h:1
+msgid "Use existing Live system ISO:"
+msgstr "Usar a ISO do sistema Live ISO já existente:"
+
+#: ../data/tails-installer.ui.h:2
+msgid "Select a distribution to download:"
+msgstr "Selecionar uma distribuicao para fazer download:"
+
+#: ../data/tails-installer.ui.h:3
+msgid "Target Device:"
+msgstr "Dispositivo Indicado:"
+
+#: ../data/tails-installer.ui.h:4
+msgid "Install Tails"
+msgstr "Instalar Tails"
-#: ../liveusb/launcher_ui.py:158
+#: ../data/tails-installer-launcher.ui.h:1
msgid ""
-"Upgrade\n"
-"from ISO"
-msgstr "Atualizar \nde uma ISO"
+"To run Tails Installer you need an ISO image which can be downloaded from "
+"the Tails website: <a "
+"href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>"
+msgstr "Para executar o Tails Installer, você precisa de uma imagem ISO, que pode ser baixada do site do Tails: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>"
-#: ../liveusb/dialog.py:159
-msgid "Use existing Live system ISO"
-msgstr "Usar a ISO do sistema Live existente"
+#: ../data/tails-installer-launcher.ui.h:2
+msgid "Install"
+msgstr "Instalar"
-#: ../liveusb/creator.py:143
-msgid "Verifying ISO MD5 checksum"
-msgstr "Examinando a soma de verificação MD5 da imagem ISO"
+#: ../data/tails-installer-launcher.ui.h:3
+msgid "• Install Tails on a new USB stick."
+msgstr "• Instalar Tails em um novo volume USB."
-#: ../liveusb/creator.py:373
-msgid "Verifying SHA1 checksum of LiveCD image..."
-msgstr "Verificando o SHA1 (Secure Hash Algorithm-1) da imagem do LiveCD..."
+#: ../data/tails-installer-launcher.ui.h:4
+msgid "• The USB stick that you install on is formatted and all data is lost."
+msgstr "• O volume USB que você está usando será formatado e todos os dados serão perdidos."
-#: ../liveusb/creator.py:377
-msgid "Verifying SHA256 checksum of LiveCD image..."
-msgstr "Examinando a soma de verificação do SHA256 (Secure Hash Algorithm-256) da imagem do LiveCD..."
+#: ../data/tails-installer-launcher.ui.h:5
+msgid "Upgrade"
+msgstr "Atualizar"
-#: ../liveusb/creator.py:961 ../liveusb/creator.py:1280
-msgid "Verifying filesystem..."
-msgstr "Verificando o sistema de arquivos..."
+#: ../data/tails-installer-launcher.ui.h:6
+msgid "• Upgrade a Tails USB stick to the version of an ISO image."
+msgstr "• Atualizar o volume USB Tails para uma versão em imagem ISO."
-#: ../liveusb/gui.py:725
+#: ../data/tails-installer-launcher.ui.h:7
msgid ""
-"Warning: Creating a new persistent overlay will delete your existing one."
-msgstr "Aviso: A criação de uma nova sobrecamada persistente excluirá a atual."
+"• The encrypted persistent storage of the Tails USB stick that you upgrade "
+"is preserved."
+msgstr "• Após a atualização do volume USB Tails, o volume de armazenamento criptografado persistente foi preservado."
-#: ../liveusb/gui.py:377
+#: ../data/tails-installer-launcher.ui.h:8
msgid ""
-"Warning: This tool needs to be run as an Administrator. To do this, right "
-"click on the icon and open the Properties. Under the Compatibility tab, "
-"check the \"Run this program as an administrator\" box."
-msgstr "Atenção: Esta ferramenta deve ser executada pelo Administrador. Para isso, clique com o botão direito no ícone e abra a função 'Propriedades'. Na janela Compatibilidade, marque a opção \"Executar este programa como Administrador\"."
+"Need help? Read the <a "
+"href=\"https://tails.boum.org/doc/first_steps/installation/\">documentation</a>"
+msgstr "Precisa de ajuda?Leia a <a href=\"https://tails.boum.org/doc/first_steps/installation/\">documentação</a>"
-#: ../liveusb/creator.py:162
-#, python-format
-msgid "Wrote to device at %(speed)d MB/sec"
-msgstr "Gravou no dispositivo a uma velocidade de %(speed)d MB/s"
+#: ../data/tails-installer-launcher.ui.h:9
+msgid "Install by cloning"
+msgstr "Instalação por clonagem"
-#: ../liveusb/gui.py:699
-#, python-format
+#: ../data/tails-installer-launcher.ui.h:10
msgid ""
-"You are going to install Tails on the %(size)s %(vendor)s %(model)s device "
-"(%(device)s). All data on the selected device will be lost. Continue?"
-msgstr "Você está prestes a instalar o Tails no %(size)s %(vendor)s %(model)s dispositivo (%(device)s). Todos os dados contidos no dispositivo selecionado serão perdidos. Continuar?"
+"• Install Tails on another USB stick by copying the Tails system that you "
+"are currently using."
+msgstr "• Instalar o Tails em um outro volume USB, copiando o sistema Tails que você está utilizando."
-#: ../liveusb/gui.py:715
-#, python-format
+#: ../data/tails-installer-launcher.ui.h:11
msgid ""
-"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s "
-"device (%(device)s). Any persistent volume on this device will remain "
-"unchanged. Continue?"
-msgstr "Você está prestes a atualizar o Tails no %(parent_size)s %(vendor)s %(model)s dispositivo (%(device)s). Se houver volumes persistentes neste dispositivo, eles permanecerão inalterados. Continuar?"
+"• The encrypted persistent storage of the Tails USB stick that you are "
+"currently using is not copied."
+msgstr "• Não foi feita cópia do volume de armazenamento criptografado persistente do volume USB Tails que você está usando."
+
+#: ../data/tails-installer-launcher.ui.h:12
+msgid "Upgrade by cloning"
+msgstr "Atualização por clonagem"
-#: ../liveusb/creator.py:622
+#: ../data/tails-installer-launcher.ui.h:13
msgid ""
-"You are using an old version of syslinux-extlinux that does not support the "
-"ext4 filesystem"
-msgstr "Você está usando uma versão antiga do syslinux-extlinux, que não é compatível com o sistema de arquivos ext4"
+"• Upgrade another Tails USB stick to the same version of Tails that you are "
+"currently using."
+msgstr "• Atualizar um outro volume USB Tails para a mesma versão do Tails que você está usando atualmente."
-#: ../liveusb/gui.py:783
-msgid "You can try again to resume your download"
-msgstr "Você pode tentar recomeçar o download novamente"
+#: ../data/tails-installer-launcher.ui.h:14
+msgid "Upgrade from ISO"
+msgstr "Atualizar a partir de uma ISO"
-#: ../liveusb/creator.py:95
-msgid "You must run this application as root"
-msgstr "Você deve executar este aplicativo como Administrador"
+#: ../data/tails-installer-launcher.ui.h:15
+msgid "• Upgrade another Tails USB stick to the version of an ISO image."
+msgstr "• Atualizar um outro volume USB Tails para a versão de uma imagem ISO."
-#: ../liveusb/dialog.py:162
-msgid "or"
-msgstr "ou"
+#: ../data/tails-installer-launcher.ui.h:16
+msgid ""
+"Need help? Read the <a "
+"href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>"
+msgstr "Precisa de ajuda?Leia a <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentação</a>"
diff --git a/tr/tr.po b/tr/tr.po
index b8c94271a..26c00f3d3 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -14,15 +14,15 @@
# mrtmsy <mertamasya(a)gmail.com>, 2014
# muaz yadiyüzkırkiki, 2013
# muaz yadiyüzkırkiki, 2013
-# Ozancan Karataş <ozanc27(a)icloud.com>, 2015
+# Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015
# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2014,2016-2017
# Yasin Özel <iletisim(a)yasinozel.com.tr>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 07:50+0200\n"
-"PO-Revision-Date: 2017-06-20 14:25+0000\n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-08-21 15:01+0000\n"
"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
1
0
[translation/liveusb-creator] Update translations for liveusb-creator
by translation@torproject.org 01 Sep '17
by translation@torproject.org 01 Sep '17
01 Sep '17
commit 02903d6379e3d773f2effe2725160c18f5ae1d18
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Sep 1 05:16:06 2017 +0000
Update translations for liveusb-creator
---
fa/fa.po | 19 ++++++++--------
hu/hu.po | 9 ++++----
ko/ko.po | 69 +++++++++++++++++++++++++++++-----------------------------
pt_BR/pt_BR.po | 9 ++++----
tr/tr.po | 6 ++---
zh_HK/zh_HK.po | 33 ++++++++++++++--------------
6 files changed, 75 insertions(+), 70 deletions(-)
diff --git a/fa/fa.po b/fa/fa.po
index 9a75fe2ad..a18948fed 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -13,6 +13,7 @@
# zendegi <inactive+zendegi(a)transifex.com>, 2013
# Hamidreza Rajabzadeh <hamidonline.behbahan(a)gmail.com>, 2014,2017
# Javad Ahangari <joe_ironsmith(a)yahoo.com>, 2012
+# Moein Nemati <moeinroid(a)gmail.com>, 2017
# mohammad.s.n, 2013
# Mohammad Hossein <desmati(a)gmail.com>, 2014
# Seyed Mohammad Hosseini <PersianPolaris(a)Gmail.com>, 2013
@@ -21,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 07:50+0200\n"
-"PO-Revision-Date: 2017-06-25 10:18+0000\n"
-"Last-Translator: Hamidreza Rajabzadeh <hamidonline.behbahan(a)gmail.com>\n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-08-17 22:22+0000\n"
+"Last-Translator: Moein Nemati <moeinroid(a)gmail.com>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -138,7 +139,7 @@ msgstr "فایل سیستم های غیرقابل پشتیبانی: %s"
#: ../tails_installer/creator.py:760
#, python-format
msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr ""
+msgstr "خطای GLib ناشناخته در هنگام تلاش برای سوار کردن دستگاه: %(message)s"
#: ../tails_installer/creator.py:764
#, python-format
@@ -204,7 +205,7 @@ msgstr "نصب بوت لودر..."
#: ../tails_installer/creator.py:1016
#, python-format
msgid "Could not find the '%s' COM32 module"
-msgstr ""
+msgstr "ماژول '%s' COM32 پیدا نشد"
#: ../tails_installer/creator.py:1024 ../tails_installer/creator.py:1405
#, python-format
@@ -452,7 +453,7 @@ msgstr "%(filename)s انتخاب شده"
#: ../tails_installer/source.py:28
msgid "Unable to find LiveOS on ISO"
-msgstr ""
+msgstr "ناتوان در پیداکردن سیستم عامل زنده در ISO"
#: ../tails_installer/source.py:34
#, python-format
@@ -491,11 +492,11 @@ msgstr ""
#: ../tails_installer/utils.py:119
msgid "Could not open device for writing."
-msgstr ""
+msgstr "دستگاه برای نوشتن باز نشد."
#: ../data/tails-installer.ui.h:1
msgid "Use existing Live system ISO:"
-msgstr ""
+msgstr "از ISO سیستم زنده موجود استفاده کنید:"
#: ../data/tails-installer.ui.h:2
msgid "Select a distribution to download:"
@@ -546,7 +547,7 @@ msgstr ""
msgid ""
"Need help? Read the <a "
"href=\"https://tails.boum.org/doc/first_steps/installation/\">documentation</a>"
-msgstr ""
+msgstr "به کمک نیاز دارید؟ <a href=\"https://tails.boum.org/doc/first_steps/installation/\">مستندات</a> را بخوانید"
#: ../data/tails-installer-launcher.ui.h:9
msgid "Install by cloning"
diff --git a/hu/hu.po b/hu/hu.po
index a4f1a4558..ba0d7d397 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -5,6 +5,7 @@
# Translators:
# benewfy <benewfy(a)gmail.com>, 2015
# blackc0de <complic(a)vipmail.hu>, 2015
+# Falu <info(a)falu.me>, 2017
# Blackywantscookies, 2014
# Blackywantscookies, 2016
# Gábor Ginál dr. <ginalgabor(a)gmail.com>, 2014
@@ -19,8 +20,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-30 13:14+0200\n"
-"PO-Revision-Date: 2017-07-14 16:11+0000\n"
-"Last-Translator: PB <regisztralo111(a)gmail.com>\n"
+"PO-Revision-Date: 2017-08-16 19:27+0000\n"
+"Last-Translator: Falu <info(a)falu.me>\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"
@@ -515,7 +516,7 @@ msgstr ""
#: ../data/tails-installer-launcher.ui.h:2
msgid "Install"
-msgstr ""
+msgstr "Telepít"
#: ../data/tails-installer-launcher.ui.h:3
msgid "• Install Tails on a new USB stick."
@@ -527,7 +528,7 @@ msgstr ""
#: ../data/tails-installer-launcher.ui.h:5
msgid "Upgrade"
-msgstr ""
+msgstr "Frissítés"
#: ../data/tails-installer-launcher.ui.h:6
msgid "• Upgrade a Tails USB stick to the version of an ISO image."
diff --git a/ko/ko.po b/ko/ko.po
index 9fd4a3b12..63c111848 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -5,6 +5,7 @@
# Translators:
# ilbe123 <a3057016(a)drdrb.net>, 2014
# Chris Park <utopinator(a)gmail.com>, 2015-2016
+# snotree <cknblue(a)gmail.com>, 2017
# testsubject67 <deborinha97(a)hotmail.com>, 2014
# eukim <eukim(a)redhat.com>, 2009
# Dr.what <javrick6(a)naver.com>, 2014
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-09 17:50+0200\n"
-"PO-Revision-Date: 2017-06-10 01:55+0000\n"
-"Last-Translator: carolyn <carolyn(a)anhalt.org>\n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-08-12 12:42+0000\n"
+"Last-Translator: snotree <cknblue(a)gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -132,7 +133,7 @@ msgstr "지원되지 않는 파일 시스템: %s "
#: ../tails_installer/creator.py:760
#, python-format
msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr ""
+msgstr "장치를 탑재하는 동안 알 수 없는 GLib 예외가 발생했습니다:%(message)s"
#: ../tails_installer/creator.py:764
#, python-format
@@ -198,7 +199,7 @@ msgstr "부트 로더를 설치 중..."
#: ../tails_installer/creator.py:1016
#, python-format
msgid "Could not find the '%s' COM32 module"
-msgstr ""
+msgstr "'%s' COM32 모듈을 찾을 수 없습니다."
#: ../tails_installer/creator.py:1024 ../tails_installer/creator.py:1405
#, python-format
@@ -221,17 +222,17 @@ msgstr "%(device)s를 FAT32로 포맷 중"
#: ../tails_installer/creator.py:1239
msgid "Could not find syslinux' gptmbr.bin"
-msgstr ""
+msgstr "syslinux' gptmbr.bin을 찾을 수 없습니다."
#: ../tails_installer/creator.py:1252
#, python-format
msgid "Reading extracted MBR from %s"
-msgstr ""
+msgstr "%s에서 추출한 MBR 읽기"
#: ../tails_installer/creator.py:1256
#, python-format
msgid "Could not read the extracted MBR from %(path)s"
-msgstr ""
+msgstr "%(path)s에서 추출 된 MBR을 읽을 수 없습니다."
#: ../tails_installer/creator.py:1269 ../tails_installer/creator.py:1270
#, python-format
@@ -284,7 +285,7 @@ msgstr "찾을 수 없음"
msgid ""
"Make sure to extract the entire tails-installer zip file before running this"
" program."
-msgstr ""
+msgstr "이 프로그램을 실행하기 전에 전체 tails-installer 압축 파일을 추출 해야 합니다."
#: ../tails_installer/gui.py:69
#, python-format
@@ -309,7 +310,7 @@ msgstr "설치 완료! (%s)"
#: ../tails_installer/gui.py:258
msgid "Tails installation failed!"
-msgstr ""
+msgstr "Tails 설치가 실패했습니다!"
#: ../tails_installer/gui.py:353
msgid ""
@@ -320,16 +321,16 @@ msgstr "경고 : 이 프로그램을 실행하기 위해 관리자 권한으로
#: ../tails_installer/gui.py:365 ../tails_installer/launcher.py:31
msgid "Tails Installer"
-msgstr ""
+msgstr "Tails 설치 프로그램"
#: ../tails_installer/gui.py:440
msgid "No device suitable to install Tails could be found"
-msgstr ""
+msgstr "Tails 설치에 적합한 장치를 찾을 수 없음"
#: ../tails_installer/gui.py:442
#, python-format
msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
-msgstr ""
+msgstr "최소 %0.1fGB의 USB 플래시 드라이브 또는 SD 카드를 연결하십시오."
#: ../tails_installer/gui.py:474
#, python-format
@@ -347,7 +348,7 @@ msgid ""
"The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
"manufacturer and Tails will fail to start on it. Please try installing on a "
"different model."
-msgstr ""
+msgstr "USB 스틱 \"%(pretty_name)s\"는 제조업체가 제거 할 수 없도록 구성하였기 때문에 Tails가 시작되지 않습니다. 다른 모델로 설치를 시도해 보십시오."
#: ../tails_installer/gui.py:498
#, python-format
@@ -358,7 +359,7 @@ msgstr "선택된 장치 \"%(pretty_name)s\" 의 용량이 모자라서 Tail를
#: ../tails_installer/gui.py:511
msgid "\"Install by cloning\""
-msgstr ""
+msgstr "\"클로닝으로 설치\""
#: ../tails_installer/gui.py:513
msgid "\"Install from ISO\""
@@ -374,7 +375,7 @@ msgstr "%(pretty_name)s 는 Tails Installer로 설치되지 않았으므로 업
#: ../tails_installer/gui.py:533
msgid "An error happened while installing Tails"
-msgstr ""
+msgstr "Tails 설치 중 오류가 발생했습니다."
#: ../tails_installer/gui.py:545
msgid "Refreshing releases..."
@@ -390,7 +391,7 @@ msgstr "다운로드 완료! "
#: ../tails_installer/gui.py:590
msgid "Installation was completed."
-msgstr ""
+msgstr "설치가 완료되었습니다."
#: ../tails_installer/gui.py:635
msgid "Unable to mount device"
@@ -446,12 +447,12 @@ msgstr "%(filename)s 선택됨"
#: ../tails_installer/source.py:28
msgid "Unable to find LiveOS on ISO"
-msgstr ""
+msgstr "ISO에서 LiveOS를 찾을 수 없습니다."
#: ../tails_installer/source.py:34
#, python-format
msgid "Could not guess underlying block device: %s"
-msgstr ""
+msgstr "기본 블럭 장치를 추측 할 수 없습니다: %s"
#: ../tails_installer/source.py:49
#, python-format
@@ -459,45 +460,45 @@ msgid ""
"There was a problem executing `%s`.\n"
"%s\n"
"%s"
-msgstr ""
+msgstr "`%s`를 실행하는 중에 문제가 발생했습니다.\n%s\n%s"
#: ../tails_installer/source.py:63
#, python-format
msgid "'%s' does not exist"
-msgstr ""
+msgstr "'%s' 는 존재하지 않습니다."
#: ../tails_installer/source.py:65
#, python-format
msgid "'%s' is not a directory"
-msgstr ""
+msgstr "'%s' 는 디렉토리가 아닙니다"
#: ../tails_installer/source.py:75
#, python-format
msgid "Skipping '%(filename)s'"
-msgstr ""
+msgstr "'%(filename)s' 건너뛰기"
#: ../tails_installer/utils.py:44
#, python-format
msgid ""
"There was a problem executing `%s`.%s\n"
"%s"
-msgstr ""
+msgstr "`%s` 를 실행하는 중에 문제가 발생했습니다.%s\n%s"
#: ../tails_installer/utils.py:119
msgid "Could not open device for writing."
-msgstr ""
+msgstr "쓰기를 위해 기기를 열 수 없습니다."
#: ../data/tails-installer.ui.h:1
msgid "Use existing Live system ISO:"
-msgstr ""
+msgstr "기존 라이브 시스템 ISO 사용:"
#: ../data/tails-installer.ui.h:2
msgid "Select a distribution to download:"
-msgstr ""
+msgstr "다운로드 받을 배포처를 선택:"
#: ../data/tails-installer.ui.h:3
msgid "Target Device:"
-msgstr ""
+msgstr "대상 장치:"
#: ../data/tails-installer.ui.h:4
msgid "Install Tails"
@@ -508,27 +509,27 @@ msgid ""
"To run Tails Installer you need an ISO image which can be downloaded from "
"the Tails website: <a "
"href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>"
-msgstr ""
+msgstr "Tails Installer를 실행하려면 Tails 웹 사이트에서 다운로드 할 수 있는 ISO 이미지가 필요합니다: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>"
#: ../data/tails-installer-launcher.ui.h:2
msgid "Install"
-msgstr ""
+msgstr "설치"
#: ../data/tails-installer-launcher.ui.h:3
msgid "• Install Tails on a new USB stick."
-msgstr ""
+msgstr "• 새 USB 스틱에 Tails를 설치"
#: ../data/tails-installer-launcher.ui.h:4
msgid "• The USB stick that you install on is formatted and all data is lost."
-msgstr ""
+msgstr "• USB 스틱을 포맷 하면 모든 데이터가 손실 됩니다."
#: ../data/tails-installer-launcher.ui.h:5
msgid "Upgrade"
-msgstr ""
+msgstr "업그레이드"
#: ../data/tails-installer-launcher.ui.h:6
msgid "• Upgrade a Tails USB stick to the version of an ISO image."
-msgstr ""
+msgstr "• Tails USB 스틱을 ISO 이미지 버전으로 업그레이드 하십시오."
#: ../data/tails-installer-launcher.ui.h:7
msgid ""
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index cb0bf06bb..1198f39d4 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -12,6 +12,7 @@
# Daniel Messias dos Santos <danielms97(a)outlook.com>, 2013
# Daniel S. Koda <danielskoda(a)gmail.com>, 2008
# Danton Medrado, 2015
+# Eduardo Addad de Oliveira <duduaddad(a)gmail.com>, 2017
# Eduardo Bonsi, 2013
# Eduardo Luis Voltolini Tafner, 2013
# Augustine <evandro(a)geocities.com>, 2013
@@ -27,9 +28,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 07:50+0200\n"
-"PO-Revision-Date: 2017-06-26 14:35+0000\n"
-"Last-Translator: Communia <ameaneantie(a)riseup.net>\n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-08-10 17:18+0000\n"
+"Last-Translator: Eduardo Addad de Oliveira <duduaddad(a)gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -463,7 +464,7 @@ msgstr "Não foi possível encontrar nenhum Sistema Operacional Live em ISO"
#: ../tails_installer/source.py:34
#, python-format
msgid "Could not guess underlying block device: %s"
-msgstr ""
+msgstr "Não foi possível adivinhar o dispositivo do bloco subjacente: %s"
#: ../tails_installer/source.py:49
#, python-format
diff --git a/tr/tr.po b/tr/tr.po
index b8c94271a..26c00f3d3 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -14,15 +14,15 @@
# mrtmsy <mertamasya(a)gmail.com>, 2014
# muaz yadiyüzkırkiki, 2013
# muaz yadiyüzkırkiki, 2013
-# Ozancan Karataş <ozanc27(a)icloud.com>, 2015
+# Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015
# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2014,2016-2017
# Yasin Özel <iletisim(a)yasinozel.com.tr>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 07:50+0200\n"
-"PO-Revision-Date: 2017-06-20 14:25+0000\n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-08-21 15:01+0000\n"
"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 392d3d6e8..39058351b 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -5,6 +5,7 @@
# Translators:
# brendanyan <yan.brendan(a)gmail.com>, 2014
# Casper Li <casper.hk(a)hotmail.com>, 2013
+# coco coco, 2017
# 大圈洋蔥, 2016
# Casper Li <casper.hk(a)hotmail.com>, 2013
# ronnietse <tseronnie(a)ymail.com>, 2014
@@ -16,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-09 17:50+0200\n"
-"PO-Revision-Date: 2017-06-10 01:55+0000\n"
-"Last-Translator: carolyn <carolyn(a)anhalt.org>\n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-08-15 07:03+0000\n"
+"Last-Translator: coco coco\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -133,7 +134,7 @@ msgstr "唔支援嘅檔案系統:%s"
#: ../tails_installer/creator.py:760
#, python-format
msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr ""
+msgstr "嘗試安裝設備時出現未知的GLib異常: %(message)s"
#: ../tails_installer/creator.py:764
#, python-format
@@ -199,7 +200,7 @@ msgstr "安裝Bootloader…"
#: ../tails_installer/creator.py:1016
#, python-format
msgid "Could not find the '%s' COM32 module"
-msgstr ""
+msgstr "找不到'%s'COM32模塊"
#: ../tails_installer/creator.py:1024 ../tails_installer/creator.py:1405
#, python-format
@@ -222,17 +223,17 @@ msgstr "將%(device)s格式化成Fat32格式"
#: ../tails_installer/creator.py:1239
msgid "Could not find syslinux' gptmbr.bin"
-msgstr ""
+msgstr "找不到syslinux' gptmbr.bin"
#: ../tails_installer/creator.py:1252
#, python-format
msgid "Reading extracted MBR from %s"
-msgstr ""
+msgstr "從MBR中讀取%s"
#: ../tails_installer/creator.py:1256
#, python-format
msgid "Could not read the extracted MBR from %(path)s"
-msgstr ""
+msgstr "無法讀取所選取的MBR%(path)s"
#: ../tails_installer/creator.py:1269 ../tails_installer/creator.py:1270
#, python-format
@@ -285,7 +286,7 @@ msgstr "搵唔到"
msgid ""
"Make sure to extract the entire tails-installer zip file before running this"
" program."
-msgstr ""
+msgstr "執行此程式前請先解壓縮整個libusb-creator zip檔案。"
#: ../tails_installer/gui.py:69
#, python-format
@@ -310,7 +311,7 @@ msgstr "安裝完成!(%s)"
#: ../tails_installer/gui.py:258
msgid "Tails installation failed!"
-msgstr ""
+msgstr "Tails安裝失敗!"
#: ../tails_installer/gui.py:353
msgid ""
@@ -321,7 +322,7 @@ msgstr "警告:此工具需以系統管理員身份執行。請對圖示撳滑
#: ../tails_installer/gui.py:365 ../tails_installer/launcher.py:31
msgid "Tails Installer"
-msgstr ""
+msgstr "Tails安裝程序"
#: ../tails_installer/gui.py:440
msgid "No device suitable to install Tails could be found"
@@ -330,7 +331,7 @@ msgstr ""
#: ../tails_installer/gui.py:442
#, python-format
msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
-msgstr ""
+msgstr "請插入至少%0.1fGB的USB快閃隨身碟或SD卡。"
#: ../tails_installer/gui.py:474
#, python-format
@@ -348,7 +349,7 @@ msgid ""
"The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
"manufacturer and Tails will fail to start on it. Please try installing on a "
"different model."
-msgstr ""
+msgstr "USB快閃隨身碟\"%(pretty_name)s\"由其製造商設計為不可拆卸,並且Tails將無法啟動它。請嘗試安裝在其他型號上。"
#: ../tails_installer/gui.py:498
#, python-format
@@ -375,7 +376,7 @@ msgstr "由於裝置%(pretty_name)s唔係由Tails安裝程式所建立,所以
#: ../tails_installer/gui.py:533
msgid "An error happened while installing Tails"
-msgstr ""
+msgstr "安裝Tails時發生錯誤"
#: ../tails_installer/gui.py:545
msgid "Refreshing releases..."
@@ -391,7 +392,7 @@ msgstr "安裝完成!"
#: ../tails_installer/gui.py:590
msgid "Installation was completed."
-msgstr ""
+msgstr "安裝完成"
#: ../tails_installer/gui.py:635
msgid "Unable to mount device"
@@ -447,7 +448,7 @@ msgstr "已選取%(filename)s"
#: ../tails_installer/source.py:28
msgid "Unable to find LiveOS on ISO"
-msgstr ""
+msgstr "無法在ISO上找到LiveOS"
#: ../tails_installer/source.py:34
#, python-format
1
0
[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation@torproject.org 01 Sep '17
by translation@torproject.org 01 Sep '17
01 Sep '17
commit 607dfaaafc03646335fb4c69df6de1595a4f94f7
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Sep 1 05:15:57 2017 +0000
Update translations for https_everywhere_completed
---
eo/https-everywhere.dtd | 13 +++++++++++++
es/https-everywhere.dtd | 8 ++++----
ko/https-everywhere.dtd | 22 +++++++++++++++++-----
lv/https-everywhere.dtd | 13 +++++++++++++
nb/https-everywhere.dtd | 13 +++++++++++++
nn/https-everywhere.dtd | 13 +++++++++++++
pt_BR/https-everywhere.dtd | 13 +++++++++++++
ru/https-everywhere.dtd | 13 +++++++++++++
sv/https-everywhere.dtd | 15 ++++++++++++++-
9 files changed, 113 insertions(+), 10 deletions(-)
diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd
index 9188cbf87..d5f200021 100644
--- a/eo/https-everywhere.dtd
+++ b/eo/https-everywhere.dtd
@@ -24,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Montri nombrilon">
<!ENTITY https-everywhere.menu.viewAllRules "Montri ĉiujn regulojn">
+<!ENTITY https-everywhere.options.importSettings "Enporti agordojn">
+<!ENTITY https-everywhere.options.import "Enporti">
+<!ENTITY https-everywhere.options.imported "Viaj ŝanĝoj estis enportitaj.">
+
<!ENTITY https-everywhere.prefs.title "Agordoj de HTTPS-Ĉie">
<!ENTITY https-everywhere.prefs.enable_all "Enŝalti ĉiujn">
<!ENTITY https-everywhere.prefs.disable_all "Malŝalti ĉiujn">
+<!ENTITY https-everywhere.prefs.export_settings "Elporti agordojn">
+<!ENTITY https-everywhere.prefs.settings_warning "Averto">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Kelkaj de viaj agordoj de HTTPS-Ĉie estos forigitaj!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Tiu ĉi aldonaĵo estos signife ĝisdatigita je proksima estonteco. Se vi ne elportos viajn agordojn, vi povas perdi la jena(j)n:">
+<!ENTITY https-everywhere.prefs.settings_global "ĝeneralaj agordoj">
+<!ENTITY https-everywhere.prefs.settings_toggle "por-retejaj agordoj">
+<!ENTITY https-everywhere.prefs.settings_custom "propraj retejaj reguloj">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Bonvolu klaki ‘Bone’">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "sube por certigi konservadon de viaj agordoj. Kiam HTTPS-Ĉie estos ĝisdatigita, vi devos enporti tiujn ĉi agordojn per aldonaĵaj agordoj.">
<!ENTITY https-everywhere.prefs.reset_defaults "Reŝargi al aprioraj">
<!ENTITY https-everywhere.prefs.search "Serĉi">
<!ENTITY https-everywhere.prefs.site "Retejo">
diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index f4af619c6..d1a97eefc 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -32,14 +32,14 @@
<!ENTITY https-everywhere.prefs.enable_all "Activar todo">
<!ENTITY https-everywhere.prefs.disable_all "Desactivar todo">
<!ENTITY https-everywhere.prefs.export_settings "Exportar configuración">
-<!ENTITY https-everywhere.prefs.settings_warning "Atención">
+<!ENTITY https-everywhere.prefs.settings_warning "Advertencia:">
<!ENTITY https-everywhere.prefs.settings_warning_delete "¡Está a punto de borrarse parte de tu configuración HTTPS Everywhere!">
<!ENTITY https-everywhere.prefs.settings_warning_explain "Esta extensión se actualizará de forma sustancial en el futuro. Si no exportas tu configuración, puedes perder todo o parte de lo que sigue:">
<!ENTITY https-everywhere.prefs.settings_global "Preferencias globales">
-<!ENTITY https-everywhere.prefs.settings_toggle "Configuración per-site on/off">
+<!ENTITY https-everywhere.prefs.settings_toggle "Ajuste de activación/desactivación por-sitio">
<!ENTITY https-everywhere.prefs.settings_custom "Reglas del sitio personalizadas">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Por favor, pulsa "OK"">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "Para asegurarte de que la configuración se ha guardado. Una vez actualizado HTTPS Everywhere, has de importar estos ajustes en la sección opciones.">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Por favor, pulsa "Aceptar"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "debajo para asegurarte de que tu configuración se ha guardado. Una vez actualizado HTTPS Everywhere, has de importar esta configuración en la sección de opciones de la extensión.">
<!ENTITY https-everywhere.prefs.reset_defaults "Restablecer configuraciones predeterminadas">
<!ENTITY https-everywhere.prefs.search "Buscar">
<!ENTITY https-everywhere.prefs.site "Sitio">
diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd
index c8cea7081..33879f293 100644
--- a/ko/https-everywhere.dtd
+++ b/ko/https-everywhere.dtd
@@ -1,8 +1,7 @@
-<!ENTITY https-everywhere.about.title "HTTPS Everywhere에 대하여
-">
+<!ENTITY https-everywhere.about.title "HTTPS Everywhere에 대하여">
<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "웹 암호화! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다.">
-<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.ext_description "웹을 암호화 하세요! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다.">
+<!ENTITY https-everywhere.about.version "버전">
<!ENTITY https-everywhere.about.created_by "작성">
<!ENTITY https-everywhere.about.and ", ">
<!ENTITY https-everywhere.about.librarians "규칙설정 라이브러리">
@@ -25,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "카운터 보기">
<!ENTITY https-everywhere.menu.viewAllRules "모든 규칙 표시">
-<!ENTITY https-everywhere.prefs.title "HTTPS 모든곳 사용 환경 설정">
+<!ENTITY https-everywhere.options.importSettings "설정 가져오기">
+<!ENTITY https-everywhere.options.import "가져오기">
+<!ENTITY https-everywhere.options.imported "설정을 가져왔습니다.">
+
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 사용 환경 설정">
<!ENTITY https-everywhere.prefs.enable_all "모두 사용">
<!ENTITY https-everywhere.prefs.disable_all "모두 사용 안 함">
+<!ENTITY https-everywhere.prefs.export_settings "설정 내보내기">
+<!ENTITY https-everywhere.prefs.settings_warning "경고:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "일부 HTTPS Everywhere 설정이 삭제 되려고 합니다!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "이 확장기능은 가까운 장래에 실질적으로 업그레이드 될 것입니다. 설정을 내 보내지 않으면 다음 중 하나 이상이 손실 될 수 있습니다:">
+<!ENTITY https-everywhere.prefs.settings_global "전역 설정">
+<!ENTITY https-everywhere.prefs.settings_toggle "사이트 별 온/오프 설정">
+<!ENTITY https-everywhere.prefs.settings_custom "맞춤 사이트 규칙">
+<!ENTITY https-everywhere.prefs.settings_click_ok "'확인'을 클릭하십시오">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "설정을 저장하려면 아래를 참조하십시오. HTTPS Everywhere가 업그레이드 되면 나중에 확장 옵션 섹션에서 이러한 설정을 가져와야 합니다.">
<!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정">
<!ENTITY https-everywhere.prefs.search "검색">
<!ENTITY https-everywhere.prefs.site "사이트">
diff --git a/lv/https-everywhere.dtd b/lv/https-everywhere.dtd
index a5fc36bb1..49aeb3686 100644
--- a/lv/https-everywhere.dtd
+++ b/lv/https-everywhere.dtd
@@ -24,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Rādījumu skaitītājs">
<!ENTITY https-everywhere.menu.viewAllRules "Skatīt visas kārtulas">
+<!ENTITY https-everywhere.options.importSettings "Importēt iestatījumus">
+<!ENTITY https-everywhere.options.import "Importēt">
+<!ENTITY https-everywhere.options.imported "Jūsu iestatījumi ir ieimportēti.">
+
<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere preferences">
<!ENTITY https-everywhere.prefs.enable_all "Iespējot visus">
<!ENTITY https-everywhere.prefs.disable_all "Atspējot visus">
+<!ENTITY https-everywhere.prefs.export_settings "Eksporta iestatījumi">
+<!ENTITY https-everywhere.prefs.settings_warning "Brīdinājums:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Daži Jūsu HTTPS Everywhere iestatījumi tūlīt tiks izdzēsti!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Paplašinājums tuvākajā nākotnē tiks būtiski jaunināts. Ja neeksportēsit savus iestatījumus, Jūs varat pazaudēt:">
+<!ENTITY https-everywhere.prefs.settings_global "Globālās preferences">
+<!ENTITY https-everywhere.prefs.settings_toggle "Iestatījums pa-lapai ieslēgts/izslēgts">
+<!ENTITY https-everywhere.prefs.settings_custom "Pielāgotas vietnes kārtulas">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Lūdzu noklikšķiniet "Labi"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "zemāk, lai pārliecinātos, kā Jūsu iestatījumi ir saglabāti. Kad tiks atjaunināts HTTPS Everywhere, esot paplašinājumu iespēju sadaļā, Jums vajadzēs importēt šos iestatījumus.">
<!ENTITY https-everywhere.prefs.reset_defaults "Atiestatīt uz noklusējuma vērtībām">
<!ENTITY https-everywhere.prefs.search "Meklēt">
<!ENTITY https-everywhere.prefs.site "Vietne">
diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd
index c7a7f20e4..7ca0341c6 100644
--- a/nb/https-everywhere.dtd
+++ b/nb/https-everywhere.dtd
@@ -24,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Vis teller">
<!ENTITY https-everywhere.menu.viewAllRules "Vis alle regler">
+<!ENTITY https-everywhere.options.importSettings "Importer innstillinger">
+<!ENTITY https-everywhere.options.import "Importer">
+<!ENTITY https-everywhere.options.imported "Innstillingene dine har blitt importerte.">
+
<!ENTITY https-everywhere.prefs.title "Innstillinger for HTTPS-everywhere">
<!ENTITY https-everywhere.prefs.enable_all "Aktiver alle">
<!ENTITY https-everywhere.prefs.disable_all "Skru av alle">
+<!ENTITY https-everywhere.prefs.export_settings "Eksporter innstillinger">
+<!ENTITY https-everywhere.prefs.settings_warning "Advarsel:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Noen av dine HTTPS Everywhere-innstillinger er i ferd med å bli slettet!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Dette programtillegget vil oppgraderes i vesentlig grad i fremtiden. Hvis du ikke eksportere dine innstillinger, kan du miste én eller flere av følgende:">
+<!ENTITY https-everywhere.prefs.settings_global "Globale innstillinger">
+<!ENTITY https-everywhere.prefs.settings_toggle "Tilstandsinnstillinger per side">
+<!ENTITY https-everywhere.prefs.settings_custom "Egendefinerte regler for sider">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Klikk "OK"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "nedenfor for å forsikre at dine innstillinger er lagret. Når HTTPS Everywhere er oppgradert, må du senere importere disse innstillingene i programutvidelsesdelen.">
<!ENTITY https-everywhere.prefs.reset_defaults "Tilbakestill til forvalg">
<!ENTITY https-everywhere.prefs.search "Søk">
<!ENTITY https-everywhere.prefs.site "Side">
diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd
index acee18cc3..8351fd313 100644
--- a/nn/https-everywhere.dtd
+++ b/nn/https-everywhere.dtd
@@ -24,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Vis teljar">
<!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane">
+<!ENTITY https-everywhere.options.importSettings "Importer innstillingar">
+<!ENTITY https-everywhere.options.import "Importer">
+<!ENTITY https-everywhere.options.imported "Innstillingane dine er importerte">
+
<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillingar">
<!ENTITY https-everywhere.prefs.enable_all "Slå på alle">
<!ENTITY https-everywhere.prefs.disable_all "Slå av alle">
+<!ENTITY https-everywhere.prefs.export_settings "Eksporter innstillingar">
+<!ENTITY https-everywhere.prefs.settings_warning "Åtvaring:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Nokre av HTTPS Everywhere-innstillingane dine er i ferd med å verte sletta!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Denne utvidinga vil verte vesentleg oppgradert i nær framtid. Om du ikkje eksporterer innstillingane dine, vil du kunne miste ei av fleire, av følgjande:">
+<!ENTITY https-everywhere.prefs.settings_global "Globale innstillingar">
+<!ENTITY https-everywhere.prefs.settings_toggle "Pr.-side på/av-innstilling">
+<!ENTITY https-everywhere.prefs.settings_custom "Tilpassa nettsidereglar">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Klikk «OK»">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "nedanfor for å forsikre deg om at innstillingane er lagra. Når HTTPS Everywhere er oppgradert, må du seinare importere desse innstillingane i utvidingsvala..">
<!ENTITY https-everywhere.prefs.reset_defaults "Still tilbake til standard">
<!ENTITY https-everywhere.prefs.search "Søk">
<!ENTITY https-everywhere.prefs.site "Side">
diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index cb3531ca5..39cba9a74 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -24,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Mostrar o contador">
<!ENTITY https-everywhere.menu.viewAllRules "Consultar Todas as Regras">
+<!ENTITY https-everywhere.options.importSettings "Importar Configurações">
+<!ENTITY https-everywhere.options.import "Importar">
+<!ENTITY https-everywhere.options.imported "As suas configurações foram importadas.">
+
<!ENTITY https-everywhere.prefs.title "Preferências do HTTPS Everywhere ">
<!ENTITY https-everywhere.prefs.enable_all "Habilitar tudo">
<!ENTITY https-everywhere.prefs.disable_all "Desabilitar tudo">
+<!ENTITY https-everywhere.prefs.export_settings "Exportar Configurações">
+<!ENTITY https-everywhere.prefs.settings_warning "Cuidado:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Algumas das configurações do seu HTTPS Everywhere estão prestes a serem apagadas!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Esta extensão será significativamente atualizada em um futuro próximo. Caso você não exporte as suas configurações, poderá perder uma ou mais funções:">
+<!ENTITY https-everywhere.prefs.settings_global "Preferências gerais:">
+<!ENTITY https-everywhere.prefs.settings_toggle "Configuração de ativação/desativação por site">
+<!ENTITY https-everywhere.prefs.settings_custom "Regras de site personalizado">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Por favor, clique em 'OK'">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "Abaixo para garantir que suas configurações sejam salvas. Uma vez que o HTTPS Everywhere seja atualizado, você terá que importar essas configurações na seção de opções de extensão.">
<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar as configurações padrão">
<!ENTITY https-everywhere.prefs.search "Procurar">
<!ENTITY https-everywhere.prefs.site "Site">
diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index a270cb368..870945bda 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -24,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Показывать счётчик">
<!ENTITY https-everywhere.menu.viewAllRules "Посмотреть все правила">
+<!ENTITY https-everywhere.options.importSettings "Импорт настроек">
+<!ENTITY https-everywhere.options.import "Импорт">
+<!ENTITY https-everywhere.options.imported "Ваши настройки импортированы.">
+
<!ENTITY https-everywhere.prefs.title "Настройки HTTPS Everywhere">
<!ENTITY https-everywhere.prefs.enable_all "Включить всё">
<!ENTITY https-everywhere.prefs.disable_all "Выключить всё">
+<!ENTITY https-everywhere.prefs.export_settings "Экспорт настроек">
+<!ENTITY https-everywhere.prefs.settings_warning "Предупреждение:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Некоторые из настроек HTTPS Everywhere будут удалены!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Это расширение будет существенно обновлено в ближайшем будущем. Если вы не экспортируете свои настройки, вы можете потерять одно или несколько из следующих:">
+<!ENTITY https-everywhere.prefs.settings_global "Глобальные настройки">
+<!ENTITY https-everywhere.prefs.settings_toggle "Настройка включения/выключения для сайта">
+<!ENTITY https-everywhere.prefs.settings_custom "Пользовательские правила сайта">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Нажмите 'OK'">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "ниже, чтобы убедиться, что ваши настройки сохранены. После обновления HTTPS Everywhere, вам придётся импортировать эти параметры в разделе параметров расширения.">
<!ENTITY https-everywhere.prefs.reset_defaults "По умолчанию">
<!ENTITY https-everywhere.prefs.search "Поиск">
<!ENTITY https-everywhere.prefs.site "Сайт">
diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd
index 5e07d68c6..cd2f9035c 100644
--- a/sv/https-everywhere.dtd
+++ b/sv/https-everywhere.dtd
@@ -24,9 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Visa räknare">
<!ENTITY https-everywhere.menu.viewAllRules "Visa alla regler">
+<!ENTITY https-everywhere.options.importSettings "Importera inställningar">
+<!ENTITY https-everywhere.options.import "Importera">
+<!ENTITY https-everywhere.options.imported "Dina inställningar har importerats.">
+
<!ENTITY https-everywhere.prefs.title "Inställningar för HTTPS Everywhere">
<!ENTITY https-everywhere.prefs.enable_all "Aktivera alla">
<!ENTITY https-everywhere.prefs.disable_all "Inaktivera alla">
+<!ENTITY https-everywhere.prefs.export_settings "Exportera inställningar">
+<!ENTITY https-everywhere.prefs.settings_warning "Varning:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Några av dina inställningar för HTTPS Everywhere håller på att tas bort!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Denna utökning kommer att uppgraderas väsentligt inom en snar framtid. Om du inte exporterar dina inställningar kan du förlora ett eller flera av följande:">
+<!ENTITY https-everywhere.prefs.settings_global "Globala inställningar">
+<!ENTITY https-everywhere.prefs.settings_toggle "Inställning per sida på/av">
+<!ENTITY https-everywhere.prefs.settings_custom "Anpassade webbplatsregler">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Klicka på "OK"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "nedan för att se till att dina inställningar sparas. När HTTPS Everywhere har uppgraderats måste du senare importera dessa inställningar i avsnittet för utökningsalternativ.">
<!ENTITY https-everywhere.prefs.reset_defaults "Återställ till standardvärden">
<!ENTITY https-everywhere.prefs.search "Sök">
<!ENTITY https-everywhere.prefs.site "Webbplats">
@@ -49,7 +62,7 @@
<!ENTITY https-everywhere.chrome.host "Värd:">
<!ENTITY https-everywhere.chrome.show_advanced "Visa avancerad">
<!ENTITY https-everywhere.chrome.hide_advanced "Göm avancerad">
-<!ENTITY https-everywhere.chrome.rule_name "Regel namn">
+<!ENTITY https-everywhere.chrome.rule_name "Regelnamn">
<!ENTITY https-everywhere.chrome.regex "Matchar regex">
<!ENTITY https-everywhere.chrome.redirect_to "Omdirigera till">
<!ENTITY https-everywhere.chrome.status_cancel_button "Avbryt">
1
0
[translation/https_everywhere] Update translations for https_everywhere
by translation@torproject.org 01 Sep '17
by translation@torproject.org 01 Sep '17
01 Sep '17
commit 5154c9503e7c32e9c332fde845e73ad234daab65
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Sep 1 05:15:46 2017 +0000
Update translations for https_everywhere
---
ar/https-everywhere.dtd | 6 +++---
eo/https-everywhere.dtd | 24 ++++++++++++------------
es/https-everywhere.dtd | 8 ++++----
es_AR/https-everywhere.dtd | 16 ++++++++--------
fa/https-everywhere.dtd | 18 +++++++++---------
hi/https-everywhere.dtd | 26 +++++++++++++-------------
hu/https-everywhere.dtd | 10 +++++-----
ko/https-everywhere.dtd | 33 ++++++++++++++++-----------------
lv/https-everywhere.dtd | 24 ++++++++++++------------
nb/https-everywhere.dtd | 24 ++++++++++++------------
nn/https-everywhere.dtd | 24 ++++++++++++------------
pt_BR/https-everywhere.dtd | 6 +++---
ru/https-everywhere.dtd | 24 ++++++++++++------------
sv/https-everywhere.dtd | 26 +++++++++++++-------------
14 files changed, 134 insertions(+), 135 deletions(-)
diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index d3dd01a8f..63a155a5b 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -25,14 +25,14 @@
<!ENTITY https-everywhere.menu.viewAllRules "عرض جميع القواعد">
<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.import "إستيراد">
+<!ENTITY https-everywhere.options.imported "تم إستيراد الاعدادت الخاصة بك">
<!ENTITY https-everywhere.prefs.title "خيارات HTTPS Everywhere">
<!ENTITY https-everywhere.prefs.enable_all "فعّل الكل">
<!ENTITY https-everywhere.prefs.disable_all "عطّل الكل">
<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
+<!ENTITY https-everywhere.prefs.settings_warning "تحذير:">
<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd
index 420facc19..d5f200021 100644
--- a/eo/https-everywhere.dtd
+++ b/eo/https-everywhere.dtd
@@ -24,22 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Montri nombrilon">
<!ENTITY https-everywhere.menu.viewAllRules "Montri ĉiujn regulojn">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Enporti agordojn">
+<!ENTITY https-everywhere.options.import "Enporti">
+<!ENTITY https-everywhere.options.imported "Viaj ŝanĝoj estis enportitaj.">
<!ENTITY https-everywhere.prefs.title "Agordoj de HTTPS-Ĉie">
<!ENTITY https-everywhere.prefs.enable_all "Enŝalti ĉiujn">
<!ENTITY https-everywhere.prefs.disable_all "Malŝalti ĉiujn">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
-<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.export_settings "Elporti agordojn">
+<!ENTITY https-everywhere.prefs.settings_warning "Averto">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Kelkaj de viaj agordoj de HTTPS-Ĉie estos forigitaj!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Tiu ĉi aldonaĵo estos signife ĝisdatigita je proksima estonteco. Se vi ne elportos viajn agordojn, vi povas perdi la jena(j)n:">
+<!ENTITY https-everywhere.prefs.settings_global "ĝeneralaj agordoj">
+<!ENTITY https-everywhere.prefs.settings_toggle "por-retejaj agordoj">
+<!ENTITY https-everywhere.prefs.settings_custom "propraj retejaj reguloj">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Bonvolu klaki ‘Bone’">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "sube por certigi konservadon de viaj agordoj. Kiam HTTPS-Ĉie estos ĝisdatigita, vi devos enporti tiujn ĉi agordojn per aldonaĵaj agordoj.">
<!ENTITY https-everywhere.prefs.reset_defaults "Reŝargi al aprioraj">
<!ENTITY https-everywhere.prefs.search "Serĉi">
<!ENTITY https-everywhere.prefs.site "Retejo">
diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index f4af619c6..d1a97eefc 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -32,14 +32,14 @@
<!ENTITY https-everywhere.prefs.enable_all "Activar todo">
<!ENTITY https-everywhere.prefs.disable_all "Desactivar todo">
<!ENTITY https-everywhere.prefs.export_settings "Exportar configuración">
-<!ENTITY https-everywhere.prefs.settings_warning "Atención">
+<!ENTITY https-everywhere.prefs.settings_warning "Advertencia:">
<!ENTITY https-everywhere.prefs.settings_warning_delete "¡Está a punto de borrarse parte de tu configuración HTTPS Everywhere!">
<!ENTITY https-everywhere.prefs.settings_warning_explain "Esta extensión se actualizará de forma sustancial en el futuro. Si no exportas tu configuración, puedes perder todo o parte de lo que sigue:">
<!ENTITY https-everywhere.prefs.settings_global "Preferencias globales">
-<!ENTITY https-everywhere.prefs.settings_toggle "Configuración per-site on/off">
+<!ENTITY https-everywhere.prefs.settings_toggle "Ajuste de activación/desactivación por-sitio">
<!ENTITY https-everywhere.prefs.settings_custom "Reglas del sitio personalizadas">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Por favor, pulsa "OK"">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "Para asegurarte de que la configuración se ha guardado. Una vez actualizado HTTPS Everywhere, has de importar estos ajustes en la sección opciones.">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Por favor, pulsa "Aceptar"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "debajo para asegurarte de que tu configuración se ha guardado. Una vez actualizado HTTPS Everywhere, has de importar esta configuración en la sección de opciones de la extensión.">
<!ENTITY https-everywhere.prefs.reset_defaults "Restablecer configuraciones predeterminadas">
<!ENTITY https-everywhere.prefs.search "Buscar">
<!ENTITY https-everywhere.prefs.site "Sitio">
diff --git a/es_AR/https-everywhere.dtd b/es_AR/https-everywhere.dtd
index 29fc3841a..6e29def27 100644
--- a/es_AR/https-everywhere.dtd
+++ b/es_AR/https-everywhere.dtd
@@ -24,21 +24,21 @@
<!ENTITY https-everywhere.menu.showCounter "Mostrar contador">
<!ENTITY https-everywhere.menu.viewAllRules "Ver todas las Reglas">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Importar Configuraciones">
+<!ENTITY https-everywhere.options.import "Importar">
+<!ENTITY https-everywhere.options.imported "Tus configuraciones han sido importadas.">
<!ENTITY https-everywhere.prefs.title "Preferencias de HTTPS Everywhere">
<!ENTITY https-everywhere.prefs.enable_all "Habilitar todo">
<!ENTITY https-everywhere.prefs.disable_all "Deshabilitar todo">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
+<!ENTITY https-everywhere.prefs.export_settings "Exportar Configuraciones">
+<!ENTITY https-everywhere.prefs.settings_warning "Advertencia:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "¡Algunas de tus configuraciones de HTTPS Everywhere están a punto de ser eliminadas!">
<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
+<!ENTITY https-everywhere.prefs.settings_global "Preferencias globales">
<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Por favor, haz click en 'OK'">
<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
<!ENTITY https-everywhere.prefs.reset_defaults "Restablecer valores predeterminados">
<!ENTITY https-everywhere.prefs.search "Búsqueda">
diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd
index 247147ad6..97462d7e3 100644
--- a/fa/https-everywhere.dtd
+++ b/fa/https-everywhere.dtd
@@ -24,21 +24,21 @@
<!ENTITY https-everywhere.menu.showCounter "نمایش شمارنده">
<!ENTITY https-everywhere.menu.viewAllRules "نمایش همه قوانین ">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "وارد کردن تنظیمات">
+<!ENTITY https-everywhere.options.import "وارد کردن">
+<!ENTITY https-everywhere.options.imported "تنظیمات شما وارد شد.">
<!ENTITY https-everywhere.prefs.title "ترجیحات HTTPS سراسری">
<!ENTITY https-everywhere.prefs.enable_all "همهی موارد را فعال کنید">
<!ENTITY https-everywhere.prefs.disable_all "همهی موارد را غیرفعال کنید">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
+<!ENTITY https-everywhere.prefs.export_settings "خروجی گرفتن از تنظیمات">
+<!ENTITY https-everywhere.prefs.settings_warning "اخطار:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "بعضی از تنظیمات HTTPS Everywhere شما در حال پاک شدن است.">
<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
+<!ENTITY https-everywhere.prefs.settings_global "تنظیمات سراسری">
<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
+<!ENTITY https-everywhere.prefs.settings_custom "قانونهای سفارشی سایت">
+<!ENTITY https-everywhere.prefs.settings_click_ok "لطفا بر روی 'تایید' کلیک کنید.">
<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
<!ENTITY https-everywhere.prefs.reset_defaults "بازنشانی به پیشفرض">
<!ENTITY https-everywhere.prefs.search "جستجو">
diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd
index 40e681af9..3cf6150d6 100644
--- a/hi/https-everywhere.dtd
+++ b/hi/https-everywhere.dtd
@@ -1,21 +1,21 @@
<!ENTITY https-everywhere.about.title "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE) के बारे में">
<!ENTITY https-everywhere.about.ext_name "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE)">
-<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites.">
+<!ENTITY https-everywhere.about.ext_description "इन्टरनेट संचार को कूटबद्ध करें! सभी वेबसाइट्स पर स्वतः ही HTTPS का इस्तेमाल करें.">
<!ENTITY https-everywhere.about.version "संस्करण">
<!ENTITY https-everywhere.about.created_by "के द्वारा बनाई गई">
-<!ENTITY https-everywhere.about.and ", and">
-<!ENTITY https-everywhere.about.librarians "Ruleset Librarians">
-<!ENTITY https-everywhere.about.add_new_rule "Add New Rule">
-<!ENTITY https-everywhere.about.thanks "Thanks to">
-<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">
-<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!">
-<!ENTITY https-everywhere.about.contribute "If you like HTTPS Everywhere, you might consider">
-<!ENTITY https-everywhere.about.donate_tor "Donating to Tor">
-<!ENTITY https-everywhere.about.tor_lang_code "en">
-<!ENTITY https-everywhere.about.or "or">
-<!ENTITY https-everywhere.about.donate_eff "Donating to EFF">
+<!ENTITY https-everywhere.about.and ", और">
+<!ENTITY https-everywhere.about.librarians "रुलसेट लाइब्रेरियन">
+<!ENTITY https-everywhere.about.add_new_rule "नया नियम जोड़ें">
+<!ENTITY https-everywhere.about.thanks "को धन्यवाद्">
+<!ENTITY https-everywhere.about.many_contributors "अनेक योगदानकर्ता, जिनमे शामिल हैं">
+<!ENTITY https-everywhere.about.noscript "इसके अलावा, HTTPS हर जगह के हिस्से Giorgio Maone और अनेक लोगो के द्वारा, NoScript के कोड पर आधारित हैं. हम उनके महान कार्य के आभारी हैं.">
+<!ENTITY https-everywhere.about.contribute "यदि आपको HTTPS हर जगह पसंद है तो, आप इन पर भी विचार कर सकते हैं">
+<!ENTITY https-everywhere.about.donate_tor "Tor को दान करना">
+<!ENTITY https-everywhere.about.tor_lang_code "अंग्रेजी भाषा">
+<!ENTITY https-everywhere.about.or "अथवा">
+<!ENTITY https-everywhere.about.donate_eff "EFF को दान करना">
-<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF">
+<!ENTITY https-everywhere.menu.donate_eff_imperative "EFF को दान कीजिये">
<!ENTITY https-everywhere.menu.about "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE) के बारे में">
<!ENTITY https-everywhere.menu.observatory "एसएसएल वेधशाला प्राथमिकताएं">
<!ENTITY https-everywhere.menu.globalEnable "हर जगह HTTPS सक्षम">
diff --git a/hu/https-everywhere.dtd b/hu/https-everywhere.dtd
index de0e19dd8..85da8ba0d 100644
--- a/hu/https-everywhere.dtd
+++ b/hu/https-everywhere.dtd
@@ -24,15 +24,15 @@
<!ENTITY https-everywhere.menu.showCounter "Mutassa a számlálót">
<!ENTITY https-everywhere.menu.viewAllRules "Összes szabály megtekintése">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Beállítások importálása">
+<!ENTITY https-everywhere.options.import "Importálás">
+<!ENTITY https-everywhere.options.imported "A beállításaid importálva.">
<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferenciák">
<!ENTITY https-everywhere.prefs.enable_all "Mind bekapcsolása">
<!ENTITY https-everywhere.prefs.disable_all "Mind kikapcsolása">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
+<!ENTITY https-everywhere.prefs.export_settings "Beállítások exportálása">
+<!ENTITY https-everywhere.prefs.settings_warning "Figyelmeztetés:">
<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd
index e7fcdec48..33879f293 100644
--- a/ko/https-everywhere.dtd
+++ b/ko/https-everywhere.dtd
@@ -1,8 +1,7 @@
-<!ENTITY https-everywhere.about.title "HTTPS Everywhere에 대하여
-">
+<!ENTITY https-everywhere.about.title "HTTPS Everywhere에 대하여">
<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere">
-<!ENTITY https-everywhere.about.ext_description "웹 암호화! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다.">
-<!ENTITY https-everywhere.about.version "Version">
+<!ENTITY https-everywhere.about.ext_description "웹을 암호화 하세요! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다.">
+<!ENTITY https-everywhere.about.version "버전">
<!ENTITY https-everywhere.about.created_by "작성">
<!ENTITY https-everywhere.about.and ", ">
<!ENTITY https-everywhere.about.librarians "규칙설정 라이브러리">
@@ -25,22 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "카운터 보기">
<!ENTITY https-everywhere.menu.viewAllRules "모든 규칙 표시">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "설정 가져오기">
+<!ENTITY https-everywhere.options.import "가져오기">
+<!ENTITY https-everywhere.options.imported "설정을 가져왔습니다.">
-<!ENTITY https-everywhere.prefs.title "HTTPS 모든곳 사용 환경 설정">
+<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 사용 환경 설정">
<!ENTITY https-everywhere.prefs.enable_all "모두 사용">
<!ENTITY https-everywhere.prefs.disable_all "모두 사용 안 함">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
-<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.export_settings "설정 내보내기">
+<!ENTITY https-everywhere.prefs.settings_warning "경고:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "일부 HTTPS Everywhere 설정이 삭제 되려고 합니다!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "이 확장기능은 가까운 장래에 실질적으로 업그레이드 될 것입니다. 설정을 내 보내지 않으면 다음 중 하나 이상이 손실 될 수 있습니다:">
+<!ENTITY https-everywhere.prefs.settings_global "전역 설정">
+<!ENTITY https-everywhere.prefs.settings_toggle "사이트 별 온/오프 설정">
+<!ENTITY https-everywhere.prefs.settings_custom "맞춤 사이트 규칙">
+<!ENTITY https-everywhere.prefs.settings_click_ok "'확인'을 클릭하십시오">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "설정을 저장하려면 아래를 참조하십시오. HTTPS Everywhere가 업그레이드 되면 나중에 확장 옵션 섹션에서 이러한 설정을 가져와야 합니다.">
<!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정">
<!ENTITY https-everywhere.prefs.search "검색">
<!ENTITY https-everywhere.prefs.site "사이트">
diff --git a/lv/https-everywhere.dtd b/lv/https-everywhere.dtd
index a2f278dec..49aeb3686 100644
--- a/lv/https-everywhere.dtd
+++ b/lv/https-everywhere.dtd
@@ -24,22 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Rādījumu skaitītājs">
<!ENTITY https-everywhere.menu.viewAllRules "Skatīt visas kārtulas">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Importēt iestatījumus">
+<!ENTITY https-everywhere.options.import "Importēt">
+<!ENTITY https-everywhere.options.imported "Jūsu iestatījumi ir ieimportēti.">
<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere preferences">
<!ENTITY https-everywhere.prefs.enable_all "Iespējot visus">
<!ENTITY https-everywhere.prefs.disable_all "Atspējot visus">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
-<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.export_settings "Eksporta iestatījumi">
+<!ENTITY https-everywhere.prefs.settings_warning "Brīdinājums:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Daži Jūsu HTTPS Everywhere iestatījumi tūlīt tiks izdzēsti!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Paplašinājums tuvākajā nākotnē tiks būtiski jaunināts. Ja neeksportēsit savus iestatījumus, Jūs varat pazaudēt:">
+<!ENTITY https-everywhere.prefs.settings_global "Globālās preferences">
+<!ENTITY https-everywhere.prefs.settings_toggle "Iestatījums pa-lapai ieslēgts/izslēgts">
+<!ENTITY https-everywhere.prefs.settings_custom "Pielāgotas vietnes kārtulas">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Lūdzu noklikšķiniet "Labi"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "zemāk, lai pārliecinātos, kā Jūsu iestatījumi ir saglabāti. Kad tiks atjaunināts HTTPS Everywhere, esot paplašinājumu iespēju sadaļā, Jums vajadzēs importēt šos iestatījumus.">
<!ENTITY https-everywhere.prefs.reset_defaults "Atiestatīt uz noklusējuma vērtībām">
<!ENTITY https-everywhere.prefs.search "Meklēt">
<!ENTITY https-everywhere.prefs.site "Vietne">
diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd
index a769cee4f..7ca0341c6 100644
--- a/nb/https-everywhere.dtd
+++ b/nb/https-everywhere.dtd
@@ -24,22 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Vis teller">
<!ENTITY https-everywhere.menu.viewAllRules "Vis alle regler">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Importer innstillinger">
+<!ENTITY https-everywhere.options.import "Importer">
+<!ENTITY https-everywhere.options.imported "Innstillingene dine har blitt importerte.">
<!ENTITY https-everywhere.prefs.title "Innstillinger for HTTPS-everywhere">
<!ENTITY https-everywhere.prefs.enable_all "Aktiver alle">
<!ENTITY https-everywhere.prefs.disable_all "Skru av alle">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
-<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.export_settings "Eksporter innstillinger">
+<!ENTITY https-everywhere.prefs.settings_warning "Advarsel:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Noen av dine HTTPS Everywhere-innstillinger er i ferd med å bli slettet!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Dette programtillegget vil oppgraderes i vesentlig grad i fremtiden. Hvis du ikke eksportere dine innstillinger, kan du miste én eller flere av følgende:">
+<!ENTITY https-everywhere.prefs.settings_global "Globale innstillinger">
+<!ENTITY https-everywhere.prefs.settings_toggle "Tilstandsinnstillinger per side">
+<!ENTITY https-everywhere.prefs.settings_custom "Egendefinerte regler for sider">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Klikk "OK"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "nedenfor for å forsikre at dine innstillinger er lagret. Når HTTPS Everywhere er oppgradert, må du senere importere disse innstillingene i programutvidelsesdelen.">
<!ENTITY https-everywhere.prefs.reset_defaults "Tilbakestill til forvalg">
<!ENTITY https-everywhere.prefs.search "Søk">
<!ENTITY https-everywhere.prefs.site "Side">
diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd
index 44c4cd216..8351fd313 100644
--- a/nn/https-everywhere.dtd
+++ b/nn/https-everywhere.dtd
@@ -24,22 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Vis teljar">
<!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Importer innstillingar">
+<!ENTITY https-everywhere.options.import "Importer">
+<!ENTITY https-everywhere.options.imported "Innstillingane dine er importerte">
<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillingar">
<!ENTITY https-everywhere.prefs.enable_all "Slå på alle">
<!ENTITY https-everywhere.prefs.disable_all "Slå av alle">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
-<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.export_settings "Eksporter innstillingar">
+<!ENTITY https-everywhere.prefs.settings_warning "Åtvaring:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Nokre av HTTPS Everywhere-innstillingane dine er i ferd med å verte sletta!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Denne utvidinga vil verte vesentleg oppgradert i nær framtid. Om du ikkje eksporterer innstillingane dine, vil du kunne miste ei av fleire, av følgjande:">
+<!ENTITY https-everywhere.prefs.settings_global "Globale innstillingar">
+<!ENTITY https-everywhere.prefs.settings_toggle "Pr.-side på/av-innstilling">
+<!ENTITY https-everywhere.prefs.settings_custom "Tilpassa nettsidereglar">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Klikk «OK»">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "nedanfor for å forsikre deg om at innstillingane er lagra. Når HTTPS Everywhere er oppgradert, må du seinare importere desse innstillingane i utvidingsvala..">
<!ENTITY https-everywhere.prefs.reset_defaults "Still tilbake til standard">
<!ENTITY https-everywhere.prefs.search "Søk">
<!ENTITY https-everywhere.prefs.site "Side">
diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index e4748fca6..39cba9a74 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -36,10 +36,10 @@
<!ENTITY https-everywhere.prefs.settings_warning_delete "Algumas das configurações do seu HTTPS Everywhere estão prestes a serem apagadas!">
<!ENTITY https-everywhere.prefs.settings_warning_explain "Esta extensão será significativamente atualizada em um futuro próximo. Caso você não exporte as suas configurações, poderá perder uma ou mais funções:">
<!ENTITY https-everywhere.prefs.settings_global "Preferências gerais:">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
+<!ENTITY https-everywhere.prefs.settings_toggle "Configuração de ativação/desativação por site">
+<!ENTITY https-everywhere.prefs.settings_custom "Regras de site personalizado">
<!ENTITY https-everywhere.prefs.settings_click_ok "Por favor, clique em 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "Abaixo para garantir que suas configurações sejam salvas. Uma vez que o HTTPS Everywhere seja atualizado, você terá que importar essas configurações na seção de opções de extensão.">
<!ENTITY https-everywhere.prefs.reset_defaults "Restaurar as configurações padrão">
<!ENTITY https-everywhere.prefs.search "Procurar">
<!ENTITY https-everywhere.prefs.site "Site">
diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index 325781eba..870945bda 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -24,22 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Показывать счётчик">
<!ENTITY https-everywhere.menu.viewAllRules "Посмотреть все правила">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Импорт настроек">
+<!ENTITY https-everywhere.options.import "Импорт">
+<!ENTITY https-everywhere.options.imported "Ваши настройки импортированы.">
<!ENTITY https-everywhere.prefs.title "Настройки HTTPS Everywhere">
<!ENTITY https-everywhere.prefs.enable_all "Включить всё">
<!ENTITY https-everywhere.prefs.disable_all "Выключить всё">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
-<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.export_settings "Экспорт настроек">
+<!ENTITY https-everywhere.prefs.settings_warning "Предупреждение:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Некоторые из настроек HTTPS Everywhere будут удалены!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Это расширение будет существенно обновлено в ближайшем будущем. Если вы не экспортируете свои настройки, вы можете потерять одно или несколько из следующих:">
+<!ENTITY https-everywhere.prefs.settings_global "Глобальные настройки">
+<!ENTITY https-everywhere.prefs.settings_toggle "Настройка включения/выключения для сайта">
+<!ENTITY https-everywhere.prefs.settings_custom "Пользовательские правила сайта">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Нажмите 'OK'">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "ниже, чтобы убедиться, что ваши настройки сохранены. После обновления HTTPS Everywhere, вам придётся импортировать эти параметры в разделе параметров расширения.">
<!ENTITY https-everywhere.prefs.reset_defaults "По умолчанию">
<!ENTITY https-everywhere.prefs.search "Поиск">
<!ENTITY https-everywhere.prefs.site "Сайт">
diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd
index 05b1f8eb1..cd2f9035c 100644
--- a/sv/https-everywhere.dtd
+++ b/sv/https-everywhere.dtd
@@ -24,22 +24,22 @@
<!ENTITY https-everywhere.menu.showCounter "Visa räknare">
<!ENTITY https-everywhere.menu.viewAllRules "Visa alla regler">
-<!ENTITY https-everywhere.options.importSettings "Import Settings">
-<!ENTITY https-everywhere.options.import "Import">
-<!ENTITY https-everywhere.options.imported "Your settings have been imported.">
+<!ENTITY https-everywhere.options.importSettings "Importera inställningar">
+<!ENTITY https-everywhere.options.import "Importera">
+<!ENTITY https-everywhere.options.imported "Dina inställningar har importerats.">
<!ENTITY https-everywhere.prefs.title "Inställningar för HTTPS Everywhere">
<!ENTITY https-everywhere.prefs.enable_all "Aktivera alla">
<!ENTITY https-everywhere.prefs.disable_all "Inaktivera alla">
-<!ENTITY https-everywhere.prefs.export_settings "Export Settings">
-<!ENTITY https-everywhere.prefs.settings_warning "Warning:">
-<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!">
-<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:">
-<!ENTITY https-everywhere.prefs.settings_global "Global preferences">
-<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting">
-<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules">
-<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'">
-<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section.">
+<!ENTITY https-everywhere.prefs.export_settings "Exportera inställningar">
+<!ENTITY https-everywhere.prefs.settings_warning "Varning:">
+<!ENTITY https-everywhere.prefs.settings_warning_delete "Några av dina inställningar för HTTPS Everywhere håller på att tas bort!">
+<!ENTITY https-everywhere.prefs.settings_warning_explain "Denna utökning kommer att uppgraderas väsentligt inom en snar framtid. Om du inte exporterar dina inställningar kan du förlora ett eller flera av följande:">
+<!ENTITY https-everywhere.prefs.settings_global "Globala inställningar">
+<!ENTITY https-everywhere.prefs.settings_toggle "Inställning per sida på/av">
+<!ENTITY https-everywhere.prefs.settings_custom "Anpassade webbplatsregler">
+<!ENTITY https-everywhere.prefs.settings_click_ok "Klicka på "OK"">
+<!ENTITY https-everywhere.prefs.settings_warning_closing "nedan för att se till att dina inställningar sparas. När HTTPS Everywhere har uppgraderats måste du senare importera dessa inställningar i avsnittet för utökningsalternativ.">
<!ENTITY https-everywhere.prefs.reset_defaults "Återställ till standardvärden">
<!ENTITY https-everywhere.prefs.search "Sök">
<!ENTITY https-everywhere.prefs.site "Webbplats">
@@ -62,7 +62,7 @@
<!ENTITY https-everywhere.chrome.host "Värd:">
<!ENTITY https-everywhere.chrome.show_advanced "Visa avancerad">
<!ENTITY https-everywhere.chrome.hide_advanced "Göm avancerad">
-<!ENTITY https-everywhere.chrome.rule_name "Regel namn">
+<!ENTITY https-everywhere.chrome.rule_name "Regelnamn">
<!ENTITY https-everywhere.chrome.regex "Matchar regex">
<!ENTITY https-everywhere.chrome.redirect_to "Omdirigera till">
<!ENTITY https-everywhere.chrome.status_cancel_button "Avbryt">
1
0