January 2016 - tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit 659c1097eeed77eda9286897223e5418608a7ff5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 08:45:36 2016 +0000 Update translations for tor-launcher-progress --- zh_CN/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/progress.dtd b/zh_CN/progress.dtd index 5b3873e..838d88e 100644 --- a/zh_CN/progress.dtd +++ b/zh_CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "请等待我们建立到 Tor 网络的连接。这可能会需要几分钟。">

1 0

[torbutton/master] Bug 16990: Code cleanup
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 53299a96c848d806d490e3b7068d81be352d7620 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jan 6 13:48:27 2016 -0800 Bug 16990: Code cleanup --- src/chrome/content/tor-circuit-display.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index d5ef3d3..c99d25d 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -141,7 +141,7 @@ let collectIsolationData = function (aController, updateUI) { knownCircuitIDs[streamEvent.CircuitID] = true; let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), credentials = circuitStatus ? - (trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + + (trimQuotes(circuitStatus.SOCKS_USERNAME) + "|" + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : null; if (credentials) { @@ -235,7 +235,7 @@ let getSOCKSCredentialsForBrowser = function (browser) { if (!(channel instanceof Ci.nsIProxiedChannel)) return null; let proxyInfo = channel.proxyInfo; if (proxyInfo === null) return null; - return proxyInfo.username + ":" + proxyInfo.password; + return [proxyInfo.username, proxyInfo.password]; }; // __onionSiteRelayLine__. @@ -251,11 +251,12 @@ let updateCircuitDisplay = function () { let credentials = getSOCKSCredentialsForBrowser(selectedBrowser), nodeData = null; if (credentials) { - // Check if we have anything to show for these credentials. - nodeData = credentialsToNodeDataMap[credentials]; + let [SOCKS_username, SOCKS_password] = credentials; + // Check if we have anything to show for these credentials. + nodeData = credentialsToNodeDataMap[SOCKS_username + "|" + SOCKS_password]; if (nodeData) { // Update the displayed domain. - let domain = credentials.split(":")[0]; + let domain = SOCKS_username; document.getElementById("domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. let lines = nodeLines(nodeData), @@ -310,8 +311,9 @@ let syncDisplayWithSelectedTab = (function() { // ## Main function -// setupDisplay(host, port, password, enablePrefName)__. -// Returns a function that lets you start/stop automatic display of the Tor circuit. +// __setupDisplay(host, port, password, enablePrefName)__. +// Once called, the Tor circuit display will be started whenever +// the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (host, port, password, enablePrefName) { let myController = null,

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit adaee9e0648a3b471913f9fc60026fe999c69862 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 08:17:10 2016 +0000 Update translations for tor-launcher-progress_completed --- en/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/progress.dtd b/en/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/en/progress.dtd +++ b/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit ce07163c38d37ac9470bed2e26ff65e6bc77e9e6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 08:16:54 2016 +0000 Update translations for tor-launcher-progress --- ach/progress.dtd | 2 +- ady/progress.dtd | 2 +- af/progress.dtd | 2 +- ak/progress.dtd | 2 +- am/progress.dtd | 2 +- am_ET/progress.dtd | 2 +- ar/progress.dtd | 2 +- ar_AA/progress.dtd | 2 +- arn/progress.dtd | 2 +- ast/progress.dtd | 2 +- az/progress.dtd | 2 +- ba/progress.dtd | 2 +- bal/progress.dtd | 2 +- be/progress.dtd | 2 +- bg/progress.dtd | 2 +- bn/progress.dtd | 2 +- bn_BD/progress.dtd | 2 +- bn_IN/progress.dtd | 2 +- bo/progress.dtd | 2 +- br/progress.dtd | 2 +- brx/progress.dtd | 2 +- bs/progress.dtd | 2 +- ca/progress.dtd | 2 +- ceb/progress.dtd | 2 +- co/progress.dtd | 2 +- cs/progress.dtd | 2 +- cs_CZ/progress.dtd | 2 +- csb/progress.dtd | 2 +- cv/progress.dtd | 2 +- cy/progress.dtd | 2 +- cy_GB/progress.dtd | 2 +- da/progress.dtd | 2 +- da_DK/progress.dtd | 2 +- de/progress.dtd | 2 +- dz/progress.dtd | 2 +- el/progress.dtd | 2 +- en/progress.dtd | 2 +- en_GB/progress.dtd | 2 +- eo/progress.dtd | 2 +- es/progress.dtd | 2 +- es_AR/progress.dtd | 2 +- es_CL/progress.dtd | 2 +- es_CO/progress.dtd | 2 +- es_MX/progress.dtd | 2 +- et/progress.dtd | 2 +- eu/progress.dtd | 2 +- fa/progress.dtd | 2 +- fi/progress.dtd | 2 +- fil/progress.dtd | 2 +- fo/progress.dtd | 2 +- fr/progress.dtd | 2 +- fr_CA/progress.dtd | 2 +- fur/progress.dtd | 2 +- fy/progress.dtd | 2 +- ga/progress.dtd | 2 +- gd/progress.dtd | 2 +- gl/progress.dtd | 2 +- gu/progress.dtd | 2 +- gu_IN/progress.dtd | 2 +- gun/progress.dtd | 2 +- ha/progress.dtd | 2 +- he/progress.dtd | 2 +- hi/progress.dtd | 2 +- hr/progress.dtd | 2 +- hr_HR/progress.dtd | 2 +- ht/progress.dtd | 2 +- hu/progress.dtd | 2 +- hy/progress.dtd | 2 +- hy_AM/progress.dtd | 2 +- ia/progress.dtd | 2 +- id/progress.dtd | 2 +- is/progress.dtd | 2 +- it/progress.dtd | 2 +- ja/progress.dtd | 2 +- jbo/progress.dtd | 2 +- jv/progress.dtd | 2 +- ka/progress.dtd | 2 +- kk/progress.dtd | 2 +- km/progress.dtd | 2 +- kn/progress.dtd | 2 +- ko/progress.dtd | 2 +- ko_KR/progress.dtd | 2 +- ku/progress.dtd | 2 +- ku_IQ/progress.dtd | 2 +- kw/progress.dtd | 2 +- ky/progress.dtd | 2 +- la/progress.dtd | 2 +- lb/progress.dtd | 2 +- lg/progress.dtd | 2 +- ln/progress.dtd | 2 +- lo/progress.dtd | 2 +- lt/progress.dtd | 2 +- lv/progress.dtd | 2 +- mg/progress.dtd | 2 +- mi/progress.dtd | 2 +- mk/progress.dtd | 2 +- ml/progress.dtd | 2 +- mn/progress.dtd | 2 +- mr/progress.dtd | 2 +- ms_MY/progress.dtd | 2 +- mt/progress.dtd | 2 +- my/progress.dtd | 2 +- nah/progress.dtd | 2 +- nap/progress.dtd | 2 +- nb/progress.dtd | 2 +- nds/progress.dtd | 2 +- ne/progress.dtd | 2 +- nl/progress.dtd | 2 +- nl_BE/progress.dtd | 2 +- nn/progress.dtd | 2 +- nso/progress.dtd | 2 +- oc/progress.dtd | 2 +- or/progress.dtd | 2 +- pa/progress.dtd | 2 +- pap/progress.dtd | 2 +- pl/progress.dtd | 2 +- pms/progress.dtd | 2 +- ps/progress.dtd | 2 +- pt/progress.dtd | 2 +- pt_BR/progress.dtd | 2 +- ro/progress.dtd | 2 +- ru/progress.dtd | 2 +- ru(a)petr1708/progress.dtd | 2 +- sa/progress.dtd | 2 +- scn/progress.dtd | 2 +- sco/progress.dtd | 2 +- si/progress.dtd | 2 +- si_LK/progress.dtd | 2 +- sk/progress.dtd | 2 +- sk_SK/progress.dtd | 2 +- sl/progress.dtd | 2 +- sl_SI/progress.dtd | 2 +- sn/progress.dtd | 2 +- so/progress.dtd | 2 +- son/progress.dtd | 2 +- sq/progress.dtd | 2 +- sq_AL/progress.dtd | 2 +- sr/progress.dtd | 2 +- sr(a)latin/progress.dtd | 2 +- st/progress.dtd | 2 +- su/progress.dtd | 2 +- sv/progress.dtd | 2 +- sw/progress.dtd | 2 +- szl/progress.dtd | 2 +- ta/progress.dtd | 2 +- te/progress.dtd | 2 +- te_IN/progress.dtd | 2 +- tg/progress.dtd | 2 +- th/progress.dtd | 2 +- ti/progress.dtd | 2 +- tk/progress.dtd | 2 +- tl_PH/progress.dtd | 2 +- tr/progress.dtd | 2 +- ug(a)Arab/progress.dtd | 2 +- uk/progress.dtd | 2 +- ur/progress.dtd | 2 +- ur_PK/progress.dtd | 3 +-- uz/progress.dtd | 2 +- ve/progress.dtd | 2 +- vi/progress.dtd | 2 +- wa/progress.dtd | 2 +- wo/progress.dtd | 2 +- yo/progress.dtd | 2 +- zh_CN/progress.dtd | 2 +- zh_HK/progress.dtd | 2 +- zh_TW/progress.dtd | 2 +- zu/progress.dtd | 2 +- 167 files changed, 167 insertions(+), 168 deletions(-) diff --git a/ach/progress.dtd b/ach/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ach/progress.dtd +++ b/ach/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ady/progress.dtd b/ady/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ady/progress.dtd +++ b/ady/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/af/progress.dtd b/af/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/af/progress.dtd +++ b/af/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ak/progress.dtd b/ak/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ak/progress.dtd +++ b/ak/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/am/progress.dtd b/am/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/am/progress.dtd +++ b/am/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/am_ET/progress.dtd b/am_ET/progress.dtd index a38a578..8ce4f0e 100644 --- a/am_ET/progress.dtd +++ b/am_ET/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "የቶር ይዞታ"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ar/progress.dtd b/ar/progress.dtd index 6f4907d..ef4cfb9 100644 --- a/ar/progress.dtd +++ b/ar/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "حالة تور"> <!ENTITY torprogress.openSettings "افتح الإعدادات"> <!ENTITY torprogress.heading "جاري الاتصال بشبكة تور"> -<!ENTITY torprogress.pleaseWait "الرجاء الانتظار، يتم الان إنشاء اتصال بشبكة تور."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ar_AA/progress.dtd b/ar_AA/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ar_AA/progress.dtd +++ b/ar_AA/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/arn/progress.dtd b/arn/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/arn/progress.dtd +++ b/arn/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ast/progress.dtd b/ast/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ast/progress.dtd +++ b/ast/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/az/progress.dtd b/az/progress.dtd index 473b050..31e6b48 100644 --- a/az/progress.dtd +++ b/az/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Statusu"> <!ENTITY torprogress.openSettings "Parametrləri aç"> <!ENTITY torprogress.heading "Tor şəbəkəsinə qoşulur"> -<!ENTITY torprogress.pleaseWait "Zəhmət olmasa biz Tor şəbəkəsini quraşdiranadək gözləyin."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ba/progress.dtd b/ba/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ba/progress.dtd +++ b/ba/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/bal/progress.dtd b/bal/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/bal/progress.dtd +++ b/bal/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/be/progress.dtd b/be/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/be/progress.dtd +++ b/be/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/bg/progress.dtd b/bg/progress.dtd index 45a5ee3..1c89f2e 100644 --- a/bg/progress.dtd +++ b/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/bn/progress.dtd b/bn/progress.dtd index e324946..9819d83 100644 --- a/bn/progress.dtd +++ b/bn/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "টর অবস্থা"> <!ENTITY torprogress.openSettings "সেটিংস খুলুন"> <!ENTITY torprogress.heading "টর নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে"> -<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কের সাথে সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন।"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/bn_BD/progress.dtd b/bn_BD/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/bn_BD/progress.dtd +++ b/bn_BD/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/bn_IN/progress.dtd b/bn_IN/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/bn_IN/progress.dtd +++ b/bn_IN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/bo/progress.dtd b/bo/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/bo/progress.dtd +++ b/bo/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/br/progress.dtd b/br/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/br/progress.dtd +++ b/br/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/brx/progress.dtd b/brx/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/brx/progress.dtd +++ b/brx/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/bs/progress.dtd b/bs/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/bs/progress.dtd +++ b/bs/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ca/progress.dtd b/ca/progress.dtd index cb62f1b..331193c 100644 --- a/ca/progress.dtd +++ b/ca/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> -<!ENTITY torprogress.pleaseWait "Si us plau, espereu mentre establim una connexió a la xarxa Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ceb/progress.dtd b/ceb/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ceb/progress.dtd +++ b/ceb/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/co/progress.dtd b/co/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/co/progress.dtd +++ b/co/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/cs/progress.dtd b/cs/progress.dtd index c953214..e91a01f 100644 --- a/cs/progress.dtd +++ b/cs/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Stav"> <!ENTITY torprogress.openSettings "Otevřít nastavení"> <!ENTITY torprogress.heading "Připojuji se k síti Tor"> -<!ENTITY torprogress.pleaseWait "Prosím vyčkejte než bude sestaveno připojení k síti Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/cs_CZ/progress.dtd b/cs_CZ/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/cs_CZ/progress.dtd +++ b/cs_CZ/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/csb/progress.dtd b/csb/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/csb/progress.dtd +++ b/csb/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/cv/progress.dtd b/cv/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/cv/progress.dtd +++ b/cv/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/cy/progress.dtd b/cy/progress.dtd index 507d1c6..c4f29d7 100644 --- a/cy/progress.dtd +++ b/cy/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Statws Tor"> <!ENTITY torprogress.openSettings "Agor Gosodiadau"> <!ENTITY torprogress.heading "Yn cysylltu â rhwydwaith Tor"> -<!ENTITY torprogress.pleaseWait "Arhoswch tra ein bod yn cysylltu â rhwydwaith Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/cy_GB/progress.dtd b/cy_GB/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/cy_GB/progress.dtd +++ b/cy_GB/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/da/progress.dtd b/da/progress.dtd index 7e3f342..2a8a41a 100644 --- a/da/progress.dtd +++ b/da/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Åben Indstillinger"> <!ENTITY torprogress.heading "Forbinder til Tor netværket"> -<!ENTITY torprogress.pleaseWait "Vent venligst imens vi etablerer en forbindelse til Tor netværket."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/da_DK/progress.dtd b/da_DK/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/da_DK/progress.dtd +++ b/da_DK/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/de/progress.dtd b/de/progress.dtd index 9433d6f..d087f69 100644 --- a/de/progress.dtd +++ b/de/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-Status"> <!ENTITY torprogress.openSettings "Einstellungen öffnen"> <!ENTITY torprogress.heading "Verbindung mit dem Tor-Netzwerk wird hergestellt"> -<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/dz/progress.dtd b/dz/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/dz/progress.dtd +++ b/dz/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/el/progress.dtd b/el/progress.dtd index 70b8fc5..9f96b8d 100644 --- a/el/progress.dtd +++ b/el/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Κατάσταση του Tor "> <!ENTITY torprogress.openSettings "Ανοιγμα ρυθμισεων"> <!ENTITY torprogress.heading "Δημιουργια σύνδεσης στο δίκτυο Tor"> -<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε ενώ δημιουργούμε μια σύνδεση με το δίκτυο Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/en/progress.dtd b/en/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/en/progress.dtd +++ b/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/en_GB/progress.dtd b/en_GB/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/en_GB/progress.dtd +++ b/en_GB/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/eo/progress.dtd b/eo/progress.dtd index 9fc2f3b..c03f16a 100644 --- a/eo/progress.dtd +++ b/eo/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato de Tor"> <!ENTITY torprogress.openSettings "Malfermi agordojn"> <!ENTITY torprogress.heading "Konektante al Tor-reto"> -<!ENTITY torprogress.pleaseWait "Bonvolu atendi ĝis kiam ni ne starigos konekton al la Tor-reto."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/es/progress.dtd b/es/progress.dtd index 1d3683d..f6ec5e5 100644 --- a/es/progress.dtd +++ b/es/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Abrir Preferencias"> <!ENTITY torprogress.heading "Conectando con la red de Tor"> -<!ENTITY torprogress.pleaseWait "Espere mientras se establece una conexión con la red de Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/es_AR/progress.dtd b/es_AR/progress.dtd index 10a52dd..f8029aa 100644 --- a/es_AR/progress.dtd +++ b/es_AR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Abrir Configuraciones"> <!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/es_CL/progress.dtd b/es_CL/progress.dtd index 73f1bbf..87e2523 100644 --- a/es_CL/progress.dtd +++ b/es_CL/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado Del Modulo Tor"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Por favor espere mientras establecemos una conexión a la red Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/es_CO/progress.dtd b/es_CO/progress.dtd index a5ee7b4..f59998a 100644 --- a/es_CO/progress.dtd +++ b/es_CO/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Configuraciones abiertas"> <!ENTITY torprogress.heading "Conectando a la red de Tor"> -<!ENTITY torprogress.pleaseWait "Por favor espere mientras establecemos una coneccion a la red de Tor"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/es_MX/progress.dtd b/es_MX/progress.dtd index 614ad59..d1d6bb5 100644 --- a/es_MX/progress.dtd +++ b/es_MX/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Abrir Ajustes"> <!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Porfavor espere mientras establecemos una conexión con la red Tor"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/et/progress.dtd b/et/progress.dtd index 2d50f46..6b93dff 100644 --- a/et/progress.dtd +++ b/et/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tori staatus"> <!ENTITY torprogress.openSettings "Ava seaded"> <!ENTITY torprogress.heading "Tor võrgustikuga ühendumine"> -<!ENTITY torprogress.pleaseWait "Palun oota, kuna ühendus Tor võrgustikuga on saavutatud."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/eu/progress.dtd b/eu/progress.dtd index 3e9f084..caa9a98 100644 --- a/eu/progress.dtd +++ b/eu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor egoera"> <!ENTITY torprogress.openSettings "Ezarpenak ireki"> <!ENTITY torprogress.heading "Tor sarera konektatzen"> -<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor-sarera konexioa ezartzen dugun bitartean."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fa/progress.dtd b/fa/progress.dtd index 5f8eee1..5efcd93 100644 --- a/fa/progress.dtd +++ b/fa/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "وضعیت تور"> <!ENTITY torprogress.openSettings "تنظیمات‌را باز کنید"> <!ENTITY torprogress.heading "درحال اتصال به شبکه تُر"> -<!ENTITY torprogress.pleaseWait "لطفا برای اتصال به شبکه تور منتظر بمانید."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fi/progress.dtd b/fi/progress.dtd index 1ddad9b..5850aa9 100644 --- a/fi/progress.dtd +++ b/fi/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-tila"> <!ENTITY torprogress.openSettings "Avaa asetukset"> <!ENTITY torprogress.heading "Yhdistetään Tor-verkkoon"> -<!ENTITY torprogress.pleaseWait "Odota hetki yhteyden muodostamista Tor-verkkoon."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fil/progress.dtd b/fil/progress.dtd index 33bbaca..b8256ea 100644 --- a/fil/progress.dtd +++ b/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buksan ang Settings"> <!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor."> -<!ENTITY torprogress.pleaseWait "Pakihintay sandali habang tayo ay nakikipag-ugnayan sa kabalagan ng Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fo/progress.dtd b/fo/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/fo/progress.dtd +++ b/fo/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fr/progress.dtd b/fr/progress.dtd index d028d4c..157276d 100644 --- a/fr/progress.dtd +++ b/fr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor s'établit."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fr_CA/progress.dtd b/fr_CA/progress.dtd index 99c632e..157276d 100644 --- a/fr_CA/progress.dtd +++ b/fr_CA/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion avec le réseau Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fur/progress.dtd b/fur/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/fur/progress.dtd +++ b/fur/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/fy/progress.dtd b/fy/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/fy/progress.dtd +++ b/fy/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ga/progress.dtd b/ga/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ga/progress.dtd +++ b/ga/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/gd/progress.dtd b/gd/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/gd/progress.dtd +++ b/gd/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/gl/progress.dtd b/gl/progress.dtd index 8aee80a..84c3935 100644 --- a/gl/progress.dtd +++ b/gl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir axustes"> <!ENTITY torprogress.heading "Conexión á rede Tor"> -<!ENTITY torprogress.pleaseWait "Por faver, espera mentres estabelecemos a conexión coa rede Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/gu/progress.dtd b/gu/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/gu/progress.dtd +++ b/gu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/gu_IN/progress.dtd b/gu_IN/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/gu_IN/progress.dtd +++ b/gu_IN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/gun/progress.dtd b/gun/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/gun/progress.dtd +++ b/gun/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ha/progress.dtd b/ha/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ha/progress.dtd +++ b/ha/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/he/progress.dtd b/he/progress.dtd index 891697d..ee4943a 100644 --- a/he/progress.dtd +++ b/he/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "מצב Tor"> <!ENTITY torprogress.openSettings "פתח הגדרות"> <!ENTITY torprogress.heading "מתחבר כעת אל רשת Tor"> -<!ENTITY torprogress.pleaseWait "אנא המתן בעת שאנו מתחברים לרשת Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/hi/progress.dtd b/hi/progress.dtd index 87f2f41..14111f6 100644 --- a/hi/progress.dtd +++ b/hi/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "टोर स्थिति"> <!ENTITY torprogress.openSettings "व्यवस्था खोलें"> <!ENTITY torprogress.heading "टोर संजाल से जुड़ रहा है"> -<!ENTITY torprogress.pleaseWait "टोर संजाल से संचार स्थापित होने तक प्रतीक्षा करें।"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/hr/progress.dtd b/hr/progress.dtd index 9c3caaf..4bacee4 100644 --- a/hr/progress.dtd +++ b/hr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status Tor-a"> <!ENTITY torprogress.openSettings "Otvori Postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavimo konekciju sa Tor mrežom."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/hr_HR/progress.dtd b/hr_HR/progress.dtd index ea7118a..405b87e 100644 --- a/hr_HR/progress.dtd +++ b/hr_HR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Otvori Postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ht/progress.dtd b/ht/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ht/progress.dtd +++ b/ht/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/hu/progress.dtd b/hu/progress.dtd index b19344f..bdcab7a 100644 --- a/hu/progress.dtd +++ b/hu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor állapot"> <!ENTITY torprogress.openSettings "Beállítások megnyitása"> <!ENTITY torprogress.heading "Kapcsolódás a Tor hálózathoz"> -<!ENTITY torprogress.pleaseWait "Kérlek várj amíg a kapcsolat létrejön a Tor hálózattal."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/hy/progress.dtd b/hy/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/hy/progress.dtd +++ b/hy/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/hy_AM/progress.dtd b/hy_AM/progress.dtd index 3be7837..545668d 100644 --- a/hy_AM/progress.dtd +++ b/hy_AM/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-ի կարգավիճակը"> <!ENTITY torprogress.openSettings "Բացել Կարգավորումները"> <!ENTITY torprogress.heading "Միացում Tor ցանցին"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ia/progress.dtd b/ia/progress.dtd index 8d94c15..3f9c00f 100644 --- a/ia/progress.dtd +++ b/ia/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato de Tor"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/id/progress.dtd b/id/progress.dtd index 526e6e1..73f06b2 100644 --- a/id/progress.dtd +++ b/id/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status Tor "> <!ENTITY torprogress.openSettings "Buka Pengaturan"> <!ENTITY torprogress.heading "Menyambung ke jaringan Tor"> -<!ENTITY torprogress.pleaseWait "Mohon tunggu saat kami membangun koneksi ke jaringan Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/is/progress.dtd b/is/progress.dtd index 1541026..c6f500e 100644 --- a/is/progress.dtd +++ b/is/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Staða Tor"> <!ENTITY torprogress.openSettings "Opna stillingar"> <!ENTITY torprogress.heading "Tengist Tor-netinu"> -<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan komið er á tengingu við Tor-netið"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/it/progress.dtd b/it/progress.dtd index fcc4b08..ef30289 100644 --- a/it/progress.dtd +++ b/it/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato di Tor"> <!ENTITY torprogress.openSettings "Apertura impostazioni"> <!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Si prega di attendere: stiamo stabilendo una connessione alla rete Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ja/progress.dtd b/ja/progress.dtd index 9d03c6b..31c0943 100644 --- a/ja/progress.dtd +++ b/ja/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Torの状態"> <!ENTITY torprogress.openSettings "設定を開く"> <!ENTITY torprogress.heading "Torネットワークに接続しています"> -<!ENTITY torprogress.pleaseWait "Tor ネットワークへの接続を確立するまでの間お待ちください。"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/jbo/progress.dtd b/jbo/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/jbo/progress.dtd +++ b/jbo/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/jv/progress.dtd b/jv/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/jv/progress.dtd +++ b/jv/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ka/progress.dtd b/ka/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ka/progress.dtd +++ b/ka/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/kk/progress.dtd b/kk/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/kk/progress.dtd +++ b/kk/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/km/progress.dtd b/km/progress.dtd index b09663c..76d75ce 100644 --- a/km/progress.dtd +++ b/km/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "ស្ថានភាព Tor"> <!ENTITY torprogress.openSettings "បើកការកំណត់"> <!ENTITY torprogress.heading "ភ្ជាប់ទៅបណ្ដាញ Tor"> -<!ENTITY torprogress.pleaseWait "សូមរង់ចាំខណៈដែលយើងបង្កើតការភ្ជាប់ទៅបណ្ដាញ Tor ។"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/kn/progress.dtd b/kn/progress.dtd index 7b197ab..b6e3b70 100644 --- a/kn/progress.dtd +++ b/kn/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "ಟಾರ್‌ನ ಸ್ಥಿತಿ"> <!ENTITY torprogress.openSettings "ಅಪೂರ್ಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"> <!ENTITY torprogress.heading "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೋತಾ ಇದೀವಿ."> -<!ENTITY torprogress.pleaseWait "ನಾವು ಟಾರ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕವನ್ನು ಕಲ್ಪಿಸುತ್ತಿದ್ದೆವೆ. ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ko/progress.dtd b/ko/progress.dtd index bb931d0..7669c26 100644 --- a/ko/progress.dtd +++ b/ko/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 상태"> <!ENTITY torprogress.openSettings "시작 설정"> <!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait "Tor네트워크로 확실히 연결할 때까지 기다리세요."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ko_KR/progress.dtd b/ko_KR/progress.dtd index 896bd56..7c2da43 100644 --- a/ko_KR/progress.dtd +++ b/ko_KR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Tor 네트워크로 연결하고 있어요"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ku/progress.dtd b/ku/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ku/progress.dtd +++ b/ku/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ku_IQ/progress.dtd b/ku_IQ/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ku_IQ/progress.dtd +++ b/ku_IQ/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/kw/progress.dtd b/kw/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/kw/progress.dtd +++ b/kw/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ky/progress.dtd b/ky/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ky/progress.dtd +++ b/ky/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/la/progress.dtd b/la/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/la/progress.dtd +++ b/la/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/lb/progress.dtd b/lb/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/lb/progress.dtd +++ b/lb/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/lg/progress.dtd b/lg/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/lg/progress.dtd +++ b/lg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ln/progress.dtd b/ln/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ln/progress.dtd +++ b/ln/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/lo/progress.dtd b/lo/progress.dtd index f364bd9..fb3aeb4 100644 --- a/lo/progress.dtd +++ b/lo/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "ສະຖານະ Tor"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/lt/progress.dtd b/lt/progress.dtd index 326cfcf..a1b897d 100644 --- a/lt/progress.dtd +++ b/lt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor būsena"> <!ENTITY torprogress.openSettings "Atverti nustatymus"> <!ENTITY torprogress.heading "Jungiamasi prie Tor tinklo"> -<!ENTITY torprogress.pleaseWait "Prašome palaukti kol sujungsime su Tor tinklu."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/lv/progress.dtd b/lv/progress.dtd index 3924775..2e1be38 100644 --- a/lv/progress.dtd +++ b/lv/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor'a statuss"> <!ENTITY torprogress.openSettings "Atvērt iestatījumus"> <!ENTITY torprogress.heading "Veido savienojumu ar Tor'a tīklu"> -<!ENTITY torprogress.pleaseWait "Lūdzu, gaidiet, kamēr izveidojam savienojumu ar tīklu Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/mg/progress.dtd b/mg/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/mg/progress.dtd +++ b/mg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/mi/progress.dtd b/mi/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/mi/progress.dtd +++ b/mi/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/mk/progress.dtd b/mk/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/mk/progress.dtd +++ b/mk/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ml/progress.dtd b/ml/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ml/progress.dtd +++ b/ml/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/mn/progress.dtd b/mn/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/mn/progress.dtd +++ b/mn/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/mr/progress.dtd b/mr/progress.dtd index 9c675c1..e37501b 100644 --- a/mr/progress.dtd +++ b/mr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "टॉर स्थिती"> <!ENTITY torprogress.openSettings "सेटिंग्स उघडा"> <!ENTITY torprogress.heading "टॉर जाळ्याला जोडणी करणे चालू आहे"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ms_MY/progress.dtd b/ms_MY/progress.dtd index f24ab09..1735116 100644 --- a/ms_MY/progress.dtd +++ b/ms_MY/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buka tetapan."> <!ENTITY torprogress.heading "Menyambung ke rangkaian Tor."> -<!ENTITY torprogress.pleaseWait "Sila tunggu sementara kami wujudkan sambung ke rangkaian Tor. "> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/mt/progress.dtd b/mt/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/mt/progress.dtd +++ b/mt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/my/progress.dtd b/my/progress.dtd index 7b35c53..97fdfb1 100644 --- a/my/progress.dtd +++ b/my/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor အနေအထား"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Tor ကွန်ရက်ကို ဆက်သွယ်နေသည်"> -<!ENTITY torprogress.pleaseWait "Tor ကွန်ယက်နှင့် ချိတ်ဆက်မှုပြု‌လုပ်နေစဥ်စောင့်ဆိုင်းပေးပါ။"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nah/progress.dtd b/nah/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/nah/progress.dtd +++ b/nah/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nap/progress.dtd b/nap/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/nap/progress.dtd +++ b/nap/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nb/progress.dtd b/nb/progress.dtd index 3052326..12e14bd 100644 --- a/nb/progress.dtd +++ b/nb/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Åpne Innstillinger"> <!ENTITY torprogress.heading "Kobler til Tor-nettverket"> -<!ENTITY torprogress.pleaseWait "Vennligst vent mens vi etablerer en forbindelse til Tor-nettverket."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nds/progress.dtd b/nds/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/nds/progress.dtd +++ b/nds/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ne/progress.dtd b/ne/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ne/progress.dtd +++ b/ne/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nl/progress.dtd b/nl/progress.dtd index 89b7b7c..fb513ad 100644 --- a/nl/progress.dtd +++ b/nl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor status"> <!ENTITY torprogress.openSettings "Open Instellingen"> <!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk"> -<!ENTITY torprogress.pleaseWait "Wacht alstublieft terwijl we een verbinding met het Tor-netwerk tot stand brengen."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nl_BE/progress.dtd b/nl_BE/progress.dtd index 40774a0..9d01a14 100644 --- a/nl_BE/progress.dtd +++ b/nl_BE/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Instellingen"> <!ENTITY torprogress.heading "Connecteren naar het Tor netwerk"> -<!ENTITY torprogress.pleaseWait "Gelieve te wachten tot we een connectie opzetten naar het Tor netwerk."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nn/progress.dtd b/nn/progress.dtd index 90fe3e6..0664105 100644 --- a/nn/progress.dtd +++ b/nn/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Opne innstillingar"> <!ENTITY torprogress.heading "Koplar til Tor-nettverket"> -<!ENTITY torprogress.pleaseWait "Gjer vel og vent medan me opprettar samband med Tor-nettverket."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/nso/progress.dtd b/nso/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/nso/progress.dtd +++ b/nso/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/oc/progress.dtd b/oc/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/oc/progress.dtd +++ b/oc/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/or/progress.dtd b/or/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/or/progress.dtd +++ b/or/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/pa/progress.dtd b/pa/progress.dtd index 0a1de0c..ec821bc 100644 --- a/pa/progress.dtd +++ b/pa/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "ਟੋਰ ਸਥਿਤੀ"> <!ENTITY torprogress.openSettings "ਸੈਟਿੰਗ ਖੋਲ੍ਹੋ"> <!ENTITY torprogress.heading "ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"> -<!ENTITY torprogress.pleaseWait "ਸਾਡੇ ਵਲੋਂ ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਤਿਆਰ ਕਰਨ ਤੱਕ ਉਡੀਕ ਕੋਰ ਜੀ।"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/pap/progress.dtd b/pap/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/pap/progress.dtd +++ b/pap/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/pl/progress.dtd b/pl/progress.dtd index f8d75cc..f30af87 100644 --- a/pl/progress.dtd +++ b/pl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status sieci Tor"> <!ENTITY torprogress.openSettings "Ustawienia"> <!ENTITY torprogress.heading "Łączenie z siecią Tor"> -<!ENTITY torprogress.pleaseWait "Poczekaj chwilę, aż ustanowimy połączenie z siecią Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/pms/progress.dtd b/pms/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/pms/progress.dtd +++ b/pms/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ps/progress.dtd b/ps/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ps/progress.dtd +++ b/ps/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/pt/progress.dtd b/pt/progress.dtd index 473438c..85cf672 100644 --- a/pt/progress.dtd +++ b/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações"> <!ENTITY torprogress.heading "A conetar à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/pt_BR/progress.dtd b/pt_BR/progress.dtd index f41b13c..b2f8eb3 100644 --- a/pt_BR/progress.dtd +++ b/pt_BR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações "> <!ENTITY torprogress.heading "Conectando à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto nós estabelecemos uma conexão à rede Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ro/progress.dtd b/ro/progress.dtd index f81f1b2..bda4ccc 100644 --- a/ro/progress.dtd +++ b/ro/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stare Tor"> <!ENTITY torprogress.openSettings "Setări"> <!ENTITY torprogress.heading "Conctare la reţeaua Tor"> -<!ENTITY torprogress.pleaseWait "Așteptați pînă stabilim o conexiune la rețeaua Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ru/progress.dtd b/ru/progress.dtd index 47827da..aa09819 100644 --- a/ru/progress.dtd +++ b/ru/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Статус Tor"> <!ENTITY torprogress.openSettings "Открыть Настройки"> <!ENTITY torprogress.heading "Подключение к сети Tor"> -<!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока будет установлено соединение с сетью Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ru(a)petr1708/progress.dtd b/ru(a)petr1708/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ru(a)petr1708/progress.dtd +++ b/ru(a)petr1708/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sa/progress.dtd b/sa/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/sa/progress.dtd +++ b/sa/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/scn/progress.dtd b/scn/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/scn/progress.dtd +++ b/scn/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sco/progress.dtd b/sco/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/sco/progress.dtd +++ b/sco/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/si/progress.dtd b/si/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/si/progress.dtd +++ b/si/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/si_LK/progress.dtd b/si_LK/progress.dtd index f1d7045..6377cf4 100644 --- a/si_LK/progress.dtd +++ b/si_LK/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor තත්ත්වය "> <!ENTITY torprogress.openSettings "සිටුවම් විවෘත කරන්න"> <!ENTITY torprogress.heading "Tor ජාලය හා සම්බන්ධ වෙමින්"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sk/progress.dtd b/sk/progress.dtd index 81c3a1a..fcb403f 100644 --- a/sk/progress.dtd +++ b/sk/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor status"> <!ENTITY torprogress.openSettings "Otvor nastavenia"> <!ENTITY torprogress.heading "Pripájanie do siete Tor"> -<!ENTITY torprogress.pleaseWait "Prosíme počkajte kým nadviažeme spojenie so sieťou Toru."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sk_SK/progress.dtd b/sk_SK/progress.dtd index cdf3509..58926c8 100644 --- a/sk_SK/progress.dtd +++ b/sk_SK/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Otvoriť nastavenia"> <!ENTITY torprogress.heading "Pripájanie do siete Tor "> -<!ENTITY torprogress.pleaseWait "Čakajte, prosím, kým sa vytvorí spojenie do siete Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sl/progress.dtd b/sl/progress.dtd index d62303a..5d12bf5 100644 --- a/sl/progress.dtd +++ b/sl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor stanje"> <!ENTITY torprogress.openSettings "Odpri nastavitve"> <!ENTITY torprogress.heading "Povezovanje v Tor omrežje"> -<!ENTITY torprogress.pleaseWait "Počakajte, da vzpostavimo povezavo s Tor omrežjem"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sl_SI/progress.dtd b/sl_SI/progress.dtd index 3153326..95372f9 100644 --- a/sl_SI/progress.dtd +++ b/sl_SI/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor stanje"> <!ENTITY torprogress.openSettings "Odpri Nastavitve"> <!ENTITY torprogress.heading "Povezovanje v Tor omrežje"> -<!ENTITY torprogress.pleaseWait "Prosim počakajte, da se stabilizira povezava v Tor omrežje."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sn/progress.dtd b/sn/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/sn/progress.dtd +++ b/sn/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/so/progress.dtd b/so/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/so/progress.dtd +++ b/so/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/son/progress.dtd b/son/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/son/progress.dtd +++ b/son/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sq/progress.dtd b/sq/progress.dtd index 8138a00..167ecd2 100644 --- a/sq/progress.dtd +++ b/sq/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Gjendja e Tor"> <!ENTITY torprogress.openSettings "Hapeni Konfigurimin"> <!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor"> -<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendoset një lidhje me rrjetin Tor"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sq_AL/progress.dtd b/sq_AL/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/sq_AL/progress.dtd +++ b/sq_AL/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sr/progress.dtd b/sr/progress.dtd index 5e5f506..ef5e90c 100644 --- a/sr/progress.dtd +++ b/sr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Тор статус"> <!ENTITY torprogress.openSettings "Отвори подешавања"> <!ENTITY torprogress.heading "Повезивање на Тор мрежу"> -<!ENTITY torprogress.pleaseWait "Молимо вас сачекајте док успоставимо везу са Тор мрежом"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sr(a)latin/progress.dtd b/sr(a)latin/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/sr(a)latin/progress.dtd +++ b/sr(a)latin/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/st/progress.dtd b/st/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/st/progress.dtd +++ b/st/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/su/progress.dtd b/su/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/su/progress.dtd +++ b/su/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sv/progress.dtd b/sv/progress.dtd index c42db4e..7ac45ca 100644 --- a/sv/progress.dtd +++ b/sv/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Öppna inställningar"> <!ENTITY torprogress.heading "Ansluter till Tor-nätverket"> -<!ENTITY torprogress.pleaseWait "Vänta medan vi upprättar en anslutning till Tor-nätverket."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/sw/progress.dtd b/sw/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/sw/progress.dtd +++ b/sw/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/szl/progress.dtd b/szl/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/szl/progress.dtd +++ b/szl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ta/progress.dtd b/ta/progress.dtd index b8570e4..3bbd799 100644 --- a/ta/progress.dtd +++ b/ta/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor நிலைமை"> <!ENTITY torprogress.openSettings "அமைப்புக்களை திற"> <!ENTITY torprogress.heading "Tor நெட்வொர்க்கிற்கு இணைக்கிறது"> -<!ENTITY torprogress.pleaseWait "தயவு செய்து பொறுக்கவும், Tor நெட்வொர்க்கிற்கு இணைப்பு தொடர்தாபிக்கப்படுகிறது."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/te/progress.dtd b/te/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/te/progress.dtd +++ b/te/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/te_IN/progress.dtd b/te_IN/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/te_IN/progress.dtd +++ b/te_IN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/tg/progress.dtd b/tg/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/tg/progress.dtd +++ b/tg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/th/progress.dtd b/th/progress.dtd index 839aade..002e38f 100644 --- a/th/progress.dtd +++ b/th/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "สถานะ Tor"> <!ENTITY torprogress.openSettings "การตั้งค่า"> <!ENTITY torprogress.heading "กำลังเชื่อมต่อสู่เครือข่าย Tor"> -<!ENTITY torprogress.pleaseWait "กรุณารอขณะที่เรากำลังทำการเชื่อมต่อไปยังเครือข่าย Tor"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ti/progress.dtd b/ti/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ti/progress.dtd +++ b/ti/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/tk/progress.dtd b/tk/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/tk/progress.dtd +++ b/tk/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/tl_PH/progress.dtd b/tl_PH/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/tl_PH/progress.dtd +++ b/tl_PH/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/tr/progress.dtd b/tr/progress.dtd index 353bbbe..e9d4e5c 100644 --- a/tr/progress.dtd +++ b/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> <!ENTITY torprogress.heading "Tor ağına bağlanılıyor"> -<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulana kadar bekleyin."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ug(a)Arab/progress.dtd b/ug(a)Arab/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ug(a)Arab/progress.dtd +++ b/ug(a)Arab/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/uk/progress.dtd b/uk/progress.dtd index 1bf065b..192f5d3 100644 --- a/uk/progress.dtd +++ b/uk/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Статус Tor"> <!ENTITY torprogress.openSettings "Відкрити Налаштування"> <!ENTITY torprogress.heading "Підключення до мережі Tor"> -<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ur/progress.dtd b/ur/progress.dtd index c8710bb..991c7ef 100644 --- a/ur/progress.dtd +++ b/ur/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "طور کے حیثیت"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ur_PK/progress.dtd b/ur_PK/progress.dtd index 09d3567..4cd92e2 100644 --- a/ur_PK/progress.dtd +++ b/ur_PK/progress.dtd @@ -1,5 +1,4 @@ <!ENTITY torprogress.dialog.title "ٹار اسٹیٹس"> <!ENTITY torprogress.openSettings "ترتیبات کھولیں"> <!ENTITY torprogress.heading "ٹار نیٹ ورکس سے رابطہ بنائیں"> -<!ENTITY torprogress.pleaseWait "برائے مہربانی انتظار فرمائیں -ہم آپ کا رابطہ ٹار نیٹ ورک کے ساتھ کر رہیں"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/uz/progress.dtd b/uz/progress.dtd index 865a7ed..7d6c8ec 100644 --- a/uz/progress.dtd +++ b/uz/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor holati"> <!ENTITY torprogress.openSettings "Moslamalarni ochish"> <!ENTITY torprogress.heading "Tor tarmog'iga ulanish"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/ve/progress.dtd b/ve/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/ve/progress.dtd +++ b/ve/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/vi/progress.dtd b/vi/progress.dtd index 507803b..305cba3 100644 --- a/vi/progress.dtd +++ b/vi/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Trạng thái Tor"> <!ENTITY torprogress.openSettings "Cài đặt Mở"> <!ENTITY torprogress.heading "Kết nối với mạng Tor"> -<!ENTITY torprogress.pleaseWait "Vui lòng chờ đợi để chúng tôi kết nối đến mạng lưới Tor."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/wa/progress.dtd b/wa/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/wa/progress.dtd +++ b/wa/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/wo/progress.dtd b/wo/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/wo/progress.dtd +++ b/wo/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/yo/progress.dtd b/yo/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/yo/progress.dtd +++ b/yo/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/zh_CN/progress.dtd b/zh_CN/progress.dtd index 90ef643..5b3873e 100644 --- a/zh_CN/progress.dtd +++ b/zh_CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "正在连接 Tor 网络，请稍等。"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/zh_HK/progress.dtd b/zh_HK/progress.dtd index 8a38686..e93a82a 100644 --- a/zh_HK/progress.dtd +++ b/zh_HK/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor的狀態"> <!ENTITY torprogress.openSettings "打開設定"> <!ENTITY torprogress.heading "連接至Tor的網絡中"> -<!ENTITY torprogress.pleaseWait "跟Tor網絡連接, 請稍候。"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/zh_TW/progress.dtd b/zh_TW/progress.dtd index be27a6b..65b0d3e 100644 --- a/zh_TW/progress.dtd +++ b/zh_TW/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 狀態"> <!ENTITY torprogress.openSettings "開啟設定"> <!ENTITY torprogress.heading "正在連線至 Tor 網路"> -<!ENTITY torprogress.pleaseWait "我們正在建立 Tor 網路連線，請稍候..."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/zu/progress.dtd b/zu/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/zu/progress.dtd +++ b/zu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">

1 0

[tor-browser-bundle/hardened-builds] Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom.
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 8f65825303389fbb253a0fa263c7b977380e195b Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:28:18 2016 +0000 Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 0121f6b..421e1aa 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -27,6 +27,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:105 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/hardened-builds] Bug 18115: Adding new default obfs4 bridge "Mosaddegh"
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit ae110f6f69659ea7aa830dcc8b1c8f3df815d0ec Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:17:45 2016 +0000 Bug 18115: Adding new default obfs4 bridge "Mosaddegh" --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f79a7fc..0121f6b 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,12 +20,13 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom.
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit eb0ea02833c240188d815820c1de72a97776d712 Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:28:18 2016 +0000 Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 0121f6b..421e1aa 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -27,6 +27,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:105 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bug 18115: Adding new default obfs4 bridge "Mosaddegh"
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit bf09e53ce3752e086b5d6fde1a09f480f020e115 Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:17:45 2016 +0000 Bug 18115: Adding new default obfs4 bridge "Mosaddegh" --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f79a7fc..0121f6b 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,12 +20,13 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-launcher/master] Bug 11773: setup wizard UI flow improvements
by gk＠torproject.org 20 Jan '16

20 Jan '16

commit e18194b1622b4d8ef1b7a9674b63d1213e678199 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jan 20 11:42:12 2016 -0500 Bug 11773: setup wizard UI flow improvements Add a new "Reconfigure" prompt that is displayed after bootstrapping fails. This makes it so users experience the same configuration sequence each time rather than forcing them to move backwards through the wizard pages. Add a new "Remove Settings and Connect" prompt that is displayed if the user clicks "Connect" while some bridge or proxy settings are present. This avoids a problem where old settings may be used without users being aware of them. Improve some of the configuration prompts and status text based on early feedback from UC Berkeley usability studies. --- src/chrome/content/network-settings-wizard.xul | 48 ++++++- src/chrome/content/network-settings.js | 165 +++++++++++++++++++----- src/chrome/content/network-settings.xul | 2 +- src/chrome/content/progress.js | 2 + src/chrome/locale/en/network-settings.dtd | 15 ++- src/chrome/locale/en/progress.dtd | 2 +- src/chrome/skin/network-settings.css | 3 +- 7 files changed, 189 insertions(+), 48 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 00c1682..56217c5 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -19,7 +19,7 @@ windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" buttonlabelextra2="&torsettings.copyLog;" - onwizardfinish="return applySettings();" + onwizardfinish="return applySettings(false);" onwizardcancel="return onCancel();" onload="initDialog();" onunload="deinitDialog();"> @@ -46,7 +46,8 @@ <separator/> <label>&torSettings.connectPrompt2;</label> <label>&torSettings.connectPrompt3;</label> - <button label="&torSettings.connect;" oncommand="useSettings();"/> + <button label="&torSettings.connect;" + oncommand="onWizardFirstPanelConnect();"/> <separator class="tall"/> <label>&torSettings.configurePrompt1;</label> <label>&torSettings.configurePrompt2;</label> @@ -74,7 +75,9 @@ <radio id="bridgesRadioYes" label="&torSettings.yes;" /> <radio id="bridgesRadioNo" label="&torSettings.no;" selected="true" /> </radiogroup> - <description class="questionHelp">&torSettings.bridgeHelp; + <description class="questionHelp">&torSettings.bridgeExplanation1; + </description> + <description class="questionHelp">&torSettings.bridgeExplanation2; </description> </vbox> </hbox> @@ -94,7 +97,8 @@ <separator /> <vbox> <label id="bridgeSettingsPrompt" - class="question">&torSettings.bridgeSettingsPrompt;</label> + class="question">&torSettings.bridgeSettingsPrompt;  +&torsettings.useBridges.note;</label> <groupbox id="bridgeSpecificSettings" /> </vbox> </wizardpage> @@ -120,7 +124,9 @@ <radio id="proxyRadioYes" label="&torSettings.yes;" /> <radio id="proxyRadioNo" label="&torSettings.no;" selected="true" /> </radiogroup> - <description class="questionHelp">&torSettings.proxyHelp; + <description class="questionHelp">&torSettings.proxyExplanation1; + </description> + <description class="questionHelp">&torSettings.proxyExplanation2; </description> </vbox> </hbox> @@ -168,8 +174,36 @@ <separator/> <hbox> <spring flex="1" /> - <button id="restartTorButton" label="&torsettings.restartTor;" hidden="true" - oncommand="onRestartTor()" /> + <button id="restartTorButton" label="&torsettings.restartTor;" + hidden="true" oncommand="onRestartTor()" /> + <button id="reconfigTorButton" label="&torsettings.reconfigTor;" + hidden="true" oncommand="onWizardReconfig()" /> + <spring flex="1" /> + </hbox> + <spring flex="1" /> + </wizardpage> + + <wizardpage pageid="discardSettings" next="notUsed" + onpageshow="showWizardNavButtons(false);" + onextra2="onCopyLog();"> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + </hbox> + <spring flex="1" /> + <hbox> + <spring flex="1" /> + <description flex="1">&torsettings.discardSettings.prompt;</description> + <spring flex="1" /> + </hbox> + <separator/> + <hbox> + <spring flex="1" /> + <button id="discardSettingsGoBack" oncommand="showPanel();"/> + <separator/> + <button label="&torsettings.discardSettings.proceed;" + oncommand="removeSettingsAndConnect()" /> <spring flex="1" /> </hbox> <spring flex="1" /> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 9d3cb60..d145f77 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -35,6 +35,8 @@ const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardProxyRadioGroup = "proxyRadioGroup"; const kWizardUseBridgesRadioGroup = "useBridgesRadioGroup"; +const kWizardFirstPageID = "first"; + const kLocaleList = "localeList"; const kUseProxyCheckbox = "useProxy"; const kProxyTypeMenulist = "proxyType"; @@ -200,6 +202,12 @@ function initDialog() if (accessKey) helpBtn.setAttribute("accesskey", accessKey); } + + // Set Discard Settings back button label to match the wizard Back button. + let wizardBackBtn = document.documentElement.getButton("back"); + let backBtn = document.getElementById("discardSettingsGoBack"); + if (wizardBackBtn && backBtn) + backBtn.label = wizardBackBtn.label; } initDefaultBridgeTypeMenu(); @@ -214,7 +222,7 @@ function initDialog() (status != gTorProcessService.kStatusRunning)) { if (status == gTorProcessService.kStatusExited) - showErrorMessage(true, null); + showErrorMessage(true, null, false); else showStartingTorPanel(); addObserver(kTorProcessReadyTopic); @@ -384,6 +392,25 @@ function getWizard() } +function onWizardFirstPanelConnect() +{ + // If the user configured bridge or proxy settings, prompt before + // discarding their data. + if (isBridgeConfigured() || isProxyConfigured()) + showPanel("discardSettings"); + else + removeSettingsAndConnect() +} + + +function removeSettingsAndConnect() +{ + applySettings(true); // Use default settings. + if (!gIsBootstrapComplete) + readTorSettings(); // Ensure UI matches the settings that were used. +} + + function onWizardConfigure() { getWizard().advance("bridges"); @@ -497,12 +524,12 @@ var gObserver = { { removeObserver(kTorProcessReadyTopic); removeObserver(kTorProcessDidNotStartTopic); - showErrorMessage(false, aData); + showErrorMessage(false, aData, false); } else if (kTorProcessExitedTopic == aTopic) { removeObserver(kTorProcessExitedTopic); - showErrorMessage(true, null); + showErrorMessage(true, null, false); } else if (kTorOpenProgressTopic == aTopic) { @@ -560,7 +587,7 @@ function readTorSettings() if (!didSucceed) { // Unable to communicate with tor. Hide settings and display an error. - showErrorMessage(false, null); + showErrorMessage(false, null, false); setTimeout(function() { @@ -581,7 +608,7 @@ function showPanel(aPanelID) { var wizard = getWizard(); if (!aPanelID) - aPanelID = (wizard) ? "first" : "settings"; + aPanelID = (wizard) ? kWizardFirstPageID : "settings"; var deckElem = document.getElementById("deck"); if (deckElem) @@ -589,7 +616,7 @@ function showPanel(aPanelID) else if (wizard.currentPage.pageid != aPanelID) wizard.goTo(aPanelID); - if (wizard && (aPanelID == "first")) + if (wizard && (aPanelID == kWizardFirstPageID)) setTimeout( function() { showWizardNavButtons(false); }, 0); showOrHideButton("accept", (aPanelID == "settings"), true); @@ -627,7 +654,7 @@ function showStartingTorPanel() } -function showErrorMessage(aTorExited, aErrorMsg) +function showErrorMessage(aTorExited, aErrorMsg, aShowReconfigButton) { var elem = document.getElementById("errorPanelMessage"); var btn = document.getElementById("restartTorButton"); @@ -653,6 +680,15 @@ function showErrorMessage(aTorExited, aErrorMsg) if (elem) elem.textContent = (aErrorMsg) ? aErrorMsg : ""; + let reconfigBtn = document.getElementById("reconfigTorButton"); + if (reconfigBtn) + { + if (aShowReconfigButton) + reconfigBtn.removeAttribute("hidden"); + else + reconfigBtn.setAttribute("hidden", true); + } + showPanel("errorPanel"); var haveWizard = (getWizard() != null); @@ -856,6 +892,17 @@ function onRestartTor() } +function onWizardReconfig() +{ + showPanel(kWizardFirstPageID); + onWizardConfigure(); + // Because a similar delayed call is used to hide the buttons when the + // first wizard page is displayed, we use setTimeout() here to ensure + // that the navigation buttons are visible. + window.setTimeout(function() { showWizardNavButtons(true); }, 0); +} + + function onCancel() { if (gRestoreAfterHelpPanelID) // Is help open? @@ -927,7 +974,9 @@ function onOpenHelp() forAssistance.setAttribute("hidden", true); } else + { overrideButtonLabel("cancel", "done"); + } } @@ -948,7 +997,9 @@ function closeHelp() forAssistance.removeAttribute("hidden"); } else + { restoreButtonLabel("cancel"); + } showPanel(gRestoreAfterHelpPanelID); gRestoreAfterHelpPanelID = null; @@ -1130,15 +1181,16 @@ function initBridgeSettings() // Returns true if settings were successfully applied. -function applySettings() +function applySettings(aUseDefaults) { TorLauncherLogger.log(2, "applySettings ---------------------" + "----------------------------------------------"); var didSucceed = false; try { - didSucceed = applyBridgeSettings() && - applyProxySettings() && applyFirewallSettings(); + didSucceed = applyBridgeSettings(aUseDefaults) && + applyProxySettings(aUseDefaults) && + applyFirewallSettings(aUseDefaults); } catch (e) { TorLauncherLogger.safelog(4, "Error in applySettings: ", e); } @@ -1164,10 +1216,26 @@ function useSettings() if (!gIsBootstrapComplete) openProgressDialog(); + let wizardElem = getWizard(); if (gIsBootstrapComplete) + { close(); + } + else if (wizardElem) + { + // If the user went down the "Configure" path and another error (e.g., + // Tor Exited) has not already been shown, display a generic message + // with a "Reconfigure" button. + let pageid = wizardElem.currentPage.pageid; + if ((pageid != kWizardFirstPageID) && (pageid != "errorPanel")) + { + let msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); + showErrorMessage(false, msg, true); + } + } } + function openProgressDialog() { var chromeURL = "chrome://torlauncher/content/progress.xul"; @@ -1184,9 +1252,10 @@ function onProgressDialogClose(aBootstrapCompleted) // Returns true if settings were successfully applied. -function applyProxySettings() +function applyProxySettings(aUseDefaults) { - var settings = getAndValidateProxySettings(); + let settings = aUseDefaults ? getDefaultProxySettings() + : getAndValidateProxySettings(); if (!settings) return false; @@ -1194,34 +1263,40 @@ function applyProxySettings() } -// Return a settings object if successful and null if not. -function getAndValidateProxySettings() +function getDefaultProxySettings() { - // TODO: validate user-entered data. See Vidalia's NetworkPage::save() - - var settings = {}; + let settings = {}; settings[kTorConfKeySocks4Proxy] = null; settings[kTorConfKeySocks5Proxy] = null; settings[kTorConfKeySocks5ProxyUsername] = null; settings[kTorConfKeySocks5ProxyPassword] = null; settings[kTorConfKeyHTTPSProxy] = null; settings[kTorConfKeyHTTPSProxyAuthenticator] = null; + return settings; +} + + +// Return a settings object if successful and null if not. +function getAndValidateProxySettings() +{ + var settings = getDefaultProxySettings(); + // TODO: validate user-entered data. See Vidalia's NetworkPage::save() var proxyType, proxyAddrPort, proxyUsername, proxyPassword; if (isProxyConfigured()) { - proxyAddrPort = createColonStr(getElemValue(kProxyAddr, null), - getElemValue(kProxyPort, null)); - if (!proxyAddrPort) + proxyType = getElemValue(kProxyTypeMenulist, null); + if (!proxyType) { - reportValidationError("error_proxy_addr_missing"); + reportValidationError("error_proxy_type_missing"); return null; } - proxyType = getElemValue(kProxyTypeMenulist, null); - if (!proxyType) + proxyAddrPort = createColonStr(getElemValue(kProxyAddr, null), + getElemValue(kProxyPort, null)); + if (!proxyAddrPort) { - reportValidationError("error_proxy_type_missing"); + reportValidationError("error_proxy_addr_missing"); return null; } @@ -1268,10 +1343,16 @@ function reportValidationError(aStrKey) // Returns true if settings were successfully applied. -function applyFirewallSettings() +function applyFirewallSettings(aUseDefaults) { - var settings = (getWizard()) ? getAutoFirewallSettings() - : getAndValidateFirewallSettings(); + let settings; + if (aUseDefaults) + settings = getDefaultFirewallSettings(); + else if (getWizard()) + settings = getAutoFirewallSettings(); + else + settings = getAndValidateFirewallSettings(); + if (!settings) return false; @@ -1296,6 +1377,12 @@ function getAndValidateFirewallSettings() } +function getDefaultFirewallSettings() +{ + return constructFirewallSettings(undefined); +} + + // Return a settings object if successful and null if not. // Only used for the wizard. function getAutoFirewallSettings() @@ -1386,9 +1473,10 @@ function initDefaultBridgeTypeMenu() // Returns true if settings were successfully applied. -function applyBridgeSettings() +function applyBridgeSettings(aUseDefaults) { - var settings = getAndValidateBridgeSettings(); + let settings = (aUseDefaults) ? getDefaultBridgeSettings() + : getAndValidateBridgeSettings(); if (!settings) return false; @@ -1396,13 +1484,19 @@ function applyBridgeSettings() } -// Return a settings object if successful and null if not. -function getAndValidateBridgeSettings() +function getDefaultBridgeSettings() { - var settings = {}; + let settings = {}; settings[kTorConfKeyUseBridges] = null; settings[kTorConfKeyBridgeList] = null; + return settings; +} + +// Return a settings object if successful and null if not. +function getAndValidateBridgeSettings() +{ + var settings = getDefaultBridgeSettings(); var useBridges = isBridgeConfigured(); var defaultBridgeType; var bridgeList; @@ -1432,8 +1526,9 @@ function getAndValidateBridgeSettings() } } - // Since it returns a filterd list of bridges, TorLauncherUtil.defaultBridges - // must be called after setting the kPrefDefaultBridgeType pref. + // Since it returns a filtered list of bridges, + // TorLauncherUtil.defaultBridges must be called after setting the + // kPrefDefaultBridgeType pref. TorLauncherUtil.setCharPref(kPrefDefaultBridgeType, defaultBridgeType); if (defaultBridgeType) bridgeList = TorLauncherUtil.defaultBridges; @@ -1651,7 +1746,9 @@ function parseColonStr(aStr) rv[1] = aStr.substring(idx + 1); } else + { rv[0] = aStr; + } return rv; } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 9fffbec..727e7f6 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -20,7 +20,7 @@ persist="screenX screenY" buttons="accept,cancel,extra2,help" buttonlabelextra2="&torsettings.copyLog;" - ondialogaccept="return applySettings();" + ondialogaccept="return applySettings(false);" ondialogcancel="return onCancel();" ondialogextra2="onCopyLog();" ondialoghelp="onOpenHelp();" diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index b44dca5..48362e7 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -170,6 +170,8 @@ var gObserver = { // TODO: provide a way to access tor log e.g., leave this dialog open // and display the open settings button or provide a way to do // that from our error alerts. + if (kTorBootstrapErrorTopic == aTopic) + stopTorBootstrap(); cleanup(); window.close(); } diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index b193750..75ece3b 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> +<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> +<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> <!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigure"> + +<!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"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 610ab26..20d3528 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -72,7 +72,7 @@ separator.tall { } .questionHelp { - margin-right: 20px; + margin: 0px 0px 12px 20px; } .instructions { @@ -109,6 +109,7 @@ wizard#TorLauncherLocalePicker button[dlgtype="next"] { font-weight: bold; } +#bridgeNote, #bridgeDefaultEntry, #bridgeCustomEntry { margin-left: 1.8em;

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] Bug 16322: Update DuckDuckGo search engine
by gk＠torproject.org 20 Jan '16

