commit b84f602123f3acbb81419376191f377a770f6208 Author: Kathy Brade brade@pearlcrescent.com 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 "该计算机是否需要通过代理访问互联网？">