December 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Put the asciidoc command on one line.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 2ad69d57884fafac6fdd9cd43cedaf523c0bcbd5 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:50:16 2012 -0800 Put the asciidoc command on one line. --- Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9787571..1afc93a 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,7 @@ all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) %.1: %.1.txt rm -f $@ - a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ - -d manpage -f manpage $< + a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" -d manpage -f manpage $< install: mkdir -p $(BINDIR)

1 0

[flashproxy/master] Put clean and test at the end of Makefile.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 95e0e74738ff20bbd52428cdc4bfc7ddc3653d32 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:49:36 2012 -0800 Put clean and test at the end of Makefile. --- Makefile | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a4682cd..9787571 100644 --- a/Makefile +++ b/Makefile @@ -22,15 +22,6 @@ install: cp -f $(CLIENT_BIN) $(BINDIR) cp -f $(CLIENT_MAN) $(MANDIR)/man1 -clean: - rm -f *.pyc - rm -rf dist - -test: - ./flashproxy-client-test - cd facilitator && ./facilitator-test - cd proxy && ./flashproxy-test.js - DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) dist: $(CLIENT_MAN) @@ -49,4 +40,13 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip -.PHONY: all install clean test dist sign +clean: + rm -f *.pyc + rm -rf dist + +test: + ./flashproxy-client-test + cd facilitator && ./facilitator-test + cd proxy && ./flashproxy-test.js + +.PHONY: all install dist sign clean test

1 0

[flashproxy/master] Put VERSION at the top of Makefile.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 7cc090c74ad4c60ec3aab8dacf98c8b6c848acf6 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:56:48 2012 -0800 Put VERSION at the top of Makefile. --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1afc93a..46f621c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ +VERSION = 0.8 + PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man -VERSION = 0.8 - CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Dec '12

02 Dec '12

commit ce4160c1e9b0a4ec9e110f22d7708cd6f971c5c6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 2 22:15:56 2012 +0000 Update translations for liveusb-creator --- ru/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index cec7f39..cbec9cf 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-12-02 21:45+0000\n" +"PO-Revision-Date: 2012-12-02 21:49+0000\n" "Last-Translator: ddark008 <i(a)ddark008.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "Внимание: Для работы требуются права Администратора. Что бы получить их, нажмите правой клавишей на иконку приложения и откройте Свойства. В вкладке Совместимость, поставьте галочку на \"Выполнять эту программу от имени администратора\"." #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 02 Dec '12

02 Dec '12

