[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-launcher/master] Bug #10610: Users don't know if free of obstacles
commit b84f602123f3acbb81419376191f377a770f6208
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date: Thu Feb 13 09:36:44 2014 -0500
Bug #10610: Users don't know if free of obstacles
Improve wording on initial wizard panel.
---
src/chrome/content/network-settings-wizard.xul | 4 ++--
src/chrome/locale/ar/network-settings.dtd | 2 +-
src/chrome/locale/de/network-settings.dtd | 2 +-
src/chrome/locale/en/network-settings.dtd | 4 ++--
src/chrome/locale/es/network-settings.dtd | 2 +-
src/chrome/locale/fa/network-settings.dtd | 2 +-
src/chrome/locale/fr/network-settings.dtd | 2 +-
src/chrome/locale/it/network-settings.dtd | 2 +-
src/chrome/locale/ja/network-settings.dtd | 2 +-
src/chrome/locale/ko/network-settings.dtd | 2 +-
src/chrome/locale/nl/network-settings.dtd | 2 +-
src/chrome/locale/pl/network-settings.dtd | 2 +-
src/chrome/locale/pt/network-settings.dtd | 2 +-
src/chrome/locale/ru/network-settings.dtd | 2 +-
src/chrome/locale/vi/network-settings.dtd | 2 +-
src/chrome/locale/zh-CN/network-settings.dtd | 2 +-
16 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index 0002af4..20483ec 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -41,8 +41,8 @@
<vbox class="firstResponses" align="start">
<label class="question">&torSettings.firstQuestion;</label>
<separator/>
- <label>&torSettings.connectPrompt1;</label>
<label>&torSettings.connectPrompt2;</label>
+ <label>&torSettings.connectPrompt3;</label>
<button label="&torSettings.connect;" oncommand="useSettings();"/>
<separator class="tall"/>
<label>&torSettings.configurePrompt1;</label>
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index b29ae6a..21bc7e3 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 " اتصاÙ? اÙ?Ø¥Ù?ترÙ?ت Ù?Ù?ذا اÙ?Ù?Ù?بÙ?Ù?تر Ù?Ù?راÙ?بØ? Ø£Ù? Ù?صÙ?Ù?Ø? Ø£Ù? Ù?عÙ?Ù? ببرÙ?Ù?سÙ?.">
<!ENTITY torSettings.configurePrompt2 "Ø£Øتاج Ø¥Ù?Ù? تÙ?Ù?Ù?Ù? إعدادات اÙ?شبÙ?Ø©.">
<!ENTITY torSettings.configure "تÙ?Ù?Ù?Ù?">
-<!ENTITY torSettings.connectPrompt1 "اتصاÙ? اÙ?Ø¥Ù?ترÙ?ت Ù?Ù?ذا اÙ?Ù?Ù?بÙ?Ù?تر خاÙ?Ù? Ù?Ù? اÙ?عÙ?بات.">
<!ENTITY torSettings.connectPrompt2 "Ø£Ù?د اÙ?اتصاÙ? Ù?باشرة Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "اتصÙ?">
<!ENTITY torSettings.proxyQuestion "Ù?Ù? Ù?Øتاج Ù?ذا اÙ?جÙ?از Ø¥Ù?Ù? برÙ?Ù?سÙ? ØتÙ? Ù?صÙ? Ø¥Ù?Ù? شبÙ?Ø© اÙ?Ø¥Ù?ترÙ?تØ?">
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index 5e620ff..19af78a 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert, gefiltert oder vermittelt.">
<!ENTITY torSettings.configurePrompt2 "Ich muss die Netzwerkeinstellungen konfigurieren.">
<!ENTITY torSettings.configure "Konfigurieren">
-<!ENTITY torSettings.connectPrompt1 "Die Internetverbindung dieses Rechners ist frei von Hindernissen.">
<!ENTITY torSettings.connectPrompt2 "Ich würde gerne direkt eine Verbindung zum Tor-Netzwerk herstellen.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "Verbinden">
<!ENTITY torSettings.proxyQuestion "Benötigt dieser Rechner einen Vermittlungsserver um eine Verbindung zum Internet herzustellen?">
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index 3017865..ee9e149 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -9,10 +9,10 @@
<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure network settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles.">
<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
<!ENTITY torSettings.connect "Connect">
<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index 2ca7d03..1fd58b2 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "La conexión a Internet de esta computadora está censurada, filtrada o proxificada.">
<!ENTITY torSettings.configurePrompt2 "Necesito configurar la opciones de red.">
<!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt1 "La conexión a Internet de esta computadora está libre de obstáculos.">
<!ENTITY torSettings.connectPrompt2 "Me gustarÃa conectar directamente a la red Tor.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "Conectar">
<!ENTITY torSettings.proxyQuestion "¿Necesita usar un proxy de acceso a Internet esta computadora ?">
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index a7f773f..ab43953 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "اÛ?Ù?ترÙ?ت استÙ?ادÙ? شدÙ? در اÛ?Ù? راÛ?اÙ?Ù? Ù?ا ساÙ?سÙ?ر شدÙ?Ù«Ù?Û?Ù?تر شدÙ? Ù? Û?ا عبÙ?ر کردÙ? از رÙ?Û? پراکسÛ? Ù?Û? باشÙ?د.">
<!ENTITY torSettings.configurePrompt2 "Ù?Ù? Ù?Û?از بÙ? تÙ?ظÛ?Ù?ات شبکÙ? دارÙ?.">
<!ENTITY torSettings.configure "Ù¾Û?کربÙ?دÛ?">
-<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles.">
<!ENTITY torSettings.connectPrompt2 "تÙ?اÛ?Ù? دارÙ? Ù?ستÙ?Û?Ù?ا بÙ? شبکÙ?â??Û? تÙ?ر Ù?تصÙ? Ø´Ù?Ù?.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "اتصاÙ?">
<!ENTITY torSettings.proxyQuestion "Ø¢Û?ا اÛ?Ù? راÛ?اÙ?Ù? براÛ? اتصاÙ? بÙ? اÛ?Ù?ترÙ?ت Ù?Û?از بÙ? استÙ?ادÙ? از پراکسÛ? داردØ?">
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index b39112c..7d4a4fe 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou nécessite un proxy.">
<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer les paramètres réseau. ">
<!ENTITY torSettings.configure "Configurer">
-<!ENTITY torSettings.connectPrompt1 "Rien n'entrave la connexion Internet de cet ordinateur.">
<!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au réseau Tor.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "Se connecter">
<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur à besoin d'un proxy pour accéder à internet ?">
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index d88ff63..cc5228f 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "La connessione ad Internet di questo computer è censurata, filtrata, o passa attraverso un proxy.">
<!ENTITY torSettings.configurePrompt2 "Devo configurare le impostazioni di rete.">
<!ENTITY torSettings.configure "Configura">
-<!ENTITY torSettings.connectPrompt1 "La connessione ad internet di questo computer è priva di ostacoli.">
<!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "Connetti">
<!ENTITY torSettings.proxyQuestion "Questo computer usa un proxy per accedere ad Internet?">
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index c3c4245..976df97 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?¯æ¤?é?²ã??ã??ã?¦ã??ã??ã??ã??ã??ã?£ã?«ã?¿ã?¼ã??ã??ã?¦ã??ã??ã??ã??ã??ã?ã?ã?·ã??é??ã??ã?¾ã??ã??">
<!ENTITY torSettings.configurePrompt2 "ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??æ§?æ??ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??">
<!ENTITY torSettings.configure "æ§?æ??">
-<!ENTITY torSettings.connectPrompt1 "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?«ã?¯é??害ã??ã??ã??ã?¾ã??ã??ã??">
<!ENTITY torSettings.connectPrompt2 "Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸ç?´æ?¥æ?¥ç¶?ã??ã??ã??ã?§ã??ã??">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "��">
<!ENTITY torSettings.proxyQuestion "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã?¯ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?«ã?¢ã?¯ã?»ã?¹ã??ã??ã?®ã?«Proxyã??å¿?è¦?ã?§ã??ã??ï¼?">
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index acb43ea..91886b4 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "">
<!ENTITY torSettings.configurePrompt2 "">
<!ENTITY torSettings.configure "">
-<!ENTITY torSettings.connectPrompt1 "">
<!ENTITY torSettings.connectPrompt2 "">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "">
<!ENTITY torSettings.proxyQuestion "">
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 8208ff4..96cb0a2 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer wordt gecensureerd, gefilterd of geproxyed.">
<!ENTITY torSettings.configurePrompt2 "Ik moet netwerkinstellingen configureren.">
<!ENTITY torSettings.configure "Configureer">
-<!ENTITY torSettings.connectPrompt1 "De internetverbinding van deze computer is vrij van obstakels.">
<!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor netwerk verbinden.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "Verbind">
<!ENTITY torSettings.proxyQuestion "Heeft deze computer een proxy nodig om met het internet te verbinden?">
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index f395b2e..ffbd499 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "PoÅ?Ä?czenie tego komputera jest cenzurowane, filtrowane lub przekierowywane.">
<!ENTITY torSettings.configurePrompt2 "PotrzebujÄ? dostosowaÄ? ustawienia sieci.">
<!ENTITY torSettings.configure "Konfiguruj">
-<!ENTITY torSettings.connectPrompt1 "PoÅ?Ä?czenie internetowe jest wolne od przeszkód.">
<!ENTITY torSettings.connectPrompt2 "ChcÄ? poÅ?Ä?czyÄ? siÄ? bezpoÅ?rednio z sieciÄ? Tor.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "PoÅ?Ä?cz">
<!ENTITY torSettings.proxyQuestion "Czy ten komputer potrzebuje proxy w celu poÅ?Ä?czenia siÄ? z Internetem?">
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index 63cba8a..b743ce3 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "A ligação à Internet deste computador está a ser censurada, filtrada ou utilizada através de um proxy.">
<!ENTITY torSettings.configurePrompt2 "Preciso de configuar definições de rede.">
<!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt1 "A ligação à Internet deste computador está livre de obstáculos.">
<!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente à rede Tor.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "Ligar">
<!ENTITY torSettings.proxyQuestion "Este computador precisa de usar um proxy para aceder a Internet?">
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index 3bdd609..7c96ee2 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "Ð?нÑ?еÑ?неÑ?-Ñ?оединение Ñ?Ñ?ого компÑ?Ñ?Ñ?еÑ?а Ñ?ензÑ?Ñ?иÑ?Ñ?еÑ?Ñ?Ñ?, Ñ?илÑ?Ñ?Ñ?Ñ?еÑ?Ñ?Ñ? или наÑ?одÑ?Ñ?Ñ?Ñ? за пÑ?окÑ?и.">
<!ENTITY torSettings.configurePrompt2 "Ð?не нÑ?жно наÑ?Ñ?Ñ?оиÑ?Ñ? Ñ?еÑ?евÑ?е паÑ?амеÑ?Ñ?Ñ?.">
<!ENTITY torSettings.configure "Ð?аÑ?Ñ?Ñ?оиÑ?Ñ?">
-<!ENTITY torSettings.connectPrompt1 "Ð?нÑ?еÑ?неÑ?-Ñ?оединение Ñ?Ñ?ого компÑ?Ñ?Ñ?еÑ?а не имееÑ? огÑ?аниÑ?ений.">
<!ENTITY torSettings.connectPrompt2 "Я бÑ? Ñ?оÑ?ел Ñ?оединиÑ?Ñ?Ñ?Ñ? Ñ? Ñ?еÑ?Ñ?Ñ? Tor напÑ?Ñ?мÑ?Ñ?.">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "СоединиÑ?Ñ?Ñ?Ñ?">
<!ENTITY torSettings.proxyQuestion "ÐÑ?омÑ? компÑ?Ñ?Ñ?еÑ?Ñ? нÑ?жен пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ??">
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index 465f35b..7dfa6cc 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "">
<!ENTITY torSettings.configurePrompt2 "">
<!ENTITY torSettings.configure "">
-<!ENTITY torSettings.connectPrompt1 "">
<!ENTITY torSettings.connectPrompt2 "">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "">
<!ENTITY torSettings.proxyQuestion "">
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index eaeb77f..14b753d 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -11,8 +11,8 @@
<!ENTITY torSettings.configurePrompt1 "该计ç®?æ?ºç??ç½?ç»?è¿?æ?¥å??å?°å®¡æ?¥æ??è¿?滤ï¼?æ??è??é??è¦?使ç?¨ä»£ç??ã??">
<!ENTITY torSettings.configurePrompt2 "æ??é??è¦?é??ç½®ç½?ç»?设置ã??">
<!ENTITY torSettings.configure "é??ç½®">
-<!ENTITY torSettings.connectPrompt1 "该计ç®?æ?ºç??ç½?ç»?è¿?æ?¥æ¯«æ? é?»ç¢?ã??">
<!ENTITY torSettings.connectPrompt2 "æ??æ?³è¦?ç?´æ?¥è¿?æ?¥ Tor ç½?ç»?ã??">
+<!ENTITY torSettings.connectPrompt3 "">
<!ENTITY torSettings.connect "è¿?æ?¥">
<!ENTITY torSettings.proxyQuestion "该计ç®?æ?ºæ?¯å?¦é??è¦?é??è¿?代ç??访é?®äº?è??ç½?ï¼?">
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits