tor-commits
Threads by month
- ----- 2025 -----
- 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
November 2018
- 19 participants
- 2292 discussions
commit 8d43e5810c8a9c72bd05bcda0b16d633696c7f7b
Author: Damian Johnson <atagar(a)torproject.org>
Date: Tue Nov 27 18:53:14 2018 -0800
Deprecate the DescriptorReader class
Does anyone use this? Written in response to a request from Karsten when I
first began stem I've never heard of someone actually using it. To simplify,
lets drop it.
---
stem/descriptor/reader.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py
index 9889751b..ca087ec6 100644
--- a/stem/descriptor/reader.py
+++ b/stem/descriptor/reader.py
@@ -75,6 +75,11 @@ and picks up where it left off if run again...
|- UnrecognizedType - File extension indicates non-descriptor data
+- ReadFailed - Wraps an error that was raised while reading the file
+- FileMissing - File does not exist
+
+.. deprecated:: 1.8.0
+
+ This module will likely be removed in Stem 2.0 due to lack of usage. If you
+ use this modle please `let me know <https://www.atagar.com/contact/>`_.
"""
import mimetypes
1
0
commit afbfb424c1a9a89cc7d798f21e7364e0d786e9f7
Author: Damian Johnson <atagar(a)torproject.org>
Date: Wed Nov 28 17:08:07 2018 -0800
DORMANT and ACTIVE signals
Stem support for a couple new signals. Sounds like a neat capability!
https://gitweb.torproject.org/torspec.git/commit/?id=4421149
---
docs/change_log.rst | 1 +
stem/__init__.py | 6 ++++++
stem/version.py | 2 ++
3 files changed, 9 insertions(+)
diff --git a/docs/change_log.rst b/docs/change_log.rst
index 675464ae..42485c09 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -48,6 +48,7 @@ The following are only available within Stem's `git repository
* **Controller**
* Controller events could fail to be delivered in a timely fashion (:trac:`27173`)
+ * **DORMANT** and **ACTIVE** :data:`~stem.Signal` (:spec:`4421149`)
* **Descriptors**
diff --git a/stem/__init__.py b/stem/__init__.py
index 771266fb..57ce93a4 100644
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@ -49,6 +49,10 @@ Library for working with the tor process.
.. versionchanged:: 1.3.0
Added the HEARTBEAT signal.
+ .. versionchanged:: 1.8.0
+ Added the ACTIVE and DORMANT signals. You can check for Tor support for
+ these signals with the **DORMANT_MODE** :data:`~stem.version.Requirement`
+
========================= ===========
Signal Description
========================= ===========
@@ -60,6 +64,8 @@ Library for working with the tor process.
**NEWNYM** switch to new circuits, so new application requests don't share any circuits with old ones (this also clears our DNS cache)
**CLEARDNSCACHE** clears cached DNS results
**HEARTBEAT** trigger a heartbeat log message
+ **DORMANT** enables *dormant mode*, during which tor will avoid cpu and network usage
+ **ACTIVE** disables *dormant mode*
========================= ===========
.. data:: Flag (enum)
diff --git a/stem/version.py b/stem/version.py
index 979bcf95..01a95249 100644
--- a/stem/version.py
+++ b/stem/version.py
@@ -36,6 +36,7 @@ easily parsed and compared, for instance...
===================================== ===========
**AUTH_SAFECOOKIE** SAFECOOKIE authentication method
**DESCRIPTOR_COMPRESSION** `Expanded compression support for ZSTD and LZMA <https://gitweb.torproject.org/torspec.git/commit/?id=1cb56afdc1e55e303e3e6b…>`_
+ **DORMANT_MODE** **DORMANT** and **ACTIVE** :data:`~stem.Signal`
**DROPGUARDS** DROPGUARDS requests
**EVENT_AUTHDIR_NEWDESCS** AUTHDIR_NEWDESC events
**EVENT_BUILDTIMEOUT_SET** BUILDTIMEOUT_SET events
@@ -351,6 +352,7 @@ safecookie_req.greater_than(Version('0.2.3.13'))
Requirement = stem.util.enum.Enum(
('AUTH_SAFECOOKIE', safecookie_req),
('DESCRIPTOR_COMPRESSION', Version('0.3.1.1-alpha')),
+ ('DORMANT_MODE', Version('0.4.0.1-alpha')),
('DROPGUARDS', Version('0.2.5.1-alpha')),
('EVENT_AUTHDIR_NEWDESCS', Version('0.1.1.10-alpha')),
('EVENT_BUILDTIMEOUT_SET', Version('0.2.2.7-alpha')),
1
0

[stem/master] Move comparison and hashing to base Descriptor class
by atagar@torproject.org 29 Nov '18
by atagar@torproject.org 29 Nov '18
29 Nov '18
commit 1c2f851dd20ae16a5b00f340f8f369566b58e860
Author: Damian Johnson <atagar(a)torproject.org>
Date: Tue Nov 27 18:42:19 2018 -0800
Move comparison and hashing to base Descriptor class
Huh. Not sure why I added these to subclasses rather than their common parent.
Maybe there's a reason that will make me regret this, but certainly seems to
work.
---
stem/descriptor/__init__.py | 25 ++++++++++
stem/descriptor/microdescriptor.py | 21 ---------
stem/descriptor/networkstatus.py | 84 ----------------------------------
stem/descriptor/router_status_entry.py | 84 ----------------------------------
stem/descriptor/server_descriptor.py | 42 -----------------
5 files changed, 25 insertions(+), 231 deletions(-)
diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index 1b38783c..5f153f81 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -699,6 +699,7 @@ class Descriptor(object):
self._raw_contents = contents
self._lazy_loading = lazy_load
self._entries = {}
+ self._hash = None
self._unrecognized_lines = []
@classmethod
@@ -1040,6 +1041,30 @@ class Descriptor(object):
else:
return self._raw_contents
+ def _compare(self, other, method):
+ if type(self) != type(other):
+ return False
+
+ return method(str(self).strip(), str(other).strip())
+
+ def __hash__(self):
+ if self._hash is None:
+ self._hash = hash(str(self).strip())
+
+ return self._hash
+
+ def __eq__(self, other):
+ return self._compare(other, lambda s, o: s == o)
+
+ def __ne__(self, other):
+ return not self == other
+
+ def __lt__(self, other):
+ return self._compare(other, lambda s, o: s < o)
+
+ def __le__(self, other):
+ return self._compare(other, lambda s, o: s <= o)
+
class NewlineNormalizer(object):
"""
diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py
index 8672f039..78b2b532 100644
--- a/stem/descriptor/microdescriptor.py
+++ b/stem/descriptor/microdescriptor.py
@@ -364,24 +364,3 @@ class Microdescriptor(Descriptor):
def _name(self, is_plural = False):
return 'microdescriptors' if is_plural else 'microdescriptor'
-
- def _compare(self, other, method):
- if not isinstance(other, Microdescriptor):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py
index baba556c..8cf07f03 100644
--- a/stem/descriptor/networkstatus.py
+++ b/stem/descriptor/networkstatus.py
@@ -1294,12 +1294,6 @@ class NetworkStatusDocumentV3(NetworkStatusDocument):
else:
return False # malformed document
- def _compare(self, other, method):
- if not isinstance(other, NetworkStatusDocumentV3):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
def _header(self, document_file, validate):
content = bytes.join(b'', _read_until_keywords((AUTH_START, ROUTERS_START, FOOTER_START), document_file))
entries = _descriptor_components(content, validate)
@@ -1384,21 +1378,6 @@ class NetworkStatusDocumentV3(NetworkStatusDocument):
if value < minimum or value > maximum:
raise ValueError("'%s' value on the params line must be in the range of %i - %i, was %i" % (key, minimum, maximum, value))
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
def _check_for_missing_and_disallowed_fields(document, entries, fields):
"""
@@ -1691,27 +1670,6 @@ class DirectoryAuthority(Descriptor):
self.fingerprint = self.v3ident
- def _compare(self, other, method):
- if not isinstance(other, DirectoryAuthority):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
def _parse_dir_address_line(descriptor, entries):
# "dir-address" IPPort
@@ -1828,27 +1786,6 @@ class KeyCertificate(Descriptor):
else:
self._entries = entries
- def _compare(self, other, method):
- if not isinstance(other, KeyCertificate):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
class DocumentSignature(object):
"""
@@ -2007,27 +1944,6 @@ class DetachedSignature(Descriptor):
else:
self._entries = entries
- def _compare(self, other, method):
- if not isinstance(other, DetachedSignature):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
class BridgeNetworkStatusDocument(NetworkStatusDocument):
"""
diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py
index b3334620..45385135 100644
--- a/stem/descriptor/router_status_entry.py
+++ b/stem/descriptor/router_status_entry.py
@@ -503,27 +503,6 @@ class RouterStatusEntry(Descriptor):
return ()
- def _compare(self, other, method):
- if not isinstance(other, RouterStatusEntry):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
class RouterStatusEntryV2(RouterStatusEntry):
"""
@@ -558,27 +537,6 @@ class RouterStatusEntryV2(RouterStatusEntry):
def _single_fields(self):
return ('r', 's', 'v')
- def _compare(self, other, method):
- if not isinstance(other, RouterStatusEntryV2):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
class RouterStatusEntryV3(RouterStatusEntry):
"""
@@ -661,27 +619,6 @@ class RouterStatusEntryV3(RouterStatusEntry):
def _single_fields(self):
return ('r', 's', 'v', 'w', 'p', 'pr')
- def _compare(self, other, method):
- if not isinstance(other, RouterStatusEntryV3):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
class RouterStatusEntryMicroV3(RouterStatusEntry):
"""
@@ -753,24 +690,3 @@ class RouterStatusEntryMicroV3(RouterStatusEntry):
def _single_fields(self):
return ('r', 's', 'v', 'w', 'm', 'pr')
-
- def _compare(self, other, method):
- if not isinstance(other, RouterStatusEntryMicroV3):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py
index 568af108..89b80d0a 100644
--- a/stem/descriptor/server_descriptor.py
+++ b/stem/descriptor/server_descriptor.py
@@ -985,12 +985,6 @@ class RelayDescriptor(ServerDescriptor):
data = signing_key_digest + base64.b64decode(stem.util.str_tools._to_bytes(self.ed25519_master_key) + b'=')
return stem.util.str_tools._to_unicode(binascii.hexlify(data).upper())
- def _compare(self, other, method):
- if not isinstance(other, RelayDescriptor):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
def _check_constraints(self, entries):
super(RelayDescriptor, self)._check_constraints(entries)
@@ -1000,21 +994,6 @@ class RelayDescriptor(ServerDescriptor):
elif not self.ed25519_signature:
raise ValueError("Descriptor must have a 'router-sig-ed25519' when identity-ed25519 is present")
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
-
class BridgeDescriptor(ServerDescriptor):
"""
@@ -1131,24 +1110,3 @@ class BridgeDescriptor(ServerDescriptor):
def _last_keyword(self):
return None
-
- def _compare(self, other, method):
- if not isinstance(other, BridgeDescriptor):
- return False
-
- return method(str(self).strip(), str(other).strip())
-
- def __hash__(self):
- return hash(str(self).strip())
-
- def __eq__(self, other):
- return self._compare(other, lambda s, o: s == o)
-
- def __ne__(self, other):
- return not self == other
-
- def __lt__(self, other):
- return self._compare(other, lambda s, o: s < o)
-
- def __le__(self, other):
- return self._compare(other, lambda s, o: s <= o)
1
0
commit 3a3dc1797bf5c9975ed2a35acf3c6c82c8ee39d5
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Nov 28 21:43:57 2018 +0000
Translations updatte
---
src/chrome/locale/cs/network-settings.dtd | 2 +-
src/chrome/locale/da/torlauncher.properties | 8 +--
src/chrome/locale/el/network-settings.dtd | 16 +++---
src/chrome/locale/es/torlauncher.properties | 2 +-
src/chrome/locale/fa/torlauncher.properties | 22 ++++-----
src/chrome/locale/gu/torlauncher.properties | 2 +-
src/chrome/locale/hr-HR/network-settings.dtd | 36 +++++++-------
src/chrome/locale/hr/network-settings.dtd | 74 ++++++++++++++--------------
src/chrome/locale/hr/torlauncher.properties | 14 +++---
src/chrome/locale/ja/network-settings.dtd | 4 +-
src/chrome/locale/ka/network-settings.dtd | 2 +-
src/chrome/locale/ka/torlauncher.properties | 4 +-
src/chrome/locale/mk/network-settings.dtd | 38 +++++++-------
src/chrome/locale/mk/torlauncher.properties | 58 +++++++++++-----------
src/chrome/locale/nl/network-settings.dtd | 2 +-
src/chrome/locale/nl/torlauncher.properties | 2 +-
src/chrome/locale/pl/network-settings.dtd | 34 ++++++-------
src/chrome/locale/pl/torlauncher.properties | 28 +++++------
src/chrome/locale/sv/network-settings.dtd | 4 +-
src/chrome/locale/sv/torlauncher.properties | 4 +-
src/chrome/locale/ur/network-settings.dtd | 2 +-
src/chrome/locale/ur/torlauncher.properties | 6 +--
22 files changed, 182 insertions(+), 182 deletions(-)
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index 53fc3a1..1e76823 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Zkopírovat protokol Toru do schránky">
<!ENTITY torsettings.proxyHelpTitle "Nápověda k proxy">
-<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být potřeba lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě.">
+<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být vyžadována lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě.">
<!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních uzlech">
<!ENTITY torsettings.bridgeHelp1 "Mosty jsou neveřejné uzly, které znesnadňují blokování sítě Tor.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru.">
diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties
index a036c91..c959ed1 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -6,10 +6,10 @@ torlauncher.error_title=Tor starter
torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller hardwarefejl. Tor Browser vil ikke starte, før du løser det underliggende problem og genstarter Tor.
torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor Browser vil ikke være i stand til at forbinde til noget som helst websted før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter.
torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af at du genstarter Tor.
-torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten.
+torlauncher.tor_controlconn_failed=Kunne ikke oprette forbindelse til Tor kontrol-porten.
torlauncher.tor_failed_to_start=Tor kunne ikke starte.
torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor.
-torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor-netværket
+torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere en forbindelse til Tor-netværket.
torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S).
torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S
@@ -18,8 +18,8 @@ torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes.
torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke dannes.
torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode.
-torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S
-torlauncher.failed_to_save_settings=Kunne ikke gemme Tor indstillingerne.⏎\n⏎\n%S
+torlauncher.failed_to_get_settings=Kan ikke hente Tor-indstillingerne..\n\n%S
+torlauncher.failed_to_save_settings=Kan ikke gemme Tor-indstillingerne.\n\n%S
torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører.
torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at konfigurere Tor til at bruge en proxy som forbindelse til internettet.
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index eacb515..a5b525b 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -9,7 +9,7 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor">
+<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor.">
<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει το Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης.">
<!ENTITY torSettings.configure "Ρύθμιση ">
<!ENTITY torSettings.connect "Σύνδεση">
@@ -39,14 +39,14 @@
<!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος">
<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:">
<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου">
-<!ENTITY torsettings.useBridges.default "Επιλέξτε μία ενταγμένη γέφυρα">
-<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε μία γέφυρα">
-<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε μίας γέφυρας από το torproject.org">
+<!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενταγμένο bridge">
+<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε ένα bridge">
+<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε ενός bridge από το torproject.org">
<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Πληκτρολογήστε τους χαρακτήρες της εικόνας">
<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Πάρτε μία νέα πρόκληση.">
<!ENTITY torsettings.useBridges.captchaSubmit "Υποβολή">
-<!ENTITY torsettings.useBridges.custom "Δώστε μου μία γέφυρα που να την γνωρίζω">
-<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες γέφυρας από έγκυρη πηγή">
+<!ENTITY torsettings.useBridges.custom "Δώστε μου ένα bridge που να το γνωρίζω">
+<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες bridge από έγκυρη πηγή.">
<!ENTITY torsettings.useBridges.placeholder "πληκτρολογήστε διεύθυνση:πύλη (μία σε κάθε σειρά)">
<!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο">
@@ -55,8 +55,8 @@
<!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουρος αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου συστήματος. ">
<!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια">
-<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποιες γέφυρες λειτουργούν σε κάποιες χώρες, ενώ άλλες όχι.  Αν δεν είστε σίγουρος για το ποιες γέφυρες λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelp1 "Τα bridges είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor.">
+<!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποια bridges λειτουργούν σε κάποιες χώρες, ενώ σε άλλες όχι.  Αν δεν είστε σίγουρος για το ποια bridges λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργούμε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά.">
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index 365318a..31ffb6a 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -25,7 +25,7 @@ torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejec
torlauncher.error_proxy_addr_missing=Tiene que especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet.
torlauncher.error_proxy_type_missing=Debe seleccionar el tipo de 'proxy'.
torlauncher.error_bridges_missing=Debe especificar uno o más puentes ('bridges').
-torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados.
+torlauncher.error_default_bridges_type_missing=Debes seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados.
torlauncher.error_bridgedb_bridges_missing=Por favor solicita un puente.
torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor puente proporcionado que tenga el tipo de transporte %S. Por favor ajuste sus preferencias.
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index 533c491..169d5e2 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پ
torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید.
torlauncher.error_bridges_missing=شما باید یک یا پل های بیشتری را مشخص کنید.
torlauncher.error_default_bridges_type_missing=نوع انتقال باید برای پلها مشخص گردد.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=لطفا یک پل درخواست کنید.
torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجود نیست. لطفا تنظیمات را اصلاح کنید.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(در چین کار میکند)
+torlauncher.bridge_suffix.meek-azure=(در چین کار میکند)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
+torlauncher.request_a_bridge=درخواست یک پل...
+torlauncher.request_a_new_bridge=درخواست یک پل جدید...
torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
+torlauncher.captcha_prompt=برای درخواست یک پل کپچا را حل کنید.
+torlauncher.bad_captcha_solution=راه حل درست نیست. لطفا دوباره تلاش کنید.
torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.no_bridges_available=متاسفم. در حال حاضر هیچ کدام از پلها در دسترس نیستند.
torlauncher.connect=اتصال
torlauncher.restart_tor=تور را ریستارت کنید.
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان
torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن
torlauncher.bootstrapWarning.pt_missing=انتقال جایگزین مفقود است.
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با کارساز از دست رفت.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=اتصال به کارساز امکان پذیر نمیباشد.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=اتصال به پروکسی امکان پذیر نمیباشد.
diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties
index 0f0bdee..f6bc2fe 100644
--- a/src/chrome/locale/gu/torlauncher.properties
+++ b/src/chrome/locale/gu/torlauncher.properties
@@ -44,7 +44,7 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Connect
torlauncher.restart_tor=Restart Tor
torlauncher.quit=Quit
-torlauncher.quit_win=Exit
+torlauncher.quit_win=બહાર નીકળો
torlauncher.done=થઈ ગયું
torlauncher.forAssistance=For assistance, contact %S
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 2c0ffd8..e4dc474 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Postavke Tor mreže">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
+<!ENTITY torsettings.wizard.title.default "Poveži se na Tor">
<!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera">
@@ -9,8 +9,8 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
+<!ENTITY torSettings.connectPrompt "Kliknite "Spoji" kako biste se spojili na Tor.">
+<!ENTITY torSettings.configurePrompt "Kliknite "Podesi" kako biste promijenili postavke mreže ako ste u državi koja cenzurira Tor (kao Egipat, Kina, Turska) ili ako se spajate preko privatne mreže za koju je potreban proxy.">
<!ENTITY torSettings.configure "Podesi">
<!ENTITY torSettings.connect "Spoji">
@@ -25,9 +25,9 @@
<!ENTITY torsettings.optional "Opcionalno">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na Internet">
<!ENTITY torsettings.useProxy.type "Tip proxya:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxya">
<!ENTITY torsettings.useProxy.address "Adresa:">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname">
<!ENTITY torsettings.useProxy.port "Port:">
@@ -38,21 +38,21 @@
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove">
<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
-<!ENTITY torsettings.useBridges.captchaSubmit "Predaj">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
+<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj državi">
+<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most">
+<!ENTITY torsettings.useBridges.default.placeholder "odaberite most">
+<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobij novi izazov">
+<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji">
+<!ENTITY torsettings.useBridges.custom "Pruži mi most koji poznajem">
+<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu iz povjerenog izvora">
+<!ENTITY torsettings.useBridges.placeholder "vrsta adresa:port (jedan po liniji)">
<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik">
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxyem">
+<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema.">
<!ENTITY torsettings.bridgeHelpTitle "Pomoć za releje mostove">
<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index 1c89cc2..6783163 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -1,60 +1,60 @@
-<!ENTITY torsettings.dialog.title "Postavke Tor Mreže">
+<!ENTITY torsettings.dialog.title "Postavke Tor mreže">
<!ENTITY torsettings.wizard.title.default "Spoji se na Tor">
-<!ENTITY torsettings.wizard.title.configure "Postavke Tor Mreže">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže">
+<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">
<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Jezik Tor preglednika">
+<!ENTITY torlauncher.localePicker.prompt "Odaberite jezik">
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
-<!ENTITY torSettings.configure "Konfiguriraj">
+<!ENTITY torSettings.connectPrompt "Za povezivanje s Tor-om kliknite "Poveži se"">
+<!ENTITY torSettings.configurePrompt "Ako ste u zemlji koja cenzurira Tor (kao Egipat, Kina, Turska) ili ste spojeni preko privatne mreže za koju je potrebno proxy, kliknite "Podesi" kako biste promijenili postavke mreže.">
+<!ENTITY torSettings.configure "Podesi">
<!ENTITY torSettings.connect "Poveži se">
<!-- Other: -->
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.startingTor "Čekanje na pokretanje Tor-a…">
+<!ENTITY torsettings.restartTor "Ponovno pokreni Tor">
+<!ENTITY torsettings.reconfigTor "Ponovno podesi">
<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.proceed "Obriši postavke i poveži se">
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "Neobavezno">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet">
+<!ENTITY torsettings.useProxy.type "Tip proxy-a:">
+<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a">
<!ENTITY torsettings.useProxy.address "Adresa:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Priključak:">
+<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili poslužitelj">
+<!ENTITY torsettings.useProxy.port "Port:">
<!ENTITY torsettings.useProxy.username "Korisničko ime:">
<!ENTITY torsettings.useProxy.password "Lozinka:">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
-<!ENTITY torsettings.useBridges.captchaSubmit "Unesi">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
-
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
-
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
+<!ENTITY torsettings.firewall.checkbox "Ovo raučunalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova.">
+<!ENTITY torsettings.firewall.allowedPorts "Dopušteni portovi:">
+<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji">
+<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most">
+<!ENTITY torsettings.useBridges.default.placeholder "odaberite most">
+<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobijte novi izazov">
+<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji">
+<!ENTITY torsettings.useBridges.custom "Pružaj mi most koji poznajem">
+<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu sa pouzdanog izvora.">
+<!ENTITY torsettings.useBridges.placeholder "tip adresa:port (jedna po retku)">
+
+<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik">
+
+<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxy-em">
+<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema.">
+
+<!ENTITY torsettings.bridgeHelpTitle "Pomoć s mostovima">
<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties
index c6143af..1424083 100644
--- a/src/chrome/locale/hr/torlauncher.properties
+++ b/src/chrome/locale/hr/torlauncher.properties
@@ -3,12 +3,12 @@
torlauncher.error_title=Tor Launcher
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_control_failed=Failed to take control of Tor.
+torlauncher.tor_exited_during_startup=Tor je prekinut tijekom pokretanja. Ovo može biti zbog pogreške u vašoj torrc datoteci, pogreške u Tor-u ili u drugom programu na vašem sistemu, ili zbog neispravnog hardvera. Dok ne riješite temeljni problem i ponovno pokrenete Tor, Tor preglednik se neće pokrenuti.
+torlauncher.tor_exited=Tor je neočekivano prekinut. To može biti zbog greške u samom Tor-u, drugom programu na vašem sistemu ili zbog neispravnog hardvera. Dok ponovno ne pokrenete Tor, Tor preglednik neće moči pristupiti web stranicama. Ako se problem nastavi, pošaljite kopiju vašeg Tor zapisnika timu za podršku.
+torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti vaše kartice preglednika.
+torlauncher.tor_controlconn_failed=Povezivanje na kontrolni port Tor-a nije uspjelo.
+torlauncher.tor_failed_to_start=Pokretanje Tor-a nije uspjelo.
+torlauncher.tor_control_failed=Uzimanje kontrole nad Tor-om nije uspjelo
torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -42,7 +42,7 @@ torlauncher.no_meek=This browser is not configured for meek, which is needed to
torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Poveži se
-torlauncher.restart_tor=Restart Tor
+torlauncher.restart_tor=Ponovno pokreni Tor
torlauncher.quit=Izlaz
torlauncher.quit_win=Izlaz
torlauncher.done=Gotovo
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 4a51455..25d2d09 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -11,7 +11,7 @@
<!ENTITY torSettings.connectPrompt "「接続」をクリックすると Tor に接続します。">
<!ENTITY torSettings.configurePrompt "Tor による通信を検閲する国(エジプト、中国、トルコ等)にいる場合やプロキシを要求するプライベートネットワークから接続する場合、「設定」をクリックしてネットワーク設定を調整します。">
-<!ENTITY torSettings.configure "構成">
+<!ENTITY torSettings.configure "設定">
<!ENTITY torSettings.connect "接続">
<!-- Other: -->
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー">
<!ENTITY torsettings.proxyHelpTitle "プロキシヘルプ">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "会社、学校、大学等のネットワークを通して接続する場合、ローカルプロクシが必要になる場合があります。 プロクシが必要であるかどうかわからない場合は、他のブラウザのインターネット設定を見るか、システムのネットワーク設定を確認してください。">
<!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ">
<!ENTITY torsettings.bridgeHelp1 "ブリッジとはTorネットワークへの接続をブロックすることを難しくするためのリストされていないリレーです。  それぞれの種類のブリッジは検閲を避けるための異なる手法を利用しています。  obfsのものはあなたのトラフィックをランダムなノイズのように見せかけ,meekのものはあなたのトラフィックをTorではなくそのサービスへの接続であるように見せかけます。">
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index 72017f1..e1b18ac 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -49,7 +49,7 @@
<!ENTITY torsettings.useBridges.label "გადამცემი ხიდის მონაცემების მითითება სანდო წყაროდან.">
<!ENTITY torsettings.useBridges.placeholder "აკრიფეთ მისამართი:პორტი (თითო ცალკე ხაზზე)">
-<!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების დაკოპირება">
+<!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების ასლი">
<!ENTITY torsettings.proxyHelpTitle "პროქსი — დახმარება">
<!ENTITY torsettings.proxyHelp1 "ადგილობრივი პროქსი მაშინაა საჭირო, როცა ინტერნეტს უკავშირდებით კომპანიის, სკოლის ან უნივერსიტეტის ქსელის გავლით. თუ დარწმუნებული არ ხართ პროქსის საჭიროებაში, გადახედეთ ინტერნეტის პარამეტრებს სხვა ბრაუზერში ან იხილეთ სისტემის ქსელის პარამეტრები.">
diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties
index 48a7acf..457c46f 100644
--- a/src/chrome/locale/ka/torlauncher.properties
+++ b/src/chrome/locale/ka/torlauncher.properties
@@ -50,7 +50,7 @@ torlauncher.done=შესრულებულია
torlauncher.forAssistance=დახმარებისთვის დაუკავშირდით %S
torlauncher.forAssistance2=დახმარებისთვის ეწვიეთ %S
-torlauncher.copiedNLogMessages=დაკოპირება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად.
+torlauncher.copiedNLogMessages=ასლის აღება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად.
torlauncher.bootstrapStatus.conn_dir=გადამცემთა ცნობართან დაკავშირება
torlauncher.bootstrapStatus.handshake_dir=დაშიფრული კავშირის დამყარება ცნობართან
@@ -68,7 +68,7 @@ torlauncher.bootstrapWarning.connectrefused=კავშირი უარყ
torlauncher.bootstrapWarning.misc=სხვადასხვა
torlauncher.bootstrapWarning.resourcelimit=არასაკმარისი რესურსები
torlauncher.bootstrapWarning.identity=მოწმობა არ ემთხვევა
-torlauncher.bootstrapWarning.timeout=კავშირის ვადა
+torlauncher.bootstrapWarning.timeout=კავშირის დაყოვნება
torlauncher.bootstrapWarning.noroute=მისამართი არაა აღნიშნული
torlauncher.bootstrapWarning.ioerror=წაკითხვა/ჩაწერის შეცდომა
torlauncher.bootstrapWarning.pt_missing=მისაერთებელი გადამყვანი ვერ მოიძებნა
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index 6885070..7a258c5 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Tor мрежни поставки">
<!ENTITY torsettings.wizard.title.default "Поврзи се на Tor">
<!ENTITY torsettings.wizard.title.configure "Tor мрежни поставки">
-<!ENTITY torsettings.wizard.title.connecting "Воспоставување на конекција">
+<!ENTITY torsettings.wizard.title.connecting "Воспоставување на поврзување">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Tor Browser јазик">
@@ -9,19 +9,19 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Кликнете "Конектирај" да се конектирате на Tor.">
-<!ENTITY torSettings.configurePrompt "Кликни на "Постави" да ги поставите мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси.">
-<!ENTITY torSettings.configure "Постави">
-<!ENTITY torSettings.connect "Конектирај">
+<!ENTITY torSettings.connectPrompt "Кликнете "Поврзи" да се поврзете на Tor.">
+<!ENTITY torSettings.configurePrompt "Кликни на "Конфигурирај" да ги конфигурирате мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси.">
+<!ENTITY torSettings.configure "Конфигурирај">
+<!ENTITY torSettings.connect "Поврзи">
<!-- Other: -->
<!ENTITY torsettings.startingTor "Почекај за стартување на Tor...">
-<!ENTITY torsettings.restartTor "Повторно стартување на Tor">
-<!ENTITY torsettings.reconfigTor "Промени поставки">
+<!ENTITY torsettings.restartTor "Рестартирај го Tor">
+<!ENTITY torsettings.reconfigTor "Пре-конфигурирај">
-<!ENTITY torsettings.discardSettings.prompt "Имате поставено Tor мостови или имате внесено локални прокси поставки.  Директно да се поврзете на Tor мрежата, овие поставки мораат да бидат избришани.">
-<!ENTITY torsettings.discardSettings.proceed "Избриши ги поставките и конектирај се">
+<!ENTITY torsettings.discardSettings.prompt "Имате конфигурирано Tor мостови или имате внесено локални прокси поставки.  За директно да се поврзете на Tor мрежата, овие поставки мораат да бидат избришани.">
+<!ENTITY torsettings.discardSettings.proceed "Избриши ги поставките и поврзи се">
<!ENTITY torsettings.optional "Опционално">
@@ -36,15 +36,15 @@
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува конекции до одредени порти">
+<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува поврзувања до одредени порти">
<!ENTITY torsettings.firewall.allowedPorts "Дозволени порти:">
<!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран во мојата држава">
<!ENTITY torsettings.useBridges.default "Одбери вграден мост">
<!ENTITY torsettings.useBridges.default.placeholder "одбери мост">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
-<!ENTITY torsettings.useBridges.captchaSubmit "Submit">
+<!ENTITY torsettings.useBridges.bridgeDB "Барање за мост од torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Внесете ги карактерите од сликата">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Пробајте нов предизвик">
+<!ENTITY torsettings.useBridges.captchaSubmit "Испрати">
<!ENTITY torsettings.useBridges.custom "Обезбеди мост кој го знам">
<!ENTITY torsettings.useBridges.label "Внесете информации за мост од доверлив извор.">
<!ENTITY torsettings.useBridges.placeholder "внеси адреса:порта (по една во секој ред)">
@@ -52,11 +52,11 @@
<!ENTITY torsettings.copyLog "Копирај го Tor логот за залепување">
<!ENTITY torsettings.proxyHelpTitle "Прокси помош">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Може да ви биде потребно локално прокси кога се поврзувате преку мрежа на компанија, училиште, или универзитет. Ако не сте сигурни дали е потребно прокси, погледнете во Интернет поставки во друг прелистувач или проверете ги мрежните поставки на системот.">
-<!ENTITY torsettings.bridgeHelpTitle "Мост јазол помош">
-<!ENTITY torsettings.bridgeHelp1 "Мостовите се неизлистани јазли кои го прават потешко блокирањето на врските кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, како да е од некој стандарден прелистувач наместо од Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Поради колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelpTitle "Помош за мост реле">
+<!ENTITY torsettings.bridgeHelp1 "Мостовите се неизлистани релеа кои го прават потешко блокирањето на поврзувањата кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, како да е од некој стандарден прелистувач наместо од Tor.">
+<!ENTITY torsettings.bridgeHelp2 "Поради тоа колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support">
<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави конекција со Тор мрежата.  Ова може да потрае неколку минути.">
+<!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави поврзувањето со Тор мрежата.  Ова може да потрае неколку минути.">
diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties
index 8b065d3..8dfecbb 100644
--- a/src/chrome/locale/mk/torlauncher.properties
+++ b/src/chrome/locale/mk/torlauncher.properties
@@ -3,13 +3,13 @@
torlauncher.error_title=Tor стартувач
-torlauncher.tor_exited_during_startup=Tor се исклучи за време на вклучувањето. Ова може да е поради грашка во вашата torrc датотека, грешка во Tor или друга програма во вашиот систем, или проблем со хардеверот. Додека не го поправите проблемот кој го предизвикува ова, и повторно не го вклучите Tor, Tor Browser нема да се стартува.
-torlauncher.tor_exited=Tor неочекувано се исклучи. Ова може да е до грешка во самиот Tor, друга програма во системот, или проблем со хардверот. Додека повторно го стартувате Tor, Tor Browser нема да може да ја отвори било која веб страна. Ако проблемот остане, ве молиме испратете копија од вашиот Tor лог на тимот за поддршка.
-torlauncher.tor_exited2=Повротното старување на Tor нема да ви ги затвори табовите во вашиот прелистувач.
-torlauncher.tor_controlconn_failed=Не може да се конектира на Tor контролната порта.
+torlauncher.tor_exited_during_startup=Tor се исклучи за време на вклучувањето. Ова може да е поради грашка во вашата torrc датотека, грешка во Tor или друга програма во вашиот систем, или проблем со хардеверот. Додека не го поправите проблемот кој го предизвикува ова, и не го рестартирате Tor, Tor Browser нема да се стартува.
+torlauncher.tor_exited=Tor неочекувано се исклучи. Ова може да е до грешка во самиот Tor, друга програма во системот, или проблем со хардверот. Додека не го рестартирате Tor, Tor Browser нема да може да ја отвори било која веб страна. Ако проблемот остане, ве молиме испратете копија од вашиот Tor лог на тимот за поддршка.
+torlauncher.tor_exited2=Рестартирањето на Tor нема да ви ги затвори табовите во вашиот прелистувач.
+torlauncher.tor_controlconn_failed=Не може да се поврзе на Tor контролната порта.
torlauncher.tor_failed_to_start=Tor не успеа да се стартува.
torlauncher.tor_control_failed=Не успеа да преземе контрола врз Tor.
-torlauncher.tor_bootstrap_failed=Tor не успеа да воспостави конекција со Tor мрежата.
+torlauncher.tor_bootstrap_failed=Tor не успеа да воспостави поврзување со Tor мрежата.
torlauncher.tor_bootstrap_failed_details=%1$S не успеаа (%2$S).
torlauncher.unable_to_start_tor=Не може да се стартува Tor.\n\n%S
@@ -22,27 +22,27 @@ torlauncher.failed_to_get_settings=Невозможно е да се добиј
torlauncher.failed_to_save_settings=Невозможно е да се зачуваат Tor поставките.\n\n%S
torlauncher.ensure_tor_is_running=Проверете дали Tor е вклучен.
-torlauncher.error_proxy_addr_missing=Мора да ги посочите и IP адресите или хостовите и бројот на портата за да го поставите Tor да користи прокси за пристап на Интернет.
+torlauncher.error_proxy_addr_missing=Мора да ги посочите и IP адресите или хостовите и бројот на портата за да го конфигурирате Tor да користи прокси за пристап на Интернет.
torlauncher.error_proxy_type_missing=Морате да одберете тип на прокси.
torlauncher.error_bridges_missing=Морате да одберете еден или повеќе мостови.
torlauncher.error_default_bridges_type_missing=Мора да одберете тип на транспорт за обезбедените мостови.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Ве молиме побарајте мост.
torlauncher.error_bridge_bad_default_type=Нема обезбедени мостови кои го имаат типот на транспорт %S а се достапни. Прилагодете ги вашите поставки.
torlauncher.bridge_suffix.meek-amazon=(работи во Кина)
torlauncher.bridge_suffix.meek-azure=(работи во Кина)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=Барање за мост...
+torlauncher.request_a_new_bridge=Барање за нов мост...
+torlauncher.contacting_bridgedb=Контактирање со BridgeDB. Ве молиме почекајте.
+torlauncher.captcha_prompt=Решете ја ЗАДАЧАТА за да побарате мост.
+torlauncher.bad_captcha_solution=Решението е погрешно. Ве молиме обидете се повторно.
+torlauncher.unable_to_get_bridge=Не е во можност добивањето на мост од BridgeDB.\n\n%S
+torlauncher.no_meek=Овој прелистувач не е конфигуриран за meek, кој е потребен за добивање на мостови.
+torlauncher.no_bridges_available=Нема достапни мостови во овој момент. Извинете.
-torlauncher.connect=Конектирај
-torlauncher.restart_tor=Повторно стартување на Tor
+torlauncher.connect=Поврзи
+torlauncher.restart_tor= Повторно стартување на Tor
torlauncher.quit=Прекини
torlauncher.quit_win=Излез
torlauncher.done=Завршено
@@ -52,27 +52,27 @@ torlauncher.forAssistance2=За помош, посетете %S
torlauncher.copiedNLogMessages=Копирањето е завршено. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта.
-torlauncher.bootstrapStatus.conn_dir=Конектирање на јазол директориум
-torlauncher.bootstrapStatus.handshake_dir=Воспоставување енкриптирана конекција со директориумот
+torlauncher.bootstrapStatus.conn_dir=Поврзување на реле директориум
+torlauncher.bootstrapStatus.handshake_dir=Воспоставување енкриптирано поврзување со директориумот
torlauncher.bootstrapStatus.requesting_status=Добивање на мрежен статус
torlauncher.bootstrapStatus.loading_status=Вчитување на мрежен статус
-torlauncher.bootstrapStatus.loading_keys=Вчитување на авторитетски сертификати
-torlauncher.bootstrapStatus.requesting_descriptors=Барање на информации за јазол
-torlauncher.bootstrapStatus.loading_descriptors=Вчитување на информации за јазол
-torlauncher.bootstrapStatus.conn_or=Конектирање на Tor мрежата
+torlauncher.bootstrapStatus.loading_keys=Вчитување на авторитетни сертификати
+torlauncher.bootstrapStatus.requesting_descriptors=Барање на информации за реле
+torlauncher.bootstrapStatus.loading_descriptors=Вчитување на информации за реле
+torlauncher.bootstrapStatus.conn_or=Поврзување на Tor мрежата
torlauncher.bootstrapStatus.handshake_or=Воспоставување на Tor круг
-torlauncher.bootstrapStatus.done=Конектирани сте на Tor мрежата!
+torlauncher.bootstrapStatus.done=Поврзани сте на Tor мрежата!
torlauncher.bootstrapWarning.done=завршено
-torlauncher.bootstrapWarning.connectrefused=конекцијата е одбиена
+torlauncher.bootstrapWarning.connectrefused=поврзувањето е одбиено
torlauncher.bootstrapWarning.misc=разно
torlauncher.bootstrapWarning.resourcelimit=недоволни ресурси
torlauncher.bootstrapWarning.identity=идентитетско несогласување
-torlauncher.bootstrapWarning.timeout=времето за конекција истече
+torlauncher.bootstrapWarning.timeout=времето за поврзување истече
torlauncher.bootstrapWarning.noroute=нема рута до хост
torlauncher.bootstrapWarning.ioerror=грешка при читање/запишување
torlauncher.bootstrapWarning.pt_missing=недостасува pluggable transport
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=Поврзувањето со серверот беше изгубено.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не може да се поврзе со серверот.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не може да се поврзе со проксито.
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index e8aa4eb..4dabeb6 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Kopieer Tor-log naar het klembord">
<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Een lokale proxy kan nodig zijn als u verbinding maakt via het netwerk van een bedrijf, school, of universiteit. Als u niet zeker weet of een proxy nodig is, kijk dan naar de internetinstellingen in een andere browser of kijk naar de netwerkinstellingen van het systeem.">
<!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp">
<!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet vermelde relays die het moeilijk maken om verbindingen naar het Tor Network te blokkeren.  Elk van deze bridges gebruikt een andere methode om censuur te vermijden.  Degene die obfs gebruiken, zien eruit gelijk willekeurige ruis, en de andere laten uw netwerk verkeer eruit zien alsof u verbind met een andere service in plaats van met Tor.">
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index 3807906..48557bb 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -38,7 +38,7 @@ torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik.
torlauncher.captcha_prompt=Los de CAPTCHA op om een brug te verzoeken.
torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw.
torlauncher.unable_to_get_bridge=Kan geen brug verkrijgen van BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
+torlauncher.no_meek=Deze browser is niet geconfigureerd voor meek, wat nodig is om bridges te verkrijgen.
torlauncher.no_bridges_available=Geen bruggen zijn beschikbaar op dit moment. Sorry.
torlauncher.connect=Verbind
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index a45fc68..76131f7 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Ustawienia Sieci">
<!ENTITY torsettings.wizard.title.default "Połącz z siecią Tor">
<!ENTITY torsettings.wizard.title.configure "Ustawienia Sieci">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.connecting "Nawiązanie połączenia">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Język przeglądarki Tor.">
@@ -9,8 +9,8 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
+<!ENTITY torSettings.connectPrompt "Kliknij "Połącz", aby połączyć się z Torem.">
+<!ENTITY torSettings.configurePrompt "Kliknij "Konfiguruj", aby dostosować ustawienia sieci, jeśli jesteś w kraju, który cenzuruje Tora (np. Egipt, Chiny, Turcja) lub jeśli łączysz się z prywatną siecią, która wymaga serwera proxy.">
<!ENTITY torSettings.configure "Konfiguruj">
<!ENTITY torSettings.connect "Połącz">
@@ -25,9 +25,9 @@
<!ENTITY torsettings.optional "(opcjonalnie)">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Używam proxy do łączenia się z Internetem">
<!ENTITY torsettings.useProxy.type "Typ Proxy:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy">
<!ENTITY torsettings.useProxy.address "Adres:">
<!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP">
<!ENTITY torsettings.useProxy.port "Port:">
@@ -39,24 +39,24 @@
<!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami">
<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:">
<!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
+<!ENTITY torsettings.useBridges.default "Wybierz wbudowany most">
+<!ENTITY torsettings.useBridges.default.placeholder "wybierz most">
+<!ENTITY torsettings.useBridges.bridgeDB "Zażądaj mostu od torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Wprowadź znaki z obrazka">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Uzyskaj nowe wyzwanie">
<!ENTITY torsettings.useBridges.captchaSubmit "Podsumowując">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
+<!ENTITY torsettings.useBridges.custom "Dostarcz mostek, który znam">
+<!ENTITY torsettings.useBridges.label "Wprowadź informacje o mostku z zaufanego źródła.">
+<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port (po jednym w linii)">
<!ENTITY torsettings.copyLog "Skopiuj log do schowka">
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelpTitle "Pomoc Proxy">
+<!ENTITY torsettings.proxyHelp1 "Lokalny serwer proxy może być potrzebny podczas łączenia się przez sieć firmową, szkolną lub uniwersytecką. Jeśli nie masz pewności, czy serwer proxy jest potrzebny, sprawdź ustawienia internetowe w innej przeglądarce lub sprawdź ustawienia sieciowe systemu.">
<!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych">
-<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelp1 "Mosty są zastrzeżonymi przekaźnikami, które utrudniają blokowanie połączeń z siecią Tor. Każdy rodzaj mostu wykorzystuje inną metodę unikania cenzury.  Obiekty obfs sprawiają, że twój ruch wygląda jak losowy szum, a łagodne połączenia sprawiają, że twój ruch wygląda jakbyś łączył się z tą usługą zamiast z Torem.">
+<!ENTITY torsettings.bridgeHelp2 "Ze względu na to, jak niektóre kraje próbują blokować Tora, niektóre mosty działają w niektórych krajach, ale nie w innych.  Jeśli nie masz pewności, które mosty działają w Twoim kraju, odwiedź torproject.org/about/contact.html#support">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut.">
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 356947b..32b912a 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Musisz określić adres IP lub nazwę hosta
torlauncher.error_proxy_type_missing=Musisz wybrać typ proxy.
torlauncher.error_bridges_missing=Musisz podać jeden lub więcej mostów. (bridges)
torlauncher.error_default_bridges_type_missing=Musisz wybrać rodzaj transportu dla dostępnych mostów.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Proszę poprosić o most.
torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które mają typ transportu %S. Proszę zmienić swoje ustawienia.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(działa w Chinach)
+torlauncher.bridge_suffix.meek-azure=(działa w Chinach)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=Poproś o most...
+torlauncher.request_a_new_bridge=Poproś o nowy most...
+torlauncher.contacting_bridgedb=Kontakt z BridgeDB. Proszę czekać.
+torlauncher.captcha_prompt=Rozwiąż CAPTCHA, aby poprosić o most.
+torlauncher.bad_captcha_solution=Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie.
+torlauncher.unable_to_get_bridge=Nie można uzyskać mostu z BridgeDB.\n\n%S
+torlauncher.no_meek=Ta przeglądarka nie jest skonfigurowana dla połączeń, które są potrzebne do uzyskania mostów.
+torlauncher.no_bridges_available=W tej chwili nie są dostępne żadne mosty. Przepraszam.
torlauncher.connect=Połącz
torlauncher.restart_tor=Zrestartuj Tora
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=brak trasy do hosta
torlauncher.bootstrapWarning.ioerror=błąd zapisu/odczytu
torlauncher.bootstrapWarning.pt_missing=brak podłączanego transportu
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=Połączenie z serwerem zostało utracone.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nie można połączyć się z serwerem.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Nie można połączyć się z serwerem proxy.
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index 8e67127..47473df 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -4,7 +4,7 @@
<!ENTITY torsettings.wizard.title.connecting "Etablerar en anslutning">
<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Språk i Tor-webbläsare">
+<!ENTITY torlauncher.localePicker.title "Språk i Tor Browser">
<!ENTITY torlauncher.localePicker.prompt "Välj ett språk.">
<!-- For "first run" wizard: -->
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet">
<!ENTITY torsettings.proxyHelpTitle "Proxy hjälp">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "En lokal proxy kan behövas när du ansluter via ett företag, skola eller universitetsnätverk. Om du inte är säker på om en proxy behövs, titta på internetinställningarna i en annan webbläsare eller kontrollera systemets nätverksinställningar.">
<!ENTITY torsettings.bridgeHelpTitle "Hjälp om relä bryggor">
<!ENTITY torsettings.bridgeHelp1 "Bryggor är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av brygga använder sig av olika metoder för att undvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor.">
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 92800d7..406dfb9 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -3,8 +3,8 @@
torlauncher.error_title=Tor Launcher
-torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, en bugg i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har fixat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta.
-torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support.
+torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, ett fel i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har åtgärdat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta.
+torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support.
torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina flikar i webbläsaren.
torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport.
torlauncher.tor_failed_to_start=Det gick inte att starta Tor.
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index debbd66..eeb35c3 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -23,7 +23,7 @@
<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "اختیاری">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
<!ENTITY torsettings.useProxy.type "Proxy Type:">
diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties
index a4d097a..caf020b 100644
--- a/src/chrome/locale/ur/torlauncher.properties
+++ b/src/chrome/locale/ur/torlauncher.properties
@@ -43,9 +43,9 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Connect
torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
+torlauncher.quit=چھوڑدیجیے (Quit)
torlauncher.quit_win=Exit
-torlauncher.done=Done
+torlauncher.done=مکمل ہوگیا
torlauncher.forAssistance=For assistance, contact %S
torlauncher.forAssistance2=For assistance, visit %S
@@ -59,7 +59,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
+torlauncher.bootstrapStatus.conn_or=ٹار نیٹ ورکس سے رابطہ بنائیں
torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
1
0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation@torproject.org 28 Nov '18
by translation@torproject.org 28 Nov '18
28 Nov '18
commit 84103275b1f4d10b70ad76f5c10ac16b068c5ccd
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Nov 28 19:45:20 2018 +0000
Update translations for donatepages-messagespot
---
locale/fr/LC_MESSAGES/messages.po | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 22954a8b6..69456ed6d 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -583,18 +583,18 @@ msgid ""
"privacy-enhancing browser for mobile devices and making it easier for third-"
"party developers to integrate Tor into their applications."
msgstr ""
-"Avec votre soutien et les généreux fonds de contrepartie de Mozilla, nous "
-"serons en mesure de nous attaquer à des projets ambitieux, tels que le "
-"développement d’un navigateur plus sécurisé et plus respectueux de la vie "
-"privée pour les appareils mobiles et de faciliter l’intégration de Tor par "
-"des développeurs tiers dans leurs applications."
+"Grâce à votre soutien et aux sommes généreusement versées par Mozilla pour "
+"égaler vos dons, nous pourrons nous attaquer à des projets ambitieux tels "
+"que le développement d’un navigateur pour appareils mobiles plus sûr et qui "
+"renforce la confidentialité, et l’intégration plus facile par les "
+"développeurs tiers de Tor dans leurs applications."
#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:56
msgid ""
"It's an incredible time to stand up for world-leading security and privacy "
"software."
msgstr ""
-"C’est un moment incroyable pour défendre les logiciels de sécurité et de "
+"C’est le parfait moment pour soutenir des logiciels de sécurité et de "
"protection de la vie privée de classe mondiale."
#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:58
1
0

[translation/tails-misc] Update translations for tails-misc
by translation@torproject.org 28 Nov '18
by translation@torproject.org 28 Nov '18
28 Nov '18
commit 19d9f2e53d2fd68a48c3e5ae079cd8711ffba77a
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Nov 28 19:16:01 2018 +0000
Update translations for tails-misc
---
ko.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ko.po b/ko.po
index 95a2c186f..9ec9f9f3b 100644
--- a/ko.po
+++ b/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-31 16:04+0100\n"
-"PO-Revision-Date: 2018-11-15 17:07+0000\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-11-28 18:50+0000\n"
+"Last-Translator: Philipp Sauter <qt123(a)pm.me>\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"
@@ -732,7 +732,7 @@ msgstr ""
#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
msgid "Additional Software"
-msgstr ""
+msgstr "추가 소프트웨어"
#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
msgid ""
1
0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation@torproject.org 28 Nov '18
by translation@torproject.org 28 Nov '18
28 Nov '18
commit 6c3817791b698ca54972e4b214750fd782b889bd
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Nov 28 19:15:20 2018 +0000
Update translations for donatepages-messagespot
---
locale/fr/LC_MESSAGES/messages.po | 44 +++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 6ac1429db..22954a8b6 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -392,7 +392,7 @@ msgstr ""
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316
msgid "how do you want to <span class=\"green\">DONATE</span>?"
-msgstr "comment voulez-vous <span class=\"green\">FAIRE UN DON</span>?"
+msgstr "comment souhaitez-vous <span class=\"green\">FAIRE UN DON</span> ?"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:322
msgid "Credit Card"
@@ -400,7 +400,7 @@ msgstr "Carte de crédit"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:338
msgid "Your Info"
-msgstr "Votre Info"
+msgstr "Vos renseignements"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:342
msgid "* required fields"
@@ -432,11 +432,11 @@ msgstr "État"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380
msgid "Zip"
-msgstr "POSTCODE"
+msgstr "Code postal/ZIP"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:386
msgid "Enter email"
-msgstr "Saisir l’adresse courriel"
+msgstr "Saisissez votre adresse courriel"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:390
msgid "We‘ll email you your receipt"
@@ -444,11 +444,11 @@ msgstr "Nous vous enverrons votre reçu par courriel"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:397
msgid "Start sending me email updates about the Tor Project!"
-msgstr "Commencez à m’envoyer des mises à jour par email sur le projet Tor !"
+msgstr "Commencez à m’envoyer des nouvelles sur le projet Tor par courriel !"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:404
msgid "Card Number"
-msgstr "Numéro de carte"
+msgstr "Numéro de la carte"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:411
msgid "MM"
@@ -456,11 +456,11 @@ msgstr "MM"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:415
msgid "YY"
-msgstr "YY"
+msgstr "AA"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:419
msgid "CVC"
-msgstr "CVC"
+msgstr "Code de sécurité"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:427
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:472
@@ -480,7 +480,7 @@ msgstr "Commentaires"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:462
msgid "Donate"
-msgstr "Faites un don"
+msgstr "Envoyer le don"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:476
msgid "T-Shirt"
@@ -512,45 +512,47 @@ msgstr "Chandail en coton molletonné"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:500
msgid "A required field is missing from the form."
-msgstr "Il manque un champ obligatoire dans le formulaire."
+msgstr "Un champ obligatoire du formulaire n’est pas renseigné."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:502
msgid "Please reload the page and try again."
-msgstr "Veuillez recharger la page et réessayer."
+msgstr "Veuillez recharger la page et essayer de nouveau."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:506
msgid "There was a problem submitting your request to the server:<br>"
-msgstr "Il y a eu un problème pour soumettre votre demande au serveur :<br>"
+msgstr ""
+"Un problème est survenu lors de l’envoi de votre demande au serveur :<br>"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:510
msgid "validation failed"
-msgstr "validation échouée"
+msgstr "échec de validation"
#. notes: __field_name__ will be replaced with the field name in the
#. javascript.
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:516
msgid "__field_name__ must be filled out."
-msgstr "__field_name__ doit être rempli."
+msgstr "__field_name__ doit être renseigné."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:521
msgid "This field is required"
-msgstr "Ce champ est exigé"
+msgstr "Ce champ est obligatoire"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:525
msgid "Invalid email address."
-msgstr "Adresse e-mail invalide."
+msgstr "L’adresse courriel est invalide."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:538
msgid "One moment while we shovel coal into our servers."
-msgstr "Un moment pendant qu’on pellete du charbon dans nos serveurs."
+msgstr "Un moment pendant qu’on alimente nos serveurs en charbon."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:625
msgid ""
"Stand up for the universal human rights to privacy and freedom and help keep"
" Tor independent, robust, and secure."
msgstr ""
-"Défendez les droits universels de l’homme à la vie privée et à la liberté et"
-" aidez Tor à rester indépendant, robuste et sécurisé."
+"Défendez les droits universels de la personne à la vie privée et à la "
+"liberté, et contribuez à assurer l’indépendance, la robustesse et la "
+"sécurité de Tor."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:627
msgid "Mozilla will match your gift and double your impact."
@@ -566,7 +568,9 @@ msgstr "Merci !"
#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:48
msgid "Thank you for supporting Tor's Strength in Numbers campaign."
-msgstr "Merci de soutenir la campagne de Tor Strength in Numbers."
+msgstr ""
+"Nous vous remercions de soutenir la campagne « L’union fait la force » de "
+"Tor."
#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:50
msgid "You should receive an email receipt shortly."
1
0

[translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
by translation@torproject.org 28 Nov '18
by translation@torproject.org 28 Nov '18
28 Nov '18
commit c872cf29080a9c84410d64554c581595c256182f
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Nov 28 18:47:05 2018 +0000
Update translations for tba-torbrowserstringsdtd_completed
---
fr/android_strings.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fr/android_strings.dtd b/fr/android_strings.dtd
index 0a5c438fb..1359211a1 100644
--- a/fr/android_strings.dtd
+++ b/fr/android_strings.dtd
@@ -22,4 +22,4 @@
<!ENTITY firstrun_onionservices_tab_title "Onions">
<!ENTITY firstrun_onionservices_title "Les services onion.">
<!ENTITY firstrun_onionservices_message "Les services onion sont des sites qui se terminent par .onion Ils offrent des protections accrues aux diffuseurs et aux visiteurs, y compris des mesures de protection contre la censure. Les services onion permettent à tous de proposer anonymement du contenu et des services.">
-<!ENTITY firstrun_onionservices_next "Aller à explorer">
+<!ENTITY firstrun_onionservices_next "Aller explorer">
1
0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation@torproject.org 28 Nov '18
by translation@torproject.org 28 Nov '18
28 Nov '18
commit 101934ebe00ce30f114e892c58e35ffd70d9eae4
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Nov 28 18:47:01 2018 +0000
Update translations for tba-torbrowserstringsdtd
---
fr/android_strings.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fr/android_strings.dtd b/fr/android_strings.dtd
index 0a5c438fb..1359211a1 100644
--- a/fr/android_strings.dtd
+++ b/fr/android_strings.dtd
@@ -22,4 +22,4 @@
<!ENTITY firstrun_onionservices_tab_title "Onions">
<!ENTITY firstrun_onionservices_title "Les services onion.">
<!ENTITY firstrun_onionservices_message "Les services onion sont des sites qui se terminent par .onion Ils offrent des protections accrues aux diffuseurs et aux visiteurs, y compris des mesures de protection contre la censure. Les services onion permettent à tous de proposer anonymement du contenu et des services.">
-<!ENTITY firstrun_onionservices_next "Aller à explorer">
+<!ENTITY firstrun_onionservices_next "Aller explorer">
1
0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation@torproject.org 28 Nov '18
by translation@torproject.org 28 Nov '18
28 Nov '18
commit c34e1778707dce0cb7d1147a2655d17150ed2733
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Nov 28 18:46:48 2018 +0000
Update translations for tails-persistence-setup
---
ko/ko.po | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/ko/ko.po b/ko/ko.po
index 54390ddb2..23c9c4e42 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -7,14 +7,15 @@
# Chris Park <utopinator(a)gmail.com>, 2016
# snotree <cknblue(a)gmail.com>, 2017
# Dr.what <javrick6(a)naver.com>, 2014
+# Philipp Sauter <qt123(a)pm.me>, 2018
# Revi_, 2015
msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n"
"POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2018-11-15 17:07+0000\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2018-11-28 18:42+0000\n"
+"Last-Translator: Philipp Sauter <qt123(a)pm.me>\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"
@@ -113,7 +114,7 @@ msgstr "영속적 디텍토리에 보관된 파일 유지"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:71
msgid "Browser Bookmarks"
-msgstr ""
+msgstr "즐겨찾기"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:73
msgid "Bookmarks saved in the Tor Browser"
@@ -129,7 +130,7 @@ msgstr "네트워크 장치와 연결 설정"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:101
msgid "Additional Software"
-msgstr ""
+msgstr "추가 소프트웨어"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:103
msgid "Software installed when starting Tails"
@@ -161,7 +162,7 @@ msgstr "GnuPG 키 목록 설정"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:166
msgid "Bitcoin Client"
-msgstr ""
+msgstr "비트코인 클라이언트"
#: ../lib/Tails/Persistence/Configuration/Presets.pm:168
msgid "Electrum's bitcoin wallet and configuration"
1
0