February 2014 - tor-commits - lists.torproject.org

[tor-launcher/master] Bug #10610: Users don't know if free of obstacles
by brade＠torproject.org 13 Feb '14

13 Feb '14

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

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit e08c5c7e1621ecfb2dc2c3b6e41eadf5a1100955 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 14:15:15 2014 +0000 Update translations for torcheck_completed --- de/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torcheck.po b/de/torcheck.po index ff5958b..5b4f0e0 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-02-13 13:41+0000\n" +"PO-Revision-Date: 2014-02-13 13:50+0000\n" "Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 882364fc580d9b767c4d8b6cbb08c5a96db25c44 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 14:15:13 2014 +0000 Update translations for torcheck --- de/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torcheck.po b/de/torcheck.po index ff5958b..5b4f0e0 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-02-13 13:41+0000\n" +"PO-Revision-Date: 2014-02-13 13:50+0000\n" "Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 2fac4eb67bbcd0508fb620fd06ff2d6a60a7f73c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 14:15:06 2014 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 5caa011..6bd25cf 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-02-13 13:44+0000\n" +"PO-Revision-Date: 2014-02-13 14:00+0000\n" "Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -30,11 +30,11 @@ msgstr "'브릿지'란?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "중계 서버 브릿지 %s 중에서, %s 가 여러분의 검열 우회를 도와줄 수 있는 Tor 중계 서버 입니다." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "브릿지를 얻는 다른 방법이 없을까요?" #: lib/bridgedb/templates/base.html:40 #, python-format @@ -46,7 +46,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "브릿지가 맛이 갔어요! 도와줘요!" #: lib/bridgedb/templates/base.html:49 #, python-format

1 0

[flashproxy/master] remove one last use of `sed -r` and fix replacement snippet to apply to the plain non-Debianised package
by infinity0＠torproject.org 13 Feb '14

13 Feb '14

commit 14dadf0fe2d4e284decaa478b1a227c51c2a2d24 Author: Ximin Luo <infinity0(a)torproject.org> Date: Thu Feb 13 14:09:51 2014 +0000 remove one last use of `sed -r` and fix replacement snippet to apply to the plain non-Debianised package --- proxy/modules/nodejs/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/proxy/modules/nodejs/Makefile b/proxy/modules/nodejs/Makefile index a8f7f76..af8f019 100644 --- a/proxy/modules/nodejs/Makefile +++ b/proxy/modules/nodejs/Makefile @@ -11,8 +11,7 @@ flashproxy.js: $(topsrcdir)/proxy/flashproxy.js cp -f $< $@ flashproxy.1: main.js flashproxy.js $(topsrcdir)/mkman.sh $(topsrcdir)/mkman.inc Makefile - ./main.js --help \ - | sed -re 's,/\S+/nodejs ./main.js,flashproxy,g' \ + ./main.js --help | sed -e 's,node ./main.js,flashproxy,g' \ | $(topsrcdir)/mkman.sh flashproxy "$(VERSION)" "The flashproxy standalone nodejs proxy" "$(VERSION)" > "$@" clean:

1 0

[flashproxy/master] use BRE instead of ERE to support FreeBSD better
by infinity0＠torproject.org 13 Feb '14

13 Feb '14

