- tor-commits - lists.torproject.org

[stem/master] Improving system TRACE logging
by atagar＠torproject.org 06 Jan '12

06 Jan '12

commit 21e8f65ad3e981f0060eb0fc71c2c432f32194b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 5 18:39:41 2012 -0800 Improving system TRACE logging Showing request/reply with a debug level message for system calls with runtime is redundant. In case of a call failure we just need to give a debug, and in success we show the debug followed by an improved trace message. --- stem/util/system.py | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 5b6d9fe..3e086c7 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -582,22 +582,24 @@ def call(command, suppress_exc = True): try: start_time = time.time() - log.trace("Sent to system:\n" + command) stdout, stderr = subprocess.Popen(command.split(), stdout = subprocess.PIPE, stderr = subprocess.PIPE).communicate() stdout, stderr = stdout.strip(), stderr.strip() runtime = time.time() - start_time - if not stderr: - log.trace("Received from system:\n" + stdout) - else: - log.trace("Received from system:\nstdout: %s\nstderr: %s" % (stdout, stderr)) + log.debug("System call: %s (runtime: %0.2f)" % (command, runtime)) + trace_prefix = "Received from system (%s)" % command - log.debug("system call: %s (runtime: %0.2f)" % (command, runtime)) + if stdout and stderr: + log.trace(trace_prefix + ", stdout:\n%s\nstderr:\n%s" % (stdout, stderr)) + elif stdout: + log.trace(trace_prefix + ", stdout:\n%s" % stdout) + elif stderr: + log.trace(trace_prefix + ", stderr:\n%s" % stderr) if stdout: return stdout.split("\n") else: return [] except OSError, exc: - log.debug("system call (failed): %s (error: %s)" % (command, exc)) + log.debug("System call (failed): %s (error: %s)" % (command, exc)) if suppress_exc: return None else: raise exc

1 0

[stem/master] Replacing split("\n") with splitlines()
by atagar＠torproject.org 06 Jan '12

06 Jan '12

commit 1f13b0b665ca22fe11febeeb3d610f5852a3ba49 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 5 21:23:12 2012 -0800 Replacing split("\n") with splitlines() Oops, didn't spot that there was a str method for splitting on line breaks. This behaves slightly differently with respect to trailing newlines and preserving '\r\n' entries, but is something I should have been using... --- stem/util/system.py | 2 +- test/integ/socket/control_message.py | 2 +- test/output.py | 2 +- test/runner.py | 2 +- test/unit/socket/control_message.py | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 3e086c7..8eced97 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -596,7 +596,7 @@ def call(command, suppress_exc = True): elif stderr: log.trace(trace_prefix + ", stderr:\n%s" % stderr) - if stdout: return stdout.split("\n") + if stdout: return stdout.splitlines() else: return [] except OSError, exc: log.debug("System call (failed): %s (error: %s)" % (command, exc)) diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index 90ac623..d0c44dc 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -135,7 +135,7 @@ class TestControlMessage(unittest.TestCase): torrc_contents = [] - for line in runner.get_torrc_contents().split("\n"): + for line in runner.get_torrc_contents().splitlines(): line = line.strip() if line and not line.startswith("#"): diff --git a/test/output.py b/test/output.py index a22d738..3ebed9e 100644 --- a/test/output.py +++ b/test/output.py @@ -45,7 +45,7 @@ def apply_filters(testing_output, *filters): results = [] - for line in testing_output.split("\n"): + for line in testing_output.splitlines(): # determine the type of the line line_type = LineType.CONTENT diff --git a/test/runner.py b/test/runner.py index d6da306..10c4699 100644 --- a/test/runner.py +++ b/test/runner.py @@ -470,7 +470,7 @@ class Runner: _print_status("done\n", STATUS_ATTR, quiet) - for line in self._torrc_contents.strip().split("\n"): + for line in self._torrc_contents.strip().splitlines(): _print_status(" %s\n" % line.strip(), SUBSTATUS_ATTR, quiet) _print_status("\n", (), quiet) diff --git a/test/unit/socket/control_message.py b/test/unit/socket/control_message.py index 92d79c2..8bb6fef 100644 --- a/test/unit/socket/control_message.py +++ b/test/unit/socket/control_message.py @@ -77,7 +77,7 @@ class TestControlMessage(unittest.TestCase): # GETINFO version (basic single-line results) message = self.assert_message_parses(GETINFO_VERSION) self.assertEquals(2, len(list(message))) - self.assertEquals(2, len(str(message).split("\n"))) + self.assertEquals(2, len(str(message).splitlines())) # manually checks the contents contents = message.content() @@ -88,7 +88,7 @@ class TestControlMessage(unittest.TestCase): # GETINFO info/names (data entry) message = self.assert_message_parses(GETINFO_INFONAMES) self.assertEquals(2, len(list(message))) - self.assertEquals(8, len(str(message).split("\n"))) + self.assertEquals(8, len(str(message).splitlines())) # manually checks the contents contents = message.content() @@ -110,7 +110,7 @@ class TestControlMessage(unittest.TestCase): # causes a parsing error. This should test line endings for both data # entry parsing and non-data. - infonames_lines = [line + "\n" for line in GETINFO_INFONAMES.split("\n")[:-1]] + infonames_lines = [line + "\n" for line in GETINFO_INFONAMES.splitlines()] for i in range(len(infonames_lines)): # replace the CRLF for the line @@ -172,7 +172,7 @@ class TestControlMessage(unittest.TestCase): self.assertEqual(controller_reply, message.raw_content()) # checks that the contents match the input - message_lines = str(message).split("\n") + message_lines = str(message).splitlines() controller_lines = controller_reply.split("\r\n") controller_lines.pop() # the ControlMessage won't have a trailing newline