20 Jan '16

commit 912db6de1e8851870434a948b8721cd2aebf11de Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 20 12:27:59 2016 +0000 Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. --- browser/locales/en-US/searchplugins/ddg.xml | 50 ++++++++++++-------- browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ------------ browser/locales/en-US/searchplugins/list.txt | 1 - 3 files changed, 29 insertions(+), 51 deletions(-) diff --git a/browser/locales/en-US/searchplugins/ddg.xml b/browser/locales/en-US/searchplugins/ddg.xml index d68deb4..d612d3c 100644 --- a/browser/locales/en-US/searchplugins/ddg.xml +++ b/browser/locales/en-US/searchplugins/ddg.xml @@ -1,21 +1,29 @@ -<?xml version="1.0" encoding="utf-8"?> -<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>DuckDuckGo</ShortName> - <Description>Search DuckDuckGo</Description> - <InputEncoding>UTF-8</InputEncoding> - <Image height="16" width="16">data:image/icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/z dZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL7P8DOuDzAAAAAAAAAAAAAAAAAT3g/0p16f//////3OT8/3OS7v8AKt3/ACPc/zhn5/+xw/b//////0956v8CPeD/AAAAAAAAAAAAAAAAAAAAAAAAAAAEPODzBUDh/5uz8//7/f7/////////////////prz0/wtF4v8FQeDzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtF5kYDQOOkADrj/wA44v8AOeP/ADzk/wVB46QPReZGAAAAAAAAAAAAAAAAAAAAAPAPAADgBwAAwAMAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChIzyAnRNFwJ0TQryND0d8nRNH/J0TR/ydE0f8nRNH/I0PR3ydE0K8nRNFwKEjPIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChE00AlRdK/J0XS/ydF0v8nRdL/XXPd/11z3f94i+P/k6Lp/5Oi6f9rf+D/NVDV/ydF0v8nRdL/JUXSvyhE00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAzxAnRNOvJ0XT/ydF0/8lRdK/KEXSYOvu+6/+/v6//v7+v/39/c////////////7+/r/J0fOAKEXSYCVF0r8nRdP/J0XT/ydE068gQM8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlRdUwJ0bT7ydG0/8nRtHPKETTQAAAAADHx8dA2vHhn5TYpN/o9+z/////////////////8PL83ydG0o8lRdUwAAAAAChE00AnRtHPJ0bT/ydG0+8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKEXVYCdG1P8nRtT/KEbTgAAAAAAmRtZQI0PU38jIyP/F6s//Rrtk/0a7ZP9/yIr/c796/4vLkv+JpNf/M3Kq/zyWh/8zeKTfJkbWUAAAAAAoRtOAJ0bU/ydG1P8oRdVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVF1TAnR9X/J0fV/yhF1WAgQM8QJ0fTrydH1f9CW8//2tra/6Pdsv9Gu2T/Rrtk/0WzWv9Gu2T/Rrtk/0a7ZP9Gu2T/Rrtk/z6egP8nR9X/J0fTryBAzxAoRdVgJ0fV/ydH1f8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAgQM8QJ0fV7ydH1f8oSNVgIEDPECdH1c8nR9X/J0fV/1xwyf/t7e3/o92y/0a7ZP9Gu2T/Ra5U/0a7ZP9Gu2T/Rrtk/0a7ZP9Gu2T/Pp6A/ydH1f8nR9X/J0fVzyBAzxAoSNVgJ0fV/ydH1e8gQM8QAAAAAAAAAAAAAAAAAAAAACdH1q8nR9b/KEjVgCBQzxAnR9bPJ0fW/ydH1v8nR9b/gIzB//r6+v+j3bL/Rrtk/13Ed/+i26//ruG7/z6egf8+noH/Rrtk/0a7ZP86kI//J0fW/ydH1v8nR9b/ J0fWzyBQzxAoSNWAJ0fW/ydH1q8AAAAAAAAAAAAAAAAoSNdAJkjW/yZH1s8AAAAAJEfWryZI1v8mSNb/JkjW/yZI1v+jqsT//////+j37P/R7tj////////////W3ff/JkjW/yZI1v8uZbr/PJeI/zJzrP8mSNb/JkjW/yZI1v8mSNb/JEfWrwAAAAAmR9bPJkjW/yhI10AAAAAAAAAAACVI1r8mSNf/KEjXQCZJ1lAmSNf/JkjX/yZI1/8mSNf/JkjX/9HR0f///////////////////////////5Ok6/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JknWUChI10AmSNf/JUjWvwAAAAAoSNcgJknY/yZH2M8AAAAAI0nY3yZJ2P8mSdj/JknY/yZJ2P9KZM//39/f////////////////////////////XHfi/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8jSdjfAAAAACZH2M8mSdj/KEjXICdJ2HAmSdj/JUjXYCVK2jAmSdj/JknY/yZJ2P8mSdj/JknY/2V4yf/t7e3///////////////////////////9cd+L/HXTj/xSf7/8Nwfj/CdL8/wnS/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/ yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf/////////// ////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv ///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi/yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/</Image> - <Image height="26" width="65">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxRTYyNzYzMzFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxRTYyNzYzMjFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3J Ub29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZCQUIxMEI4RjU1NzYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7hxyCFAAAF4UlEQVR42tSZa2wUVRTH/3dmp92+tnRpCiUgxFoKCDQplsRIfZSgCEHSapBGBCURQvCLWkkQg9GYGNDwTYlGUCMoCA2EtEpEq1KjRJCA9EEElba2FajbN213d+b6vzOzZZfi99mb/DJ3d/aczD33vO6skFLCq6O9YubYXChE4n1+LublaVJO5hLDvRUhjaSefMolno+XU0uOX7WG5BxLSBsXc448Qo6SFWSuywr3O3XvnPqtK3PbkWxGUL5whHzN7WyAZeWQRZBWFz+v4v6+w3sKztFFFpEc0mDLOLJinNIkCocMXppJLhdcCssMw4zu5fOX2XGi6RAa91Rot8aNMsB6kkJOk24yh6seSjZPEHzoZmlfZaaU1pqR/Dsv+XfVlQXf/QbZ67dBz5sKKzxK20TpGBbU5qrtJWXkEllDMqWrK94jPG0ESzpwPTUkl8yQFvZL09oaLlqIG1LDQFoA6Y9vxJQ9Dch+bjus4WEaIwxpmjSGdJKgw1ay39bh6KqJ6U8GTyjnc1aQheQ1UqV2Of3LPTBPfI40RkVsEdmVGzClphmZy9bAitAQlhnvEbBlHR1KV4VbVbydE66sLFI+e8mN5e1Qc7o6IqMIr3sVhVUb/le2e1c1Bk8cgvAxFWjj9rqQvA7HGIVeN4LqA1SJm0iO ci/LQDc3aZrg4RZkpBgYHY4iK8OXIHetz4RPi6K/ao4b9PrtkuVKElL9hafDgfuzjrQQk5QxH9hxPphfgAy/gYHByDgDqJGXrSOYlYrAo1WQUTc32LJj+aHM1dlEnvK2EYClpIasiotrmL5URE2JiQEDuw+ewunGjgS5hrNtWLp5P/QHKhk9lh1BDuKmIYAnyWGyxNuJUWI2+ZncG5/djKF+DA45ZX7Hh9/j2HdNCWKzC/JRsXg+sgrmQ4aFjS/LQvqsYejpqiTYepTOn8g8n8c9QQ21zdPiDxD+620IhULIC2TiYl01/CmJy8jNNrCxMh/hjiMIVvYioziK1BlRQJcIHc1B6KscqpLTXN2pPo/nhNjwxR2jIFgdBtouAzPuSDSAZLPUXgX0HYFgLjRIcLnO3sFAb33AJnLdYFNp9w/6Lco97Qm57o7dbKC5wpHffgHuL09srjo22AYY/tOPoQsBiFRgtJ3zljQqo/HoCfbSnULR6eq2vJ4TWskCcnYsJ9hGYIz/1YQR65bTYOARe5FW2EDfqQD+rQ1iqDkN/qlhTHhwAJnFQ6oxiuUWpfMe0uzpPuH3ZUV7eZlFVpPWsRjh+WA4OAV579UiPzghQaajuhgZc1qRWTIKnQ4g0i27N77RlI5rXwQR/seI9cnTyWfkvNfDYR8v35K/iSoBd8eSY8r1doR6escZYfRqLvrPDEDsM+ALWNADJiLdBttoYXuJEPamK13t5D6y1evNUj3pJzvIJqfRYV5XyZGFf/CPlnEy6UXzoLEZYDqEHBCIdBpsmFSsODEgHb1K105Xd4PnD1B86M2kmjSSA/Yi6AlSaBhtPG3/5mTXcTT3nLPnwYcq4KP7X52cgvc3TcWvpQFVDu1UIoWt74CrS+nc7P3qIO00rkLiBfcQdReZCamVqAqRcuUiolzJDx11aO4+gxxjOnqtbmhvzITO+6Yh0DthhF4jYmeHs4Q1FJfd+T6ZLC9VpHOcnk7qyQJSq zzB39WKnr5h+HhS1DUfOvs64RNRVgATlnDawoghYoWl1pWtd3WVJ0WfEDf6pGqhnTdCTGqihCw3urt2h0LdecH0ydB1Aw8XLkfPjRGUTixB4JUtuDDXj0nXokMmsJbyddJJiOoYPZuO0ZdsRlDjsnTa5x/JCDTxEnPfpIH6Y28uXvHYttUFzyNb1cTY+4TyC8ezD37wltT1k5YmXmRkjbhhMI2BcTVpXrS2LJ011jmO/VfgPO7L/GKnfSQ0zU+EaR2SlnWGN53FaRpdw1cKTX+Cxlrr5oMt5G2713Kq7NhLxmQ1gpPvpXyWs2f4oSz+oHHznxrRwOvHnHwkYpK3McJ/AgwADmrfhvtTyFYAAAAASUVORK5CYII=</Image> - <Image height="52" width="130">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo4RTdBNDY4ODFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4RTdBNDY4NzFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3 JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTE3MzgzQ0I2QjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7NVVBAAAAO30lEQVR42uxdCXRU1Rn+3nszk5nJhmEJAYKyJJJAWFyqUqwWwaJi0aKA9bh0USwunEo9UGmrHG0Vj3LUUoEqFQGXciqgiFCoVtsKeBAJS9JWtrAmIUxmkpnJJDNv6X/fu5O8mUwmkwkoPef9Od/cN/ct9593v/vf//73vhdB0zRY0nU5dktxuzxBMG3zD6GD84XYHYMI1xMuJZQQ2MWzCS6+P0TwE74i/Juwi7CFcCR6gY6qUeMf5t2JjhUsInxjRBhJyUOEewn2NNWIEFYQFlM17rWI8P9FhJsILxGGdHDpOsJ+wmlCA8/LJfQhjCD07uC8Q4TZhI3pEMFmVenXJqMJ7xIGx+UfJawivEf4IsVrXUaYQriLcCHPY8T6gHCYMJVQ3hXlLIvw9ViE1wg/iTt8JeFpuvsHYs4BehLKCAWEHnyXj1BN2EfwmGuMzimi5FeEu+Ouv5zwU6trOD+IUEif/zS1WiZvEWZSzQT4gQ5WYbwVj0+x+I+5dXmNrhPm18miz6WEO+OszdV0zHGLCN8cEZj53mnaXUO4ke72blYTArRS+r6QMLnVFggmu5C6sO5gLl23kp/NuqBNhL6mYy7XTN1OoioXrSo9JzKJ7vVOjTtrhLWEAoMEag5UZaMmyxVqJDKZAFUmKDJBpd0Eqin TuZ1hMqGCV34ObZfzstaajmGEnGT5CF+vRbg0zul7krCAN8Ufa6K0vLnkCmSXXQ5nuBmavx6qtw4t+3dC9p6GIJH/LkkQRMm4oNBlC8F8kT/x7Sd4+WYnc5c1ajj3UhBHgofppi/mdbmGmHA75DDC9afh63cxSr4zMeZk+Uw1Au+/jsCGN6C2NEGw2clmk9EWumS4l/PWP43KXkBle2j793wf060fdzwti3CuLAIfy0eHhwtMrZE5jONAZl+lSrUvXI/+w0qTXF1D/Su/QeP65RDsDrISkkGGrlmHf+mOYptVeoJvH04Uw7CIkKYcjSMCVdESSh7gX1lM4JYYEuj1qyKU1w/eUdcC3jPQMnNh65UP9+Dh6FFUin79+8e4ioG/vYszCx80uguyDkLUOqROCDMZ1vPYA5OlVOs/s4hw9onAmncF32YRwXy+/TZhRsy4TVWoD4gAkTA0RYHjuh/Adc0tyBhcAme/iyDGVXLk5GE0bfsr/NRlsK7DIITUFTK8Q7iDb9fCiFAyGQ4+0rCIcPaIUMHJwORb0ISddGfv4kGj2AE8jQ4QaUFkwh3o9/OFcNtSd9M8L8+D/8PVeneBrpHhbtJpFelkHtJWcjJYw8duiSZEMYFQyrfX8BudQ9srTceQJaBclYgQURCc/hiGPPZCl0jApOcjzyJz3GRodA39WubrJ8dKXSfmLDIdjbxSrrt+jGUR0pSqKRdHN9msXxnfvgBGOHiDESgyE4eYIMvwFw5D8bJNyOiOozrjEiiNXmNUkbpVYIGnm2GErb08j4WsR1oWoftSbCLBW5wERe1IYOoW5HseT4sEClmAWk8zzgQ19H7kd5RBfoaqInYWIalM5rr5uK7guhdbROhOz6DpmMVThqd5usiUZ4AqUVNUBHsVIm9oiX5+U4uCpavLsWTVbmz6+FCn5R2vDuhRR7+vCdLYSbAVFpHfqeiGpl15HSOq21OmPP03WF1DmnLk+3rXECS4eYCGBWok FhdKxBqBRgqnR30Xg+e/jF7ZWXjng68wdkwBBvbPTqt8/+a3UbdoLgQHdxxTF+aYkJOBk1xn9huyLIuQvhRyEjB5jaf3dRQgYmi5oC8k0bjl024qSpsETLIn3UHugabPS6BrjTmq43KeZjJCWERIt2sAbjBN6mzSjDn/25JNEKk2B+RIxBiumZw8D5n7lKJDX1bhqjtfwUtvbde/u0aPNSapgK7gNq7rJlPe9RYR0mfCVaa7u53nXZesBgRNQSgUirnM4y9uxogpi/DE4q3kN0SSFrlszQ4cPeXFF/tOwNcCOMuuNBxGVTOxLQFi9biO67rdlHe5RYT0ZQRP63jap+NDBR32gA/+QDBmz5sby2G3iThe68O2L48mLXDGDaPhsElgk9Q9aOiRMbi0HQk0VSDHlCBzqEIbGdqkd5zupRYR0u8ahvH7X8HTkUlNMnUFTs8peLz1Mde5+doShGVVb+VXjipMWuZN1wxD1dZ5WP3MNCPDmWUYBBZfokpXIoJelnt0ED1vrUfeFC/cw5uIK0K8PqN4up+nxdY0dPqSxdNTPO2X3CAQEWqP4nhDY8yuxfOnYM49V2NA3x66ZehSbMHfAi0iwd5XRmZJE1zDQ3BfHIJg582fzU/ZNNQsy0dwj8u8+KmApyd5mmsRoRtxBC7RJec5yboGtjjNUX8aQpMfTeEI3I62RxkGDchLrVD5DJl9sihyNYRwBSTtVQx64RRsubrJIZ2MmmZdgyBqeur7KAeBclfb4IVXPE+jrMy0iNB9CfO0k4dUBDZU0K2C1+uDO793aldXybSfmgOt/nWqyBazywFHL2Mlk6aIrfmMAEqTiMbPcuH9KBtqQNIjB2yoaRJ7nO7WCqWzID2jMZ7OeMC6B3dtFbw+H/qnQAQtuA3q4QlEhpCxUkm00SWiC12FVnLprZ9FKytdaNyejWC522j9ktE1RIljjkfF6R62iJC+syjzhtQjzgPvmAmCCFcNWYQGX+cFRKqhH vi2UYGiHYIkEh9ERBpt1BUokHIUqC0iQv/JgH93JoJ73VACkk4K3TcQDAJoieekorpGdQ9YREifCWzJF5uwGcZzKjpjDqsZZ3UVTsQ5jAkPD+3h/DGWqWmyiCO/LtTNfusSRr2la8Z3xjNJayssebAxqmsJT49Yw8f0ZR9Ph/L0YHKDYKxIdjTUQQg2ItjSkvzw7Al6VwBB1U9Vmw2LIHBz3wqJE4JVvMIcRUKExxJYDCExIQ7G6V5pESH9rqHcNC4fzPMqk4aY2ehBZN1Dle4wJmeCDeKgNYaJFxXYesgYMKcGrqJmvuJN0GMHKlU6iBDOoc3oMaERBffXYcjCEyhaUgV7fjiRHpVc18GmvL1W15A+EzbT51P8G5t3+AOMBaKlnfkKTt1PaMCAvvmdWIVbUbtxKpwFW5B9WRiZpSEdbFpb9lHVUYsX3Sokl9o6nNV9SOoiGj/LRrjWET9aYLKe59xgyttqESF9i2B+fmE6DCK8Sni8U4eRRg6eem9K5QT/G0T9h70hrpaQNaoZWWVNcBc3w5EvG6Fj3qoZAeSAiACNGLyf5KD5uIMZlUTyqknnqOyxiNA9YUvS2PIvtmScRW2qYDzdXJRsCOk8dRgn/P6UChAzaMRgU/WxIKtk/263bgmkbBkZ/WXYsmSoYQGR03a0kAWIOo+6/9B+2HiA6+hC2zL3DXo5Vl12S5aYtmdz8zw3uUUQYPd7IQYa4G8KdVqAY8CFdJaqDwtZ5Yp2Sh0qOY8SQgdp6FhOQ8dKN8Ieux5a1vdLbSOJOJnLdZwd/xssIqTbNRjrQdg6hObo8i+ev45woqPlYvoEkMAdRl/n8QTn0BFQ2VI30ySj4QtorYCoz3HraHUA25fNdFrHdYwuVWvmv8EiwlmQ+Txl3eyjWvv+N8EwUtS7B6+vodOLZ44Za0wv8poz6p1aPpFD4hBTW6A0nR/2KNoiyvNbuyCrHtN2FqNYxKKMfPsF3v9uo+1VyaakXdWH4f F27jA6i8tgc+eyZcwspABBocqn0o4OdOKP9w/A+1P6UL4Wr1M82Kt5tjHdmI48T+a668dYRDg7Yl6ruJbPArJX2RxP5CYYRKhCYyDQmv3+oZX44ear8NwXj2JX7T9iTuk5/lbYI0QAIoFiF7B2al+svKc/avpm4MBQt24dhI7XLTId7uY6re1AZ2vSKX2TEOOJreAmlz0nwB5Jn0k3fhkdMYa2T7CGHTt0oBbY1AS7tw4NgSbkZrnpcmTiaWSw37ML+zw70dPZB9cXTseO2h04ekkl1CuK4WzW4AxrCGRJsMlGxbNtmU1IaUg0sdBMGKMZpc6k/ZNMUdEVMaMTq0bPWlcx0WSK2buMLtOMF1+VEVpiuwaCaMw71PPuQSC/QRSogkU7HGIGGsM+vLhjCU4E9xA9FDhY2MAmoMkt6pbBsAKGjxhyiom6gxZetofrstS0b2K7YapVhWdN2JPGU03f2TOQF9FdP6inxhNGsYEl8hPq+cjBJbn5HoEIQZVNpBA0I5XYs4m84hPNHdjldpm+uLLN73KaynW1iHAOZS3d/CdNzZLNUJZR911D23mEv7eNAUVknGwbOWTY3K0ntf7RiSp7uQb/kwUFClt4IpF1IIuish5BbGcKWBl5epmsq9JwyLTvyTg/wSLCOZQFdM+Xta5gNx6SncKH8+MJP6IGrqj6GsZjCAQNh7GXKx+qpkIhyKqMiBpGVoYbh2tCOF4XQq1Xw3TvtXjouUMY94kXeZ4wIuQ4OshnsBPoeop+baMMjZe5l0cZWMYyRN/llEAsZzFNUZOP3R/g5jkaZVzPI3iz6LQVZOhXkFPwjBCJzHOcqYbPH0J+1kDI9McmlAbmFGFG8QMY1etK1ARrdZ8hz2WsITn05gaM++g0vkNk8OfY0ewSmWV4lnb9UmsLJrJ5j1kmfdhr/OZFX76JBD2M9exjmlLxvWGpOJCzeKVExasHmzRsNcKMMjzjb19aMO2+mcVFQ7Du2EqUXDA Gw7LLOrxmw5b1OPbb2RBtjs8FUWTkekN/a6Mxr8CcwD/DeDw/Kg/Srlc609UiwrklAvtgD8J8SjAvVd5LRHiE8Gn0NTqZKz692aGq853ZOSMycnIzJWcGbHx5e0RWEGluQaTB63H7z7ztfe/Nh71b1vE3ruk24BrCy+DvOuBSr+cL2J/KGxQsIpx7IkTlecKc2AO0esJiqMrrUJQq5hgyS2HUidY+EiUK+pPPomRjaxgH0cjjXhiv+o9fD88inL9oHaBYRDiviMA22aNMiwi3xRGCgU0oUJehB3vY01M0xNP4ZITAnkPIp8Y/nLZHkhWYqAce2stfWGBLMEc0LSKcl0SISj5vsewVd5ndVCXIHdHno/EBIc6QWEQ4f4nQaghIriDcCOMfelyaYvHsX/mwf9DxIeHz+NcopUOE/wkwAAeR3z4C+zelAAAAAElFTkSuQmCC</Image> - <Url type="text/html" method="get" template="https://duckduckgo.com/"> - <Param name="q" value="{searchTerms}"/> - <MozParam name="t" condition="purpose" purpose="contextmenu" value="ffcm"/> - <MozParam name="t" condition="purpose" purpose="keyword" value="ffab"/> - <MozParam name="t" condition="purpose" purpose="searchbar" value="ffsb"/> - <MozParam name="t" condition="purpose" purpose="homepage" value="ffhp"/> - <MozParam name="t" condition="purpose" purpose="newtab" value="ffnt"/> - </Url> - <Url type="application/x-suggestions+json" template="https://ac.duckduckgo.com/ac/"> - <Param name="q" value="{searchTerms}"/> - <Param name="type" value="list"/> - </Url> -</OpenSearchDescription> +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>DuckDuckGo</ShortName> +<Description>Duck Duck Go</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8n +IOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rB +Uv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n///// +/05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v// +//////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9h +XPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg +7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs +5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/ +JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8n IOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg +7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1 +/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/ +fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y +1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg +7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDs +AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA +AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD +AADwDwAA+B8AAA==</Image> +<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion/html/"> + <Param name="q" value="{searchTerms}"/> +</Url> +<SearchForm>http://3g2upl4pq6kufc4m.onion/html/</SearchForm> +</SearchPlugin> \ No newline at end of file diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml deleted file mode 100644 index 4f00b4d..0000000 --- a/browser/locales/en-US/searchplugins/duckduckgo.xml +++ /dev/null @@ -1,29 +0,0 @@ -<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> -<ShortName>DuckDuckGo</ShortName> -<Description>Duck Duck Go</Description> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8n -IOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rB -Uv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n///// -/05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v// -//////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9h -XPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg -7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs -5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/ -JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8n IOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg -7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1 -/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/ -fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y -1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg -7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDs -AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA -AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD -AADwDwAA+B8AAA==</Image> -<Url type="text/html" method="POST" template="https://duckduckgo.com/html/"> - <Param name="q" value="{searchTerms}"/> -</Url> -<SearchForm>https://duckduckgo.com/html/</SearchForm> -</SearchPlugin> diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt index 956fb8e..71b6c0f 100644 --- a/browser/locales/en-US/searchplugins/list.txt +++ b/browser/locales/en-US/searchplugins/list.txt @@ -5,4 +5,3 @@ wikipedia startpage yahoo google -duckduckgo

1 0