commit a0655ccaef30d56456e41911b74a9bb917fd103c Author: Ximin Luo <infinity0(a)torproject.org> Date: Thu Feb 13 13:54:19 2014 +0000 use BRE instead of ERE to support FreeBSD better --- mkman.sh | 6 +++--- proxy/modules/nodejs/Makefile | 2 +- version.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkman.sh b/mkman.sh index 1087e41..107466c 100755 --- a/mkman.sh +++ b/mkman.sh @@ -24,13 +24,13 @@ EOF # Fixes some help2man quirks, see `man man` help2man_fixup() { - sed -re ' + sed -e ' # restricted to usage synopsis section -/^\.SH SYNOPSIS$/,/^\.SH \w+$/{ +/^\.SH SYNOPSIS$/,/^\.SH [A-Z][A-Z]*$/{ # change hypenated parameters to bold, "type exactly as shown" s/\\fI\-/\\fB\-/g; # change ALL-CAPS parameters to italic, "replace with appropriate argument" - s/\b([A-Z]+)\b/\\fI\1\\fR/g; + s/\b$[A-Z][A-Z]*$\b/\\fI\1\\fR/g; }' } diff --git a/proxy/modules/nodejs/Makefile b/proxy/modules/nodejs/Makefile index 4c93948..a8f7f76 100644 --- a/proxy/modules/nodejs/Makefile +++ b/proxy/modules/nodejs/Makefile @@ -2,7 +2,7 @@ topsrcdir = ../../.. ALL_DST = flashproxy.js flashproxy.1 -VERSION = $(shell sed -nre 's/^\s*"version"\s*:\s*"([^"]+)".*/\1/gp' package.json) +VERSION = $(shell sed -ne 's/^[[:space:]]*"version"[[:space:]]*:[[:space:]]*"$[^"][^"]*$".*/\1/gp' package.json) all: $(ALL_DST) diff --git a/version.sh b/version.sh index 87cf555..d69dc64 100755 --- a/version.sh +++ b/version.sh @@ -1,3 +1,3 @@ #!/bin/sh # Read version from the ChangeLog to avoid repeating in multiple build scripts -sed -nre 's/^Changes .* version (.+)$/\1/g;tx;b;:x p;q' ChangeLog +sed -ne 's/^Changes .* version $..*$$/\1/g;tx;b;:x p;q' ChangeLog

1 0

[flashproxy/master] fix bug that was causing mkman to screw with the section headings
by infinity0＠torproject.org 13 Feb '14

13 Feb '14