commit 44ef3c5a258ef7364be11ba3f0d254b8a11727ac Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 2 21:46:00 2012 +0000 Update translations for tails-greeter_completed --- ru/ru.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/ru/ru.po b/ru/ru.po new file mode 100644 index 0000000..44d1ea2 --- /dev/null +++ b/ru/ru.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <i(a)ddark008.ru>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2012-12-02 21:41+0000\n" +"Last-Translator: ddark008 <i(a)ddark008.ru>\n" +"Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Вход" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Добро пожаловать в Tails" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Использовать постоянную память?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Да" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Нет" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Пароль" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Только для чтения?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "Больше опций?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Пароль администратора" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Введите пароль администратора для выполнения администрирования. \n В противном случае администрирование будет отключено в целях безопасности." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Пароль:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Повторный ввод пароля:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Маскировка под Windows" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Благодаря этой опции, Tails выглядит похожим на Microsoft Windows XP. Это может быть полезным при использовании в публичных местах для маскировки." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Активировать маскировку под Microsoft Windows XP" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Язык" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Место" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Раскладка" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "Пароли не совпадают" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist не сработал, код ошибки %(returncode)s:\n %(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup не сработал, код ошибки %(returncode)s:\n %(stdout)s\n %(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist не сработал, код ошибки %(returncode)s:\n %(stdout)s\n %(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Неправильный пароль. Попробуйте снова." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Другое..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 02 Dec '12

02 Dec '12

commit 25cbde02a6e3c5a5d99feaab14ff2f8e821a1e4c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 2 21:45:58 2012 +0000 Update translations for tails-greeter --- ru/ru.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 4dfa5dc..44d1ea2 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <i(a)ddark008.ru>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-10-03 18:25+0000\n" -"Last-Translator: Tor Project <tor-assistants(a)torproject.org>\n" +"PO-Revision-Date: 2012-12-02 21:41+0000\n" +"Last-Translator: ddark008 <i(a)ddark008.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,7 +50,7 @@ msgstr "Только для чтения?" #: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/persistencewindow.glade.h:9 msgid "More options?" @@ -75,17 +76,17 @@ msgstr "Повторный ввод пароля:" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" -msgstr "Камуфляж под Windows" +msgstr "Маскировка под Windows" #: ../glade/optionswindow.glade.h:10 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Благодаря этой опции Tails выглядит более похожей на Microsoft Windows XP. Это может быть полезным при использовании в публичных местах во избежание подозрений." +msgstr "Благодаря этой опции, Tails выглядит похожим на Microsoft Windows XP. Это может быть полезным при использовании в публичных местах для маскировки." #: ../glade/optionswindow.glade.h:11 msgid "Activate Microsoft Windows XP Camouflage" -msgstr "Активировать камуфляж под Microsoft Windows XP" +msgstr "Активировать маскировку под Microsoft Windows XP" #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Dec '12

02 Dec '12

commit fd3b8bc29c5f0196c015c225bb10b8fd0fd2d9b5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 2 21:45:54 2012 +0000 Update translations for liveusb-creator --- ru/ru.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index b6a028c..cec7f39 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -5,6 +5,7 @@ # Translators: # Anatoliy Guskov <anatoliy.guskov(a)gmail.com>, 2009. # Den Arefyev <>, 2012. +# <i(a)ddark008.ru>, 2012. # <vlasok1987(a)yandex.ru>, 2012. # Yulia <ypoyarko(a)redhat.com>, 2009. msgid "" @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-11-06 07:52+0000\n" -"Last-Translator: Den Arefyev <>\n" +"PO-Revision-Date: 2012-12-02 21:45+0000\n" +"Last-Translator: ddark008 <i(a)ddark008.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "Загрузка %s..." #: ../liveusb/gui.py:197 #, python-format msgid "Device is too small: it must be at least %s MiB." -msgstr "" +msgstr "Свободного места не хватает: должно быть не менее %s мебибайт." #: ../liveusb/gui.py:226 msgid ""

1 0

[flashproxy/master] Comment typo.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit bac0a655694159085572d666c42207ede294a382 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 11:04:04 2012 -0800 Comment typo. --- experiments/common.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index 258f9bd..0d108dd 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -40,7 +40,7 @@ browser_goto() { # Run a command and get the "real" part of time(1) output as a number of # seconds. real_time() { - # Make a spare copy of stderr (fd 1). + # Make a spare copy of stderr (fd 2). exec 3>&2 # Point the subcommand's stderr to our copy (fd 3), and extract the # original stderr (fd 2) output of time.

1 0

[ooni-probe/master] Remove doc reference to relocated module config
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 7026a212b9a95de5f2abb94cfe1832a3cd2289f2 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:18:27 2012 +0000 Remove doc reference to relocated module config --- docs/source/api/ooni.utils.rst | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/docs/source/api/ooni.utils.rst b/docs/source/api/ooni.utils.rst index 9f8b374..4097f24 100644 --- a/docs/source/api/ooni.utils.rst +++ b/docs/source/api/ooni.utils.rst @@ -16,14 +16,6 @@ utils Package :undoc-members: :show-inheritance: -:mod:`config` Module --------------------- - -.. automodule:: ooni.utils.config - :members: - :undoc-members: - :show-inheritance: - :mod:`date` Module ------------------

1 0

[ooni-probe/master] Remove doc reference to unused module txtraceroute
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 5390ba219029878f5cc42e7dc92222a7878684b9 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:16:35 2012 +0000 Remove doc reference to unused module txtraceroute --- docs/source/api/ooni.lib.rst | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/docs/source/api/ooni.lib.rst b/docs/source/api/ooni.lib.rst index 2fdb61f..7ba586d 100644 --- a/docs/source/api/ooni.lib.rst +++ b/docs/source/api/ooni.lib.rst @@ -8,13 +8,3 @@ lib Package :members: :undoc-members: :show-inheritance: - -:mod:`txtraceroute` Module --------------------------- - -.. automodule:: ooni.lib.txtraceroute - :members: - :undoc-members: - :show-inheritance: - -

1 0