1 0

[stem/master] Moving log handlers to log util
by atagar＠torproject.org 06 Jan '12

06 Jan '12

commit 608a5371370796a3d6ace5deb54bc019783cf2c9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 5 22:42:33 2012 -0800 Moving log handlers to log util Adding a couple basic log handlers to the log util... log_to_stdout - sends further events to stdout (mostly intended for debugging at the interpretor) LogBuffer - simple handler used by the testing to buffer logged events so we can run over them later --- run_tests.py | 2 +- stem/util/log.py | 75 +++++++++++++++++++++++++++++++++++++++++++++++------ test/output.py | 26 +------------------ 3 files changed, 68 insertions(+), 35 deletions(-) diff --git a/run_tests.py b/run_tests.py index 8b59710..1b252df 100755 --- a/run_tests.py +++ b/run_tests.py @@ -208,7 +208,7 @@ if __name__ == '__main__': ) stem_logger = log.get_logger() - logging_buffer = test.output.LogBuffer(log.logging_level(logging_runlevel)) + logging_buffer = log.LogBuffer(logging_runlevel) stem_logger.addHandler(logging_buffer) if run_unit_tests: diff --git a/stem/util/log.py b/stem/util/log.py index 5c5815e..65d5659 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -8,6 +8,25 @@ runlevels being used as follows... INFO - high level library activity DEBUG - low level library activity TRACE - request/reply logging + +get_logger - provides the stem's Logger instance +logging_level - converts a runlevel to its logging number +escape - escapes special characters in a message in preparation for logging + +log - logs a message at the given runlevel +log_once - logs a message, deduplicating if it has already been logged +trace - logs a message at the TRACE runlevel +debug - logs a message at the DEBUG runlevel +info - logs a message at the INFO runlevel +notice - logs a message at the NOTICE runlevel +warn - logs a message at the WARN runlevel +error - logs a message at the ERROR runlevel + +LogBuffer - Buffers logged events so they can be iterated over. + |- is_empty - checks if there's events in our buffer + +- __iter__ - iterates over and removes the buffered events + +log_to_stdout - reports further logged events to stdout """ import logging @@ -76,6 +95,22 @@ def logging_level(runlevel): if runlevel: return LOG_VALUES[runlevel] else: return logging.FATAL + 5 +def escape(message): + """ + Escapes specific sequences for logging (newlines, tabs, carrage returns). + + Arguments: + message (str) - string to be escaped + + Returns: + str that is escaped + """ + + for pattern, replacement in (("\n", "\\n"), ("\r", "\\r"), ("\t", "\\t")): + message = message.replace(pattern, replacement) + + return message + def log(runlevel, message): """ Logs a message at the given runlevel. @@ -118,19 +153,41 @@ def notice(message): log(Runlevel.NOTICE, message) def warn(message): log(Runlevel.WARN, message) def error(message): log(Runlevel.ERROR, message) -def escape(message): +class LogBuffer(logging.Handler): + """ + Basic log handler that listens for stem events and stores them so they can be + read later. Log entries are cleared as they are read. """ - Escapes specific sequences for logging (newlines, tabs, carrage returns). - Arguments: - message (str) - string to be escaped + def __init__(self, runlevel): + logging.Handler.__init__(self, level = logging_level(runlevel)) + self.formatter = logging.Formatter( + fmt = '%(asctime)s [%(levelname)s] %(message)s', + datefmt = '%D %H:%M:%S') + + self._buffer = [] - Returns: - str that is escaped + def is_empty(self): + return not bool(self._buffer) + + def __iter__(self): + while self._buffer: + yield self.formatter.format(self._buffer.pop(0)) + + def emit(self, record): + self._buffer.append(record) + +def log_to_stdout(runlevel): """ + Logs further events to stdout. - for pattern, replacement in (("\n", "\\n"), ("\r", "\\r"), ("\t", "\\t")): - message = message.replace(pattern, replacement) + Arguments: + runlevel (Runlevel) - minimum runlevel a message needs to be to be logged + """ - return message + logging.basicConfig( + level = logging_level(runlevel), + format = '%(asctime)s [%(levelname)s] %(message)s', + datefmt = '%D %H:%M:%S', + ) diff --git a/test/output.py b/test/output.py index 3ebed9e..6c00d28 100644 --- a/test/output.py +++ b/test/output.py @@ -61,7 +61,7 @@ def apply_filters(testing_output, *filters): if line != None: results.append(line) - return "\n".join(results) + return "\n".join(results) + "\n" def colorize(line_type, line_content): """ @@ -134,27 +134,3 @@ class ErrorTracker: for error_line in self._errors: yield error_line -class LogBuffer(logging.Handler): - """ - Basic log handler that listens for all stem events and stores them so they - can be read later. Log entries are cleared as they are read. - """ - - def __init__(self, runlevel): - logging.Handler.__init__(self, level = runlevel) - self.formatter = logging.Formatter( - fmt = '%(asctime)s [%(levelname)s] %(message)s', - datefmt = '%D %H:%M:%S') - - self._buffer = [] - - def is_empty(self): - return not bool(self._buffer) - - def __iter__(self): - while self._buffer: - yield self.formatter.format(self._buffer.pop(0)) - - def emit(self, record): - self._buffer.append(record) -

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit 4d55e5ca57e5464f202c47b19dc7f28f8e4a53b1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 03:45:05 2012 +0000 Update translations for tsum --- tr/tsum.po | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tr/tsum.po b/tr/tsum.po index 45c7aef..91c9b03 100644 --- a/tr/tsum.po +++ b/tr/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-06 02:49+0000\n" +"PO-Revision-Date: 2012-01-06 03:20+0000\n" "Last-Translator: canacar <canacar(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -270,7 +270,7 @@ msgid "" "Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " "Erinn's key, run:" msgstr "" -"Tor Tarayıcı Paketini Erinn Clark 0x63FEE659 parmakizli anahtarı ile " +"Tor Tarayıcı Paketini Erinn Clark 0x63FEE659 etiketli anahtarı ile " "imzalamaktadır. Erinn'in anahtarını aşağıdaki komut ile yükleyebilirsiniz:" #. type: Plain text @@ -284,7 +284,8 @@ msgstr "" #. type: Plain text #: en/tsum.text:119 msgid "After importing the key, verify that the fingerprint is correct:" -msgstr "Anahtarı yükledikten sonra parmakizinin doğruluğunu kontrol edin:" +msgstr "" +"Anahtarı yükledikten sonra anahtarın parmakizinin doğruluğunu kontrol edin:" #. type: Plain text #: en/tsum.text:121 @@ -297,7 +298,9 @@ msgstr "" #. type: Plain text #: en/tsum.text:123 msgid "You should see:" -msgstr "Aşağıdaki çıktıyı görmelisiniz:" +msgstr "" +"Aşağıdaki çıktıyı görmelisiniz. *Key fingerprint* alanının doğruluğundan " +"emin olun:" #. type: Plain text #: en/tsum.text:130

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit bf91d9bf81b84eae671a1efd2f59bdef6b74ac92 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 03:15:04 2012 +0000 Update translations for tsum --- tr/tsum.po | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tr/tsum.po b/tr/tsum.po index 29ea1c6..45c7aef 100644 --- a/tr/tsum.po +++ b/tr/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-06 02:41+0000\n" +"PO-Revision-Date: 2012-01-06 02:49+0000\n" "Last-Translator: canacar <canacar(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -270,28 +270,34 @@ msgid "" "Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " "Erinn's key, run:" msgstr "" +"Tor Tarayıcı Paketini Erinn Clark 0x63FEE659 parmakizli anahtarı ile " +"imzalamaktadır. Erinn'in anahtarını aşağıdaki komut ile yükleyebilirsiniz:" #. type: Plain text #: en/tsum.text:117 #, no-wrap msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" msgstr "" +"»gpg --keyserver " +"hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" #. type: Plain text #: en/tsum.text:119 msgid "After importing the key, verify that the fingerprint is correct:" -msgstr "" +msgstr "Anahtarı yükledikten sonra parmakizinin doğruluğunu kontrol edin:" #. type: Plain text #: en/tsum.text:121 #, no-wrap msgid "\tgpg --fingerprint 0x63FEE659\n" msgstr "" +"»gpg --fingerprint " +"0x63FEE659\n" #. type: Plain text #: en/tsum.text:123 msgid "You should see:" -msgstr "" +msgstr "Aşağıdaki çıktıyı görmelisiniz:" #. type: Plain text #: en/tsum.text:130 @@ -304,6 +310,12 @@ msgid "" "\tuid Erinn Clark <erinn(a)double-helix.org>\n" "\tsub 2048R/EB399FD7 2003-10-16\n" msgstr "" +"»pub 2048R/63FEE659 2003-10-16\n" +"» Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"»uid Erinn Clark <erinn(a)torproject.org>\n" +"»uid Erinn Clark <erinn(a)debian.org>\n" +"»uid Erinn Clark <erinn(a)double-helix.org>\n" +"»sub 2048R/EB399FD7 2003-10-16\n" #. type: Plain text #: en/tsum.text:132

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit ff934ad33d996e6df1964214baee89bc34c335e6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 02:45:04 2012 +0000 Update translations for tsum --- tr/tsum.po | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tr/tsum.po b/tr/tsum.po index 3d7dab3..29ea1c6 100644 --- a/tr/tsum.po +++ b/tr/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-06 02:11+0000\n" +"PO-Revision-Date: 2012-01-06 02:41+0000\n" "Last-Translator: canacar <canacar(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -153,8 +153,9 @@ msgid "" "If you want a translated version of Tor, write **help** instead. You will " "then receive an email with instructions and a list of available languages." msgstr "" -"If you want a translated version of Tor, write **help** instead. You will " -"then receive an email with instructions and a list of available languages." +"Eğer Tor'un farklı dile çevrilmiş bir sürümünü istiyorsanız **help** yazın. " +"Yanıt olarak mevcut dil seçeneklerini ve indirme talimatlarını içeren bir " +"e-posta alacaksınız." #. type: Plain text #: en/tsum.text:67 @@ -227,6 +228,10 @@ msgid "" "will allow you to verify the file you've downloaded is exactly the one that " "we intended you to get." msgstr "" +"Yazılım ile birlikte paketle aynı ismi taşıyan ve **.asc** uzantılı bir " +"dosya daha alacaksınız. Bu .asc dosyası bir GPG imzasıdır. Bu imzayı kontrol" +" ederek indirdiğiniz dosyanın gerçekten bizim size gönderdiğiniz dosya " +"olduğundan emin olabilirsiniz." #. type: Plain text #: en/tsum.text:105 @@ -235,6 +240,8 @@ msgid "" "Before you can verify the signature, you will have to download and\n" "install GnuPG: \n" msgstr "" +"İmzayı kontrol etmek için GnuPG programını indirip kurmanız gerekmektedir:" +" \n" #. type: Plain text #: en/tsum.text:109 @@ -244,6 +251,9 @@ msgid "" "**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" "**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" msgstr "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: Pek çok Linux dağıtımı GnuPG kurulu olarak gelmektedir.\n" #. type: Plain text #: en/tsum.text:112 @@ -251,6 +261,8 @@ msgid "" "Please note that you may need to edit the paths and the commands used below " "to get it to work on your system." msgstr "" +"Aşağıdaki komutları ve dizin yollarını kendi sisteminizde çalışacak şekilde " +"değiştirmeniz gerekebilir." #. type: Plain text #: en/tsum.text:115

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit 891ddab0efd300f3032947909e9a1177f0a43a55 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 02:15:04 2012 +0000 Update translations for tsum --- tr/tsum.po | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/tr/tsum.po b/tr/tsum.po index 98400a6..3d7dab3 100644 --- a/tr/tsum.po +++ b/tr/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-06 01:39+0000\n" +"PO-Revision-Date: 2012-01-06 02:11+0000\n" "Last-Translator: canacar <canacar(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -83,10 +83,10 @@ msgid "" "traffic inside the Tor network, but it cannot encrypt your traffic between " "the Tor network and its final destination." msgstr "" -"Tor will anonymize the origin of your traffic, and it will encrypt " -"everything between you and the Tor network. Tor will also encrypt your " -"traffic inside the Tor network, but it cannot encrypt your traffic between " -"the Tor network and its final destination." +"Tor, Internet trafiğinizi Tor ağı üzerinden geçirdiği için bağlantıların " +"başlangıç noktasını belirsiz kılar. Bilgisayarınız ile Tor ağı arasındaki " +"tüm bağlantıları ve Tor ağı içerisindeki trafiği şifreler. Ancak Tor ağı " +"ile bağlantıların nihai hedefi arasındaki trafiği şifreleyemez." #. type: Plain text #: en/tsum.text:36 @@ -103,6 +103,8 @@ msgid "" "How to download Tor\n" "-------------------\n" msgstr "" +"Tor nasıl indirilir\n" +"-------------------\n" #. type: Plain text #: en/tsum.text:44 @@ -113,6 +115,11 @@ msgid "" "and requires no installation. You download the bundle, extract the archive, " "and start Tor." msgstr "" +"Kullanıcıların büyük çoğunluğu için [Tor Tarayıcı " +"Paketini](https://www.torproject.org/projects/torbrowser.html) tavsiye " +"ediyoruz. Bu paket Interneti Tor üzerinden kullanmanız için önceden " +"ayarlanmış, ayrıca kurulum gerektirmeyen bir tarayıcı içermektedir. " +"Kullanmak için paketi indirip, arşivi açarak Tor'u başlatmanız yeterlidir." #. type: Plain text #: en/tsum.text:48 @@ -136,6 +143,9 @@ msgid "" "**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " "**linux-x86_64** for 64-bit systems)." msgstr "" +"Tor Tarayıcı Paketini ayrıca Mac OS X (**macos-i386** yazarak), ve Linux " +"(32-bit sistemler için **linux-i386** veya 64-bit sistemler için **linux-" +"x86_64** yazarak) isteyebilirsiniz." #. type: Plain text #: en/tsum.text:61 @@ -143,6 +153,8 @@ msgid "" "If you want a translated version of Tor, write **help** instead. You will " "then receive an email with instructions and a list of available languages." msgstr "" +"If you want a translated version of Tor, write **help** instead. You will " +"then receive an email with instructions and a list of available languages." #. type: Plain text #: en/tsum.text:67

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit 4359110d5785805b840ff9e91d5ac67198308088 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 01:45:04 2012 +0000 Update translations for tsum --- tr/tsum.po | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tr/tsum.po b/tr/tsum.po index 8bd0c95..98400a6 100644 --- a/tr/tsum.po +++ b/tr/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-06 00:49+0000\n" +"PO-Revision-Date: 2012-01-06 01:39+0000\n" "Last-Translator: canacar <canacar(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -58,11 +58,14 @@ msgid "" "three random servers (also known as *relays*) in the Tor network, before the" " traffic is sent out onto the public Internet." msgstr "" +"Tor, Internet üzerinde kişisel gizliliğinizi ve güvenliğinizi arttıran bir " +"sanal tüneller ağıdır. Tor trafiğinizi rastgele seçilmiş üç sunucu üzerinden" +" Internete ulaştırır. Bu sunuculara *aktarıcı* (relay) adı da verilir." #. type: Plain text #: en/tsum.text:21 msgid "![How Tor Works](images/how-tor-works.png)" -msgstr "" +msgstr "![Tor Nasıl Çalışır](images/how-tor-works.png)" #. type: Plain text #: en/tsum.text:26 @@ -80,6 +83,10 @@ msgid "" "traffic inside the Tor network, but it cannot encrypt your traffic between " "the Tor network and its final destination." msgstr "" +"Tor will anonymize the origin of your traffic, and it will encrypt " +"everything between you and the Tor network. Tor will also encrypt your " +"traffic inside the Tor network, but it cannot encrypt your traffic between " +"the Tor network and its final destination." #. type: Plain text #: en/tsum.text:36

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit aa970f94512f7aabfe4ff75d44addfeb01442e1c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 01:15:03 2012 +0000 Update translations for tsum --- tr/tsum.po | 607 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 607 insertions(+), 0 deletions(-) diff --git a/tr/tsum.po b/tr/tsum.po new file mode 100644 index 0000000..8bd0c95 --- /dev/null +++ b/tr/tsum.po @@ -0,0 +1,607 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <canacar(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-05 17:16+0000\n" +"PO-Revision-Date: 2012-01-06 00:49+0000\n" +"Last-Translator: canacar <canacar(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. type: Plain text +#: en/tsum.text:2 +msgid "# The Short User Manual\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:7 +msgid "" +"This user manual contains information about how to download Tor, how to use " +"it, and what to do if Tor is unable to connect to the network. If you can't " +"find the answer to your question in this document, email " +"help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:11 +msgid "" +"Please note that we are providing support on a voluntary basis, and we get a" +" lot of emails every single day. There is no need to worry if we don't get " +"back to you straight away." +msgstr "" + +#. type: Plain text +#: en/tsum.text:13 +#, no-wrap +msgid "" +"How Tor works\n" +"-------------\n" +msgstr "" +"Tor nasıl çalışır\n" +"-------------\n" + +#. type: Plain text +#: en/tsum.text:19 +msgid "" +"Tor is a network of virtual tunnels that allows you to improve your privacy " +"and security on the Internet. Tor works by sending your traffic through " +"three random servers (also known as *relays*) in the Tor network, before the" +" traffic is sent out onto the public Internet." +msgstr "" + +#. type: Plain text +#: en/tsum.text:21 +msgid "![How Tor Works](images/how-tor-works.png)" +msgstr "" + +#. type: Plain text +#: en/tsum.text:26 +msgid "" +"The image above illustrates a user browsing to different websites over Tor. " +"The green monitors represent relays in the Tor network, while the three keys" +" represent the layers of encryption between the user and each relay." +msgstr "" + +#. type: Plain text +#: en/tsum.text:31 +msgid "" +"Tor will anonymize the origin of your traffic, and it will encrypt " +"everything between you and the Tor network. Tor will also encrypt your " +"traffic inside the Tor network, but it cannot encrypt your traffic between " +"the Tor network and its final destination." +msgstr "" + +#. type: Plain text +#: en/tsum.text:36 +msgid "" +"If you are communicating sensitive information, for example when logging on " +"to a website with a username and password, make sure that you are using " +"HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:38 +#, no-wrap +msgid "" +"How to download Tor\n" +"-------------------\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:44 +msgid "" +"The bundle we recommend to most users is the [Tor Browser " +"Bundle](https://www.torproject.org/projects/torbrowser.html). This bundle " +"contains a browser preconfigured to safely browse the Internet through Tor, " +"and requires no installation. You download the bundle, extract the archive, " +"and start Tor." +msgstr "" + +#. type: Plain text +#: en/tsum.text:48 +msgid "" +"There are two different ways to get hold of the Tor software. You can either" +" browse to the [Tor Project website](https://www.torproject.org/) and " +"download it there, or you can use GetTor, the email autoresponder." +msgstr "" + +#. type: Plain text +#: en/tsum.text:53 +msgid "" +"### How to get Tor via email\n" +"To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." +msgstr "" + +#. type: Plain text +#: en/tsum.text:57 +msgid "" +"You can also request the Tor Browser Bundle for Mac OS X (write " +"**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " +"**linux-x86_64** for 64-bit systems)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:61 +msgid "" +"If you want a translated version of Tor, write **help** instead. You will " +"then receive an email with instructions and a list of available languages." +msgstr "" + +#. type: Plain text +#: en/tsum.text:67 +#, no-wrap +msgid "" +"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" +"large, and you will not be able to receive any of these bundles with a\n" +"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" +"want, send an email to help(a)rt.torproject.org and we\n" +"will give you a list of website mirrors to use.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:73 +msgid "" +"#### How to get Tor as several small sized packages\n" +"It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." +msgstr "" + +#. type: Plain text +#: en/tsum.text:76 +msgid "" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:79 +#, no-wrap +msgid "" +"windows \n" +"split\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:83 +msgid "" +"It is important that you include the keyword *split* on its own line. See " +"*What to do with split packages* for information on how to unpack and re-" +"assemble the small sized packages." +msgstr "" + +#. type: Plain text +#: en/tsum.text:89 +msgid "" +"### Tor for smartphones\n" +"You can get Tor on your Android device by installing the package named *Orbot*. For information about how to download and install Orbot, please see the [Tor Project website](https://www.torproject.org/docs/android.html.en)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:93 +msgid "" +"We also have experimental packages for [Nokia " +"Maemo/N900](https://www.torproject.org/docs/N900.html.en) and [Apple " +"iOS](http://sid77.slackware.it/iphone/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:97 +msgid "" +"### How to verify that you have the right version\n" +"Before running the Tor Browser Bundle, you should make sure that you have the right version." +msgstr "" + +#. type: Plain text +#: en/tsum.text:102 +msgid "" +"The software you receive is accompanied by a file with the same name as the " +"bundle and the extension **.asc**. This .asc file is a GPG signature, and " +"will allow you to verify the file you've downloaded is exactly the one that " +"we intended you to get." +msgstr "" + +#. type: Plain text +#: en/tsum.text:105 +#, no-wrap +msgid "" +"Before you can verify the signature, you will have to download and\n" +"install GnuPG: \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:109 +#, no-wrap +msgid "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:112 +msgid "" +"Please note that you may need to edit the paths and the commands used below " +"to get it to work on your system." +msgstr "" + +#. type: Plain text +#: en/tsum.text:115 +msgid "" +"Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " +"Erinn's key, run:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:117 +#, no-wrap +msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:119 +msgid "After importing the key, verify that the fingerprint is correct:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:121 +#, no-wrap +msgid "\tgpg --fingerprint 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:123 +msgid "You should see:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:130 +#, no-wrap +msgid "" +"\tpub 2048R/63FEE659 2003-10-16\n" +"\t Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"\tuid Erinn Clark <erinn(a)torproject.org>\n" +"\tuid Erinn Clark <erinn(a)debian.org>\n" +"\tuid Erinn Clark <erinn(a)double-helix.org>\n" +"\tsub 2048R/EB399FD7 2003-10-16\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:132 +msgid "" +"To verify the signature of the package you downloaded, run the following " +"command:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:134 +#, no-wrap +msgid "" +"\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" +"US.exe\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:140 +msgid "" +"The output should say *\"Good signature\"*. A bad signature means that the " +"file may have been tampered with. If you see a bad signature, send details " +"about where you downloaded the package from, how you verified the signature," +" and the output from GnuPG in an email to help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:147 +msgid "" +"Once you have verified the signature and seen the *\"Good signature\"* " +"output, go ahead and extract the package archive. You should then see a " +"directory similar to **tor-browser_en-US**. Inside that directory is another" +" directory called **Docs**, which contains a file called **changelog**. You " +"want to make sure that the version number on the top line of the changelog " +"file matches the version number in the filename." +msgstr "" + +#. type: Plain text +#: en/tsum.text:153 +msgid "" +"### How to use the Tor Browser Bundle\n" +"After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called \"Start Tor Browser\" (or \"start-tor-browser\", depending on your operating system)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:160 +msgid "" +"When you start the Tor Browser Bundle, you will first see Vidalia start up " +"and connect you to the Tor network. After that, you will see a browser " +"confirming that you are now using Tor. This is done by displaying " +"[https://check.torproject.org/](https://check.torproject.org/). You can now " +"browse the Internet through Tor." +msgstr "" + +#. type: Plain text +#: en/tsum.text:163 +#, no-wrap +msgid "" +"*Please note that it is important that you use the browser that comes\n" +"with the bundle, and not your own browser.*\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:169 +msgid "" +"### What to do when Tor does not connect\n" +"Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see *How to use an open proxy* below." +msgstr "" + +#. type: Plain text +#: en/tsum.text:174 +msgid "" +"If your normal Internet connection is working, but Tor still can't connect " +"to the network, try the following; open the Vidalia control panel, click on " +"*Message Log* and select the *Advanced* tab. It may be that Tor won't " +"connect because:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:178 +#, no-wrap +msgid "" +"**Your system clock is off**: Make sure that the date and time on your\n" +"system is correct, and restart Tor. You may need to synchronize your\n" +"system clock with an Internet time server. \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:183 +#, no-wrap +msgid "" +"**You are behind a restrictive firewall**: To tell Tor to only try port\n" +"80 and port 443, open the Vidalia control panel, click on *Settings* and\n" +"*Network*, and tick the box that says *My firewall only lets me connect\n" +"to certain ports*. \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:187 +#, no-wrap +msgid "" +"**Your anti-virus program is blocking Tor**: Make sure that your\n" +"anti-virus program is not preventing Tor from making network\n" +"connections.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:191 +msgid "" +"If Tor still doesn't work, it's likely that your Internet Service Provider " +"(ISP) is blocking Tor. Very often this can be worked around with **Tor " +"bridges**, hidden relays that aren't as easy to block." +msgstr "" + +#. type: Plain text +#: en/tsum.text:195 +msgid "" +"If you need help with figuring out why Tor can't connect, send an email to " +"help(a)rt.torproject.org and include the relevant parts from the log file." +msgstr "" + +#. type: Plain text +#: en/tsum.text:203 +msgid "" +"### How to find a bridge\n" +"To use a bridge, you will first have to locate one; you can either browse to [bridges.torproject.org](https://bridges.torproject.org/), or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write **get bridges** in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address." +msgstr "" + +#. type: Plain text +#: en/tsum.text:208 +msgid "" +"Configuring more than one bridge address will make your Tor connection more " +"stable, in case some of the bridges become unreachable. There is no " +"guarantee that the bridge you are using now will work tomorrow, so you " +"should make a habit of updating your list of bridges every so often." +msgstr "" + +#. type: Plain text +#: en/tsum.text:214 +msgid "" +"### How to use a bridge\n" +"Once you have a set of bridges to use, open the Vidalia control panel, click on *Settings*, *Network* and tick the box that says *My ISP blocks connections to the Tor network*. Enter the bridges in the box below, hit *OK* and start Tor again." +msgstr "" + +#. type: Plain text +#: en/tsum.text:220 +msgid "" +"### How to use an open proxy\n" +"If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet." +msgstr "" + +#. type: Plain text +#: en/tsum.text:223 +msgid "" +"The steps below assume you have a functional Tor/Vidalia configuration, and " +"you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." +msgstr "" + +#. type: Bullet: '1. ' +#: en/tsum.text:235 +msgid "Open the Vidalia control panel, click on *Settings*." +msgstr "" + +#. type: Bullet: '2. ' +#: en/tsum.text:235 +msgid "Click *Network*. Select *I use a proxy to access the Internet*." +msgstr "" + +#. type: Plain text +#: en/tsum.text:235 +#, no-wrap +msgid "" +"3. On the *Address* line, enter the open proxy address. This can be a\n" +"hostname or an IP Address.\n" +"4. Enter the port for the proxy.\n" +"5. Generally, you do not need a username and password. If you do,\n" +"enter the information in the proper fields.\n" +"6. Choose the *Type* of proxy you are using, whether HTTP/HTTPS, SOCKS4,\n" +"or SOCKS5.\n" +"7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" +"proxy to access the rest of the Tor network.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:240 +msgid "" +"## Frequently Asked Questions\n" +"This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:244 +msgid "" +"### Unable to extract the archive\n" +"If you are using Windows and find that you cannot extract the archive, download and install [7-Zip](http://www.7-zip.org/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:248 +msgid "" +"If you are unable to download 7-Zip, try to rename the file from .z to .zip " +"and use winzip to extract the archive. Before renaming the file, tell " +"Windows to show file extensions:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:254 +msgid "" +"#### Windows XP\n" +"1. Open *My Computer*\n" +"2. Click on *Tools* and choose *Folder Options...* in the menu\n" +"3. Click on the *View* tab\n" +"4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:260 +msgid "" +"#### Windows Vista\n" +"1. Open *Computer*\n" +"2. Click on *Organize* and choose *Folder and search options* in the menu\n" +"3. Click on the *View* tab\n" +"4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:266 +msgid "" +"#### Windows 7\n" +"1. Open *Computer*\n" +"2. Click on *Organize* and choose *Folder and search options* in the menu\n" +"3. Click on the *View* tab\n" +" 4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:273 +msgid "" +"### What to do with split packages\n" +"When you request a split package, the parts may arrive out of order. You need to make sure you have received all the parts before you attempt to unpack them. Save all the parts into one directory on your computer, unzip them, and double-click the file that ends in \"..split.part01.exe\" to start the unpacking process." +msgstr "" + +#. type: Plain text +#: en/tsum.text:277 +msgid "" +"Once the unpacking process has completed, you should see a newly created " +"\".exe\" file in the same directory. Run this file and wait for the Tor " +"Browser Bundle to start." +msgstr "" + +#. type: Plain text +#: en/tsum.text:281 +msgid "" +"### Vidalia asks for a password\n" +"You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:287 +#, no-wrap +msgid "" +"**You are already running Vidalia and Tor**:\n" +"For example, this situation can happen if you installed the Vidalia\n" +"bundle and now you're trying to run the Tor Browser Bundle. In that\n" +"case, you will need to close the old Vidalia and Tor before you can run\n" +"this one.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:294 +#, no-wrap +msgid "" +"**Vidalia crashed, but left Tor running**:\n" +"If the dialog that prompts you for a control password has a Reset\n" +"button, you can click the button and Vidalia will restart Tor with a new\n" +"random control password. If you do not see a Reset button, or if Vidalia\n" +"is unable to restart Tor for you; go into your process or task manager,\n" +"and terminate the Tor process. Then use Vidalia to restart Tor.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:298 +msgid "" +"For more information, see the " +"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " +"Project website." +msgstr "" + +#. type: Plain text +#: en/tsum.text:303 +msgid "" +"### Flash does not work\n" +"For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity." +msgstr "" + +#. type: Plain text +#: en/tsum.text:308 +msgid "" +"Most YouTube videos work with HTML5, and it is possible to view these videos" +" over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" +" on the YouTube website before you can use the HTML5 player." +msgstr "" + +#. type: Plain text +#: en/tsum.text:312 +msgid "" +"Note that the browser will not remember that you joined the trial once you " +"close it, so you will need to re-join the trial the next time you run the " +"Tor Browser Bundle." +msgstr "" + +#. type: Plain text +#: en/tsum.text:315 +msgid "" +"Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" +"/torbutton-faq.html#noflash) for more information." +msgstr "" + +#. type: Plain text +#: en/tsum.text:321 +msgid "" +"### I want to use another browser\n" +"For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks." +msgstr "" + +#. type: Plain text +#: en/tsum.text:325 +msgid "" +"### Why Tor is slow\n" +"Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!" +msgstr "" + +

1 0

r25287: {website} make the links for osx vidalia bundles actually work (website/trunk/include)
by Roger Dingledine 06 Jan '12

06 Jan '12

Author: arma Date: 2012-01-05 23:45:04 +0000 (Thu, 05 Jan 2012) New Revision: 25287 Modified: website/trunk/include/versions.wmi Log: make the links for osx vidalia bundles actually work Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-01-05 18:46:55 UTC (rev 25286) +++ website/trunk/include/versions.wmi 2012-01-05 23:45:04 UTC (rev 25287) @@ -83,13 +83,13 @@ <define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.15-1.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.15-i386-1.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.15-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> -<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.15-i386-1.dmg</define-tag> +<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.15-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.15-ppc-1.dmg</define-tag> -<define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.15-ppc-1.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.15-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.15-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag> <define-tag package-osx-x86-alpha whitespace=delete>../dist/osx-x86/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag>

1 0