commit d67a8f8bdea1e64ec7370ab677e7b3e0b0d37920 Author: Ximin Luo <infinity0(a)torproject.org> Date: Thu Feb 13 14:05:49 2014 +0000 fix bug that was causing mkman to screw with the section headings --- mkman.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkman.sh b/mkman.sh index 107466c..40bc372 100755 --- a/mkman.sh +++ b/mkman.sh @@ -25,13 +25,13 @@ EOF # Fixes some help2man quirks, see `man man` help2man_fixup() { sed -e ' -# restricted to usage synopsis section -/^\.SH SYNOPSIS$/,/^\.SH [A-Z][A-Z]*$/{ +# restricted to usage parameters +/^\.SH SYNOPSIS$/,/^\.SH [A-Z][A-Z]*$/{/^[^.]/{ # change hypenated parameters to bold, "type exactly as shown" s/\\fI\-/\\fB\-/g; # change ALL-CAPS parameters to italic, "replace with appropriate argument" s/\b$[A-Z][A-Z]*$\b/\\fI\1\\fR/g; -}' +}}' } prog="$1"

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 96b0d69d096cdb302b60913bb4ef41cba6b91a14 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 13:45:49 2014 +0000 Update translations for tor-launcher-progress_completed --- de/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/progress.dtd b/de/progress.dtd index 2f7e4b7..ef88ba1 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 "Mit dem Tor-Netzwerk verbinden"> +<!ENTITY torprogress.heading "Zum Tor-Netzwerk wird verbinden"> <!ENTITY torprogress.pleaseWait "Der Tor-Browser wird sich öffnen, sobald eine Verbindung zum Tor-Netzwerk hergestellt ist.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 0e216c76df833ec1a7d6469bfa56787f0a77b368 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 13:45:47 2014 +0000 Update translations for tor-launcher-progress --- de/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/progress.dtd b/de/progress.dtd index 2f7e4b7..ef88ba1 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 "Mit dem Tor-Netzwerk verbinden"> +<!ENTITY torprogress.heading "Zum Tor-Netzwerk wird verbinden"> <!ENTITY torprogress.pleaseWait "Der Tor-Browser wird sich öffnen, sobald eine Verbindung zum Tor-Netzwerk hergestellt ist.">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 7e9054d5f3d4c57bdad0e786080d6d448e3867b2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 13:45:44 2014 +0000 Update translations for tor-launcher-properties_completed --- de/torlauncher.properties | 20 ++++++++++---------- fr_CA/torlauncher.properties | 3 ++- sv/torlauncher.properties | 25 +++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index 801cca2..dd8e7e3 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -31,16 +31,16 @@ torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S -torlauncher.bootstrapStatus.conn_dir=Verbinde zu einem Verzeichnis -torlauncher.bootstrapStatus.handshake_dir=Stelle eine verschlüsselte Verbindung zu einem Verzeichnis her -torlauncher.bootstrapStatus.requesting_status=Erfrage Netzwerkstatusdatei -torlauncher.bootstrapStatus.loading_status=Lade Netzwerkstatusdatei -torlauncher.bootstrapStatus.loading_keys=Lade Zertifikate der zentralen Verzeichnisse -torlauncher.bootstrapStatus.requesting_descriptors=Fordere Verteiler-Informationen an -torlauncher.bootstrapStatus.loading_descriptors=Lade Verteiler-Informationen -torlauncher.bootstrapStatus.conn_or=Mit dem Tor-Netzwerk verbinden -torlauncher.bootstrapStatus.handshake_or=Erstelle einen Tor-Circuit -torlauncher.bootstrapStatus.done=Verbindung zum Tor-Netzwerk hergestellt! +torlauncher.bootstrapStatus.conn_dir=Zu einem Relaisverzeichnis wird verbunden +torlauncher.bootstrapStatus.handshake_dir=Es wird eine verschlüsselte Verbindung zu einem Verzeichnis hergestellt +torlauncher.bootstrapStatus.requesting_status=Netzwerkstatus wird abgerufen +torlauncher.bootstrapStatus.loading_status=Netzwerkstatus wird geladen +torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden geladen +torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert +torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen +torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbinden +torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt +torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wird verbunden! torlauncher.bootstrapWarning.done=abgeschlossen torlauncher.bootstrapWarning.connectrefused=Verbindung verweigert diff --git a/fr_CA/torlauncher.properties b/fr_CA/torlauncher.properties index e652180..4ccf11d 100644 --- a/fr_CA/torlauncher.properties +++ b/fr_CA/torlauncher.properties @@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor a quitté de manière imprévue. torlauncher.please_restart_app=Veuillez redémarrer cette application. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. -torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor (%S). +torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. +torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est manquant. diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index e1a4e63..dbe74df 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor stängdes av oväntat. torlauncher.please_restart_app=Var god starta om det här programmet. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. -torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en Tor nätverksanslutning.\n\n%S +torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en anslutning till Tor nätverket. +torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. @@ -29,3 +30,23 @@ torlauncher.quit_win=Stäng torlauncher.done=Klar torlauncher.forAssistance=För assistans, kontakta %S + +torlauncher.bootstrapStatus.conn_dir=Ansluter till en reläkatalog +torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning +torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatus +torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus +torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat +torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation +torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation +torlauncher.bootstrapStatus.conn_or=Ansluter till Tor nätverket +torlauncher.bootstrapStatus.handshake_or=Skapar en Torkrets +torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! + +torlauncher.bootstrapWarning.done=klar +torlauncher.bootstrapWarning.connectrefused=anslutningen vägrades +torlauncher.bootstrapWarning.misc=blandat +torlauncher.bootstrapWarning.resourcelimit=otillräckliga resurser +torlauncher.bootstrapWarning.identity=identitet felmatchad +torlauncher.bootstrapWarning.timeout=tidsgränsen överskreds +torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas +torlauncher.bootstrapWarning.ioerror=läs-/skrivfel

1 0