September 2013 - tor-commits - lists.torproject.org

[stem/master] Adding stem.util.system.get_name_by_pid()
by atagar＠torproject.org 02 Sep '13

02 Sep '13

commit 032df08a5591afaf810dabdbca9177fcc528a7ee Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 2 13:16:00 2013 -0700 Adding stem.util.system.get_name_by_pid() Function for getting the command running under a given pid. This is the inverse of get_pid_by_name(). --- docs/change_log.rst | 1 + stem/util/system.py | 42 ++++++++++++++++++++++++++++++++++++++++++ test/unit/util/system.py | 23 +++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index a368eb0..75a5e81 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -60,6 +60,7 @@ The following are only available within stem's `git repository * :func:`~stem.util.system.set_process_name` inserted spaces between characters (:trac:`8631`) * :func:`~stem.util.system.get_pid_by_name` can now pull for all processes with a given name * :func:`~stem.util.system.call` ignored the subprocess' exit status + * Added :func:`stem.util.system.get_name_by_pid` * Added :func:`stem.util.system.get_user` * Added :func:`stem.util.system.get_start_time` * Added :func:`stem.util.system.get_bsd_jail_path` diff --git a/stem/util/system.py b/stem/util/system.py index fcec8d1..01eea06 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -16,6 +16,7 @@ best-effort, providing **None** if the lookup fails. is_available - determines if a command is available on this system is_running - determines if a given process is running + get_name_by_pid - gets the name for a process by the given pid get_pid_by_name - gets the pid for a process by the given name get_pid_by_port - gets the pid for a process listening to a given port get_pid_by_open_file - gets the pid for the process with an open file @@ -60,6 +61,7 @@ SHELL_COMMANDS = ['ulimit'] IS_RUNNING_PS_LINUX = "ps -A co command" IS_RUNNING_PS_BSD = "ps -ao ucomm=" +GET_NAME_BY_PID_PS = "ps -p %s -o comm" GET_PID_BY_NAME_PGREP = "pgrep -x %s" GET_PID_BY_NAME_PIDOF = "pidof %s" GET_PID_BY_NAME_PS_LINUX = "ps -o pid -C %s" @@ -225,6 +227,46 @@ def is_running(command): return None +def get_name_by_pid(pid): + """ + Attempts to determine the name a given process is running under (not + including arguments). This uses... + + :: + + 1. Information from /proc + 2. ps -p <pid> -o command + + :param int pid: process id of the process to be queried + + :returns: **str** with the process name, **None** if it can't be determined + """ + + process_name = None + + if stem.util.proc.is_available(): + try: + process_name = stem.util.proc.get_stats(pid, stem.util.proc.Stat.COMMAND)[0] + except IOError: + pass + + # attempts to resolve using ps, failing if: + # - system's ps variant doesn't handle these flags (none known at the moment) + # + # example output: + # atagar@morrigan:~$ ps -p 5767 -o comm + # COMMAND + # vim + + if not process_name: + results = call(GET_NAME_BY_PID_PS % pid) + + if results and len(results) == 2 and results[0] == 'COMMAND': + process_name = results[1].strip() + + return process_name + + def get_pid_by_name(process_name, multiple = False): """ Attempts to determine the process id for a running process, using... diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 628ab71..36204f6 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -134,6 +134,29 @@ class TestSystem(unittest.TestCase): self.assertEquals(None, system.is_running("irssi")) @patch('stem.util.system.call') + @patch('stem.util.proc.is_available', Mock(return_value = False)) + @patch('stem.util.system.is_available', Mock(return_value = True)) + def test_get_name_by_pid_ps(self, call_mock): + """ + Tests the get_name_by_pid function with ps responses. + """ + + responses = { + "success": ["COMMAND", "vim"], + "malformed_command_1": ["COMMAND"], + "malformed_command_2": ["foobar"], + "malformed_command_3": ["NOT_COMMAND", "vim"], + "no_results": [], + "command_fails": None, + } + + call_mock.side_effect = mock_call(system.GET_NAME_BY_PID_PS, responses) + + for test_input in responses: + expected_response = "vim" if test_input == "success" else None + self.assertEquals(expected_response, system.get_name_by_pid(test_input)) + + @patch('stem.util.system.call') @patch('stem.util.system.is_available', Mock(return_value = True)) def test_get_pid_by_name_pgrep(self, call_mock): """

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 02 Sep '13

02 Sep '13

commit 17a35e02b0ac21ae24ac66e2df158044d78a2d12 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 2 16:46:37 2013 +0000 Update translations for tor-launcher-network-settings --- he/network-settings.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/he/network-settings.dtd b/he/network-settings.dtd index 19d4ca1..97008aa 100644 --- a/he/network-settings.dtd +++ b/he/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "הגדרות רשת Tor">  @@ -10,8 +10,8 @@ <!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר את המצב שלך באופן הטוב ביותר?"> <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 "עלי להגדיר הגדרות רשת תקשורת."> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> +<!ENTITY torSettings.configure "הגדר"> +<!ENTITY torSettings.connectPrompt1 "חיבור האינטרנט של חשב זה הינו נקי ממכשולים."> <!ENTITY torSettings.connectPrompt2 "ברצוני להתחבר ישירות אל הרשת Tor."> <!ENTITY torSettings.connect "התחבר"> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion ""> <!ENTITY torSettings.firewallHelp ""> <!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.bridgeQuestion "המידה וחיבור האינטרנט של מחשב זה הינו מצונזר, יהיה עליך להשיג ולהשתמש בממסרי גשר.&#160; היה ולא, פשוט לחץ על התחבר.">  @@ -30,8 +30,8 @@ <!ENTITY torsettings.optional "רשות"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "מחשב זה צריך להשתמש בפרוקסי כדי לגשת אל האינטרנט"> +<!ENTITY torsettings.useProxy.type "טיפוס פרוקסי:"> <!ENTITY torsettings.useProxy.address "כתובת:"> <!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח"> <!ENTITY torsettings.useProxy.port "יציאה:"> @@ -42,13 +42,13 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox ""> <!ENTITY torsettings.firewall.allowedPorts "יציאות מורשות:"> -<!ENTITY torsettings.useBridges.checkbox ""> +<!ENTITY torsettings.useBridges.checkbox "ספק האינטרנט שלי (ISP) חוסם חיבורים אל הרשת Tor"> <!ENTITY torsettings.useBridges.label ""> <!ENTITY torsettings.useBridges.placeholder ""> <!ENTITY torsettings.copyLog "העתק את יומן Tor אל לוח גזירה"> -<!ENTITY torsettings.bridgeHelpTitle ""> +<!ENTITY torsettings.bridgeHelpTitle "עזרת ממסר גשר"> <!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> +<!ENTITY torsettings.bridgeHelp2 "כדי להשיג ממסרי גשר, השתמש בדפדפן רשת בכדי לבקר בעמוד הבא: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 "">

1 0

[stem/master] Replacing DIRECTORY_AUTHORITIES constant with get_authorities()
by atagar＠torproject.org 02 Sep '13

02 Sep '13

commit 26dadd28e70efc5fac826b62bf4f4b35b7acadeb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 2 09:30:34 2013 -0700 Replacing DIRECTORY_AUTHORITIES constant with get_authorities() On reflection a DIRECTORY_AUTHORITIES constant is not something I want to vend in our next stem release. That would make it tricky to be flexible about where we get that information. For instance, we might want to get this from tor itself (if that ever becomes an option), or possibly a config file rather than hardcoded dict. --- stem/descriptor/remote.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index ad7a953..6b4a6da 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -42,6 +42,8 @@ itself... :: + get_authorities - Provides tor directory information. + DirectoryAuthority - Information about a tor directory authority. Query - Asynchronous request to download tor descriptors @@ -66,11 +68,6 @@ itself... Maximum number of microdescriptors that can requested at a time by their hashes. - -.. data:: DIRECTORY_AUTHORITIES - - Mapping of nicknames to the associated - :class:`~stem.descriptor.remote.DirectoryAuthority`. """ import io @@ -341,7 +338,7 @@ class Query(object): """ if use_authority or not self.endpoints: - authority = random.choice(filter(HAS_V3IDENT, DIRECTORY_AUTHORITIES.values())) + authority = random.choice(filter(HAS_V3IDENT, get_authorities().values())) address, dirport = authority.address, authority.dir_port else: address, dirport = random.choice(self.endpoints) @@ -391,7 +388,7 @@ class DescriptorDownloader(object): def __init__(self, use_mirrors = False, **default_args): self._default_args = default_args - authorities = filter(HAS_V3IDENT, DIRECTORY_AUTHORITIES.values()) + authorities = filter(HAS_V3IDENT, get_authorities().values()) self._endpoints = [(auth.address, auth.dir_port) for auth in authorities] if use_mirrors: @@ -413,7 +410,7 @@ class DescriptorDownloader(object): :raises: **Exception** if unable to determine the directory mirrors """ - authorities = filter(HAS_V3IDENT, DIRECTORY_AUTHORITIES.values()) + authorities = filter(HAS_V3IDENT, get_authorities().values()) new_endpoints = set([(auth.address, auth.dir_port) for auth in authorities]) consensus = list(self.get_consensus(document_handler = stem.descriptor.DocumentHandler.DOCUMENT).run())[0] @@ -627,10 +624,6 @@ class DirectoryAuthority(object): network. They in turn use this to construct their circuits and use the network. - The directory information hardcoded in tor occasionally changes, and as such - the information this provides might not necessarily match your version of tor. - This is the tor directory information as of **commit 00bcc25 (8/27/13)**. - :var str nickname: nickname of the authority :var str address: IP address of the authority, presently they're all IPv4 but this may not always be the case @@ -731,3 +724,16 @@ DIRECTORY_AUTHORITIES = { v3ident = 'EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97', ), } + + +def get_authorities(): + """ + Provides the Tor directory authority information as of **Tor commit 00bcc25 + (8/27/13)**. The directory information hardcoded into Tor and occasionally + changes, so the information this provides might not necessarily match your + version of tor. + + :returns: dict of str nicknames to :class:`~stem.descriptor.remote.DirectoryAuthority` instances + """ + + return dict(DIRECTORY_AUTHORITIES)

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 02 Sep '13

02 Sep '13

commit 1550af0d7ad586806409a53af59b534a58376e8d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 2 16:16:39 2013 +0000 Update translations for tor-launcher-network-settings --- he/network-settings.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/he/network-settings.dtd b/he/network-settings.dtd index c236841..19d4ca1 100644 --- a/he/network-settings.dtd +++ b/he/network-settings.dtd @@ -7,18 +7,18 @@ <!ENTITY torSettings.yes "כן"> <!ENTITY torSettings.no "לא"> -<!ENTITY torSettings.firstQuestion ""> +<!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר את המצב שלך באופן הטוב ביותר?"> <!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> +<!ENTITY torSettings.configurePrompt2 "עלי להגדיר הגדרות רשת תקשורת."> <!ENTITY torSettings.configure ""> <!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.connectPrompt2 "ברצוני להתחבר ישירות אל הרשת Tor."> <!ENTITY torSettings.connect "התחבר"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "האם מחשב זה צריך להשתמש בפרוקסי כדי לגשת אל האינטרנט?">  <!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> +<!ENTITY torSettings.enterProxy "הזן את הגדרות הפרוקסי."> <!ENTITY torSettings.firewallQuestion ""> <!ENTITY torSettings.firewallHelp ""> <!ENTITY torSettings.enterFirewall ""> @@ -26,14 +26,14 @@  -<!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.startingTor "ממתין כעת עבור Tor כדי להתחיל…"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "רשות"> <!ENTITY torsettings.useProxy.checkbox ""> <!ENTITY torsettings.useProxy.type ""> <!ENTITY torsettings.useProxy.address "כתובת:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח"> <!ENTITY torsettings.useProxy.port "יציאה:"> <!ENTITY torsettings.useProxy.username "שם משתמש:"> <!ENTITY torsettings.useProxy.password "סיסמה:"> @@ -46,7 +46,7 @@ <!ENTITY torsettings.useBridges.label ""> <!ENTITY torsettings.useBridges.placeholder ""> -<!ENTITY torsettings.copyLog ""> +<!ENTITY torsettings.copyLog "העתק את יומן Tor אל לוח גזירה"> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> <!ENTITY torsettings.bridgeHelp2 "">

1 0

r26336: {website} update mirror status. (website/trunk/include)
by Andrew Lewman 02 Sep '13

02 Sep '13

Author: phobos Date: 2013-09-02 13:03:44 +0000 (Mon, 02 Sep 2013) New Revision: 26336 Modified: website/trunk/include/mirrors-table.wmi Log: update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-09-02 12:49:37 UTC (rev 26335) +++ website/trunk/include/mirrors-table.wmi 2013-09-02 13:03:44 UTC (rev 26336) @@ -35,23 +35,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>EE</td> <td>CyberSIDE</td> @@ -69,23 +52,6 @@ <tr> - <td>US</td> - - <td>BarkerJr</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> - <td><a href="rsync://rsync.torproject.us/tor/dist">rsync</a></td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> -</tr> - -<tr> - <td>RO</td> <td>me0w.cc</td> @@ -212,7 +178,7 @@ <td>Up to date</td> <td> - </td> - <td> - </td> + <td><a href="http://tor.taskserver.de/dist/">http</a></td> <td><a href="http://tor.taskserver.de/">http</a></td> <td> - </td> <td> - </td> @@ -222,19 +188,19 @@ <tr> - <td>US</td> + <td>DE</td> - <td>HackThisSite.org</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hackthissite.org/tor">http</a></td> - <td><a href="http://tor.hackthissite.org/">http</a></td> - <td><a href="https://mirror.hackthissite.org/tor">https</a></td> - <td><a href="https://tor.hackthissite.org/">https</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -409,23 +375,6 @@ <tr> - <td>NL</td> - - <td>BBLN.nl</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> - <td><a href="http://mirror.bbln.nl/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>INT</td> <td>CoralCDN</td> @@ -460,23 +409,6 @@ <tr> - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>torproject.is</td> @@ -698,23 +630,6 @@ <tr> - <td>DE</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://144.76.105.110/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://144.76.105.110/mirrors/torproject.org/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>HU</td> <td>Unknown</td> @@ -800,15 +715,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -817,53 +732,87 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> - <td></td> + <td>HackThisSite.org</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://mirror.hackthissite.org/tor">http</a></td> + <td><a href="http://tor.hackthissite.org/">http</a></td> + <td><a href="https://mirror.hackthissite.org/tor">https</a></td> + <td><a href="https://tor.hackthissite.org/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>Amorphis</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>TN</td> + <td>SE</td> - <td></td> + <td>homosu</td> - <td>DO NOT USE. Out of date.</td> + <td>Up to date</td> <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> - <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> - <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>EE</td> + <td>TN</td> <td></td> <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://tor.li/dist/">http</a></td> - <td><a href="http://tor.li/">http</a></td> - <td><a href="https://tor.li/dist/">https</a></td> - <td><a href="https://tor.li/">https</a></td> <td> - </td> + <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> + <td><a href="https://torproject.antagonism.org/">https</a></td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -970,49 +919,49 @@ <tr> - <td>DE</td> + <td>NL</td> - <td>chaos darmstadt</td> + <td></td> - <td>Unknown</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>LU</td> <td></td> - <td>DO NOT USE. Out of date.</td> + <td>Unknown</td> <td> - </td> + <td><a href="http://torproject.adamas.ai/dist/">http</a></td> + <td><a href="http://torproject.adamas.ai/">http</a></td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> - <td>LU</td> + <td>NL</td> - <td></td> + <td>BBLN.nl</td> <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.adamas.ai/dist/">http</a></td> - <td><a href="http://torproject.adamas.ai/">http</a></td> + <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> + <td><a href="http://mirror.bbln.nl/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -1089,6 +1038,23 @@ <tr> + <td>EE</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.li/dist/">http</a></td> + <td><a href="http://tor.li/">http</a></td> + <td><a href="https://tor.li/dist/">https</a></td> + <td><a href="https://tor.li/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>UA</td> <td></td> @@ -1103,3 +1069,20 @@ <td> - </td> <td> - </td> </tr> + +<tr> + + <td>DE</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://144.76.105.110/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://144.76.105.110/mirrors/torproject.org/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr>

1 0

r26335: {website} remove torproject.us update taskserver.de (website/trunk)
by Andrew Lewman 02 Sep '13

02 Sep '13

Author: phobos Date: 2013-09-02 12:49:37 +0000 (Mon, 02 Sep 2013) New Revision: 26335 Modified: website/trunk/update-mirrors.pl Log: remove torproject.us update taskserver.de Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-09-01 05:09:41 UTC (rev 26334) +++ website/trunk/update-mirrors.pl 2013-09-02 12:49:37 UTC (rev 26335) @@ -139,25 +139,6 @@ rsyncDistMirror => "" }, - mirror006 => { - adminContact => "BarkerJr AT barkerjr DOT net", - orgName => "BarkerJr", - isoCC => "US", - subRegion => "", - region => "US", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://www.torproject.us/", - httpsWebsiteMirror => "https://www.torproject.us/", - rsyncWebsiteMirror => "rsync://rsync.torproject.us/tor", - ftpWebsiteMirror => "", - httpDistMirror => "http://www.torproject.us/dist/", - httpsDistMirror => "https://www.torproject.us/dist/", - rsyncDistMirror => "rsync://rsync.torproject.us/tor/dist", - hiddenServiceMirror => "" - }, - mirror007 => { adminContact => "info AT zentrum-der-gesundheit DOT de", orgName => "Zentrum der Gesundheit", @@ -1213,7 +1194,7 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "", + httpDistMirror => "http://tor.taskserver.de/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => ""

1 0

[stem/master] Typo correction in tutorial
by atagar＠torproject.org 02 Sep '13

02 Sep '13

commit e5bfee6dc5ec66f46560e2b9bae68340569e1d77 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 1 16:24:48 2013 -0700 Typo correction in tutorial Caught and fixed by irregulator. --- docs/tutorials/the_little_relay_that_could.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/the_little_relay_that_could.rst b/docs/tutorials/the_little_relay_that_could.rst index 0fb00c1..0c1cb20 100644 --- a/docs/tutorials/the_little_relay_that_could.rst +++ b/docs/tutorials/the_little_relay_that_could.rst @@ -40,7 +40,7 @@ the following configuration options... HashedControlPassword 16:E600ADC1B52C80BB6022A0E999A7734571A451EB6AE50FED489B72E3DF -When you change your torrc you'll need to either restart Tor is issue a SIGHUP +When you change your torrc you'll need to either restart Tor or issue a SIGHUP for the new settings to take effect. Now let's write a script that tells us how many bytes Tor has sent and received since it started. Note that there are a `few ways to connect to Tor <../faq.html#how-do-i-connect-to-tor>`_. If you're

1 0

[stem/master] Minor improvements for connection examples
by atagar＠torproject.org 01 Sep '13

01 Sep '13

commit ec0c7eb0c3b96fc50ddc117bd83f4f6477c13f4c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 1 11:52:21 2013 -0700 Minor improvements for connection examples Changes include... * more conventional example using the 'with' keyword * disconnecting the controller afterward * corrected indentation --- docs/faq.rst | 114 +++++++++++++----------- docs/tutorials/the_little_relay_that_could.rst | 5 +- 2 files changed, 67 insertions(+), 52 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index d942c0e..b5b3a2a 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -121,18 +121,19 @@ Once you have Tor running and `properly configured <tutorials/the_little_relay_t sys.exit(1) # unable to get a connection print "Tor is running version %s" % controller.get_version() + controller.close() :: - % python example.py - Tor is running version 0.2.4.10-alpha-dev (git-8be6058d8f31e578) + % python example.py + Tor is running version 0.2.4.10-alpha-dev (git-8be6058d8f31e578) ... or if Tor isn't running... :: - % python example.py - [Errno 111] Connection refused + % python example.py + [Errno 111] Connection refused #. :func:`stem.control.Controller.from_port` and :func:`stem.control.Controller.from_socket_file` @@ -144,36 +145,49 @@ Once you have Tor running and `properly configured <tutorials/the_little_relay_t :: - import getpass - import sys + import getpass + import sys - import stem - import stem.connection + import stem + import stem.connection - from stem.control import Controller + from stem.control import Controller - if __name__ == '__main__': - try: - controller = Controller.from_port() - except stem.SocketError as exc: - print "Unable to connect to tor on port 9051: %s" % exc - sys.exit(1) + if __name__ == '__main__': + try: + controller = Controller.from_port() + except stem.SocketError as exc: + print "Unable to connect to tor on port 9051: %s" % exc + sys.exit(1) + + try: + controller.authenticate() + except stem.connection.MissingPassword: + pw = getpass.getpass("Controller password: ") + + try: + controller.authenticate(password = pw) + except stem.connection.PasswordAuthFailed: + print "Unable to authenticate, password is incorrect" + sys.exit(1) + except stem.connection.AuthenticationFailure as exc: + print "Unable to authenticate: %s" % exc + sys.exit(1) - try: - controller.authenticate() - except stem.connection.MissingPassword: - pw = getpass.getpass("Controller password: ") + print "Tor is running version %s" % controller.get_version() + controller.close() - try: - controller.authenticate(password = pw) - except stem.connection.PasswordAuthFailed: - print "Unable to authenticate, password is incorrect" - sys.exit(1) - except stem.connection.AuthenticationFailure as exc: - print "Unable to authenticate: %s" % exc - sys.exit(1) + If you're fine with allowing your script to raise exceptions then this can be more nicely done as... - print "Tor is running version %s" % controller.get_version() + :: + + from stem.control import Controller + + if __name__ == '__main__': + with Controller.from_port() as controller: + controller.authenticate() + + print "Tor is running version %s" % controller.get_version() #. `Socket Module <api/socket.html>`_ @@ -185,32 +199,32 @@ Once you have Tor running and `properly configured <tutorials/the_little_relay_t :: - import stem - import stem.connection - import stem.socket - - if __name__ == '__main__': - try: - control_socket = stem.socket.ControlPort(port = 9051) - stem.connection.authenticate(control_socket) - except stem.SocketError as exc: - print "Unable to connect to tor on port 9051: %s" % exc - sys.exit(1) - except stem.connection.AuthenticationFailure as exc: - print "Unable to authenticate: %s" % exc - sys.exit(1) - - print "Issuing 'GETINFO version' query...\n" - control_socket.send('GETINFO version') - print control_socket.recv() + import stem + import stem.connection + import stem.socket + + if __name__ == '__main__': + try: + control_socket = stem.socket.ControlPort(port = 9051) + stem.connection.authenticate(control_socket) + except stem.SocketError as exc: + print "Unable to connect to tor on port 9051: %s" % exc + sys.exit(1) + except stem.connection.AuthenticationFailure as exc: + print "Unable to authenticate: %s" % exc + sys.exit(1) + + print "Issuing 'GETINFO version' query...\n" + control_socket.send('GETINFO version') + print control_socket.recv() :: - % python example.py - Issuing 'GETINFO version' query... + % python example.py + Issuing 'GETINFO version' query... - version=0.2.4.10-alpha-dev (git-8be6058d8f31e578) - OK + version=0.2.4.10-alpha-dev (git-8be6058d8f31e578) + OK .. _how_do_i_request_a_new_identity_from_tor: diff --git a/docs/tutorials/the_little_relay_that_could.rst b/docs/tutorials/the_little_relay_that_could.rst index 751c216..0fb00c1 100644 --- a/docs/tutorials/the_little_relay_that_could.rst +++ b/docs/tutorials/the_little_relay_that_could.rst @@ -42,8 +42,9 @@ the following configuration options... When you change your torrc you'll need to either restart Tor is issue a SIGHUP for the new settings to take effect. Now let's write a script that tells us how -many bytes Tor has sent and received since it started. Note that there are a `few ways to connect to Tor <../faq.html#how-do-i-connect-to-tor>`_. If you're unfamiliar -with the '**with**' keyword then see `here +many bytes Tor has sent and received since it started. Note that there are a +`few ways to connect to Tor <../faq.html#how-do-i-connect-to-tor>`_. If you're +unfamiliar with the '**with**' keyword then see `here <../faq.html#what-is-that-with-keyword-i-keep-seeing-in-the-tutorials>`_... ::

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 01 Sep '13

01 Sep '13

commit 0fc139fb21972388a4a7220b55856966f13cce6f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 1 18:16:37 2013 +0000 Update translations for liveusb-creator_completed --- de/de.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/de/de.po b/de/de.po index 78f193c..e40f955 100644 --- a/de/de.po +++ b/de/de.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-09-01 17:46+0000\n" +"PO-Revision-Date: 2013-09-01 18:00+0000\n" "Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -78,7 +78,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails USB stick from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails USB stick from a new ISO image.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Einen USB-Stick, das Tails bereits enthält, mit einer ISO-Datei upgraden.</span></p></body></html>" #: ../liveusb/dialog.py:154 msgid "Alt+B" @@ -86,7 +86,7 @@ msgstr "Alt+B" #: ../liveusb/dialog.py:153 msgid "Browse" -msgstr "Druchsuchen" +msgstr "Durchsuchen" #: ../liveusb/dialog.py:160 msgid "" @@ -94,7 +94,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "Indem Sie für auf dem USB-Stick Speicherplatz für einen Persistenzbereich reservieren haben Sie die Möglichkeit Daten zu speichern und permanente Modifikationen an Ihrem Live-Betriebssystem durchzuführen. Ohne diese Anpassung haben Sie keine Möglichkeit Daten zu speichern die einen Neustart überdauern." +msgstr "Indem Sie für auf dem USB-Stick Speicherplatz für einen Persistenzbereich reservieren haben Sie die Möglichkeit Daten zu speichern und permanente veränderungen an Ihrem Live-Betriebssystem durchzuführen. Ohne diese Anpassung haben Sie keine Möglichkeit Daten zu speichern die einen Neustart überdauern." #: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format @@ -115,14 +115,14 @@ msgid "" "Clone\n" "&&\n" "Install" -msgstr "Clone\n&&\nInstall" +msgstr "Klonen\n&&\nInstallieren" #: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" -msgstr "Clone\n&&\nUpgrade" +msgstr "Klonen\n&&\nUpgraden" #: ../liveusb/dialog.py:165 msgid "Create Live USB" @@ -136,7 +136,7 @@ msgstr "Erzeuge %s MB persistentes Overlay" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "Das Gerät ist momentan nicht angeschlossen, sodass wir den freien Speicherplatz nicht bestimmen können." +msgstr "Das Gerät ist momentan nicht eingehängt, sodass wir den freien Speicherplatz nicht bestimmen können." #: ../liveusb/dialog.py:157 #, python-format @@ -264,7 +264,7 @@ msgstr "Partition ist FAT16. Beschränkung der max. Datei-Grösse auf 2 GB" #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "Die Partition ist FAT32; Overlay-Größe wird auf 4G beschränkt" +msgstr "Die Partition ist FAT32; max. Datei-Größe wird auf 4G beschränkt" #: ../liveusb/creator.py:226 ../liveusb/creator.py:837 #, python-format @@ -343,7 +343,7 @@ msgstr "Der Master Boot Record auf Ihrem Gerät ist leer. Drücken Sie auf \"Liv msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte editieren Sie die Berechtigungen oder wählen Sie eine andere Datei aus." +msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte korrigieren Sie die Berechtigungen oder wählen Sie eine andere Datei aus." #: ../liveusb/creator.py:337 #, python-format @@ -365,7 +365,7 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "Dieser Button startet den Prozess zur Erstellung eines LiveUSB Mediums. Dies beinhaltet auch das Herunterladen einer Tails Version (sollte keine existierendes Image ausgewählt worden sein), Entpacken der ISO-Datei auf das USB-Speichermedium, Erstellung des endgültigen Systems und der Installation des Bootloaders." +msgstr "Dieser Button startet den Prozess zur Erstellung eines LiveUSB Mediums. Dies beinhaltet auch das Herunterladen einer Tails Version (sollte keine existierendes Image ausgewählt worden sein), Entpacken der ISO-Datei auf das USB-Speichermedium, Erstellung der Persistent-Datei und der Installation des Bootloaders." #: ../liveusb/dialog.py:158 msgid "" @@ -471,7 +471,7 @@ msgstr "Unbekannte Version: %s" #: ../liveusb/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "Entbinde '%(udi)s' von '%(device)s'" +msgstr "Aushängen '%(udi)s' von '%(device)s'" #: ../liveusb/creator.py:818 #, python-format @@ -488,7 +488,7 @@ msgstr "Nicht unterstütztes Dateisystem: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "Nicht unterstütztes Dateisystem: %s \nSollten Sie versuchen ein Upgrade eines manuell installierten Tails Systems durchzuführen (falls Sie also das System ohne diesen Installer installiert haben), gibt es dafür keine Unterstützung: Sie müssen es erneut installieren, z.B. indem Sie den Menüpunkt \"Clone & Install\" auswählen." +msgstr "Nicht unterstütztes Dateisystem: %s \nSollten Sie versuchen ein Upgrade eines manuell installierten Tails Systems durchzuführen (falls Sie also das System ohne diesen Installer installiert haben), gibt es dafür keine Unterstützung: Sie müssen es erneut installieren, z.B. indem Sie den Menüpunkt \"Klonen & Installieren\" auswählen." #: ../liveusb/creator.py:1197 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 01 Sep '13

01 Sep '13

commit d13fbfea08c9837e9247404777a08a8de71e2435 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 1 18:16:34 2013 +0000 Update translations for liveusb-creator --- de/de.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/de/de.po b/de/de.po index 78f193c..e40f955 100644 --- a/de/de.po +++ b/de/de.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-09-01 17:46+0000\n" +"PO-Revision-Date: 2013-09-01 18:00+0000\n" "Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -78,7 +78,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails USB stick from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails USB stick from a new ISO image.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Einen USB-Stick, das Tails bereits enthält, mit einer ISO-Datei upgraden.</span></p></body></html>" #: ../liveusb/dialog.py:154 msgid "Alt+B" @@ -86,7 +86,7 @@ msgstr "Alt+B" #: ../liveusb/dialog.py:153 msgid "Browse" -msgstr "Druchsuchen" +msgstr "Durchsuchen" #: ../liveusb/dialog.py:160 msgid "" @@ -94,7 +94,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "Indem Sie für auf dem USB-Stick Speicherplatz für einen Persistenzbereich reservieren haben Sie die Möglichkeit Daten zu speichern und permanente Modifikationen an Ihrem Live-Betriebssystem durchzuführen. Ohne diese Anpassung haben Sie keine Möglichkeit Daten zu speichern die einen Neustart überdauern." +msgstr "Indem Sie für auf dem USB-Stick Speicherplatz für einen Persistenzbereich reservieren haben Sie die Möglichkeit Daten zu speichern und permanente veränderungen an Ihrem Live-Betriebssystem durchzuführen. Ohne diese Anpassung haben Sie keine Möglichkeit Daten zu speichern die einen Neustart überdauern." #: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format @@ -115,14 +115,14 @@ msgid "" "Clone\n" "&&\n" "Install" -msgstr "Clone\n&&\nInstall" +msgstr "Klonen\n&&\nInstallieren" #: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" -msgstr "Clone\n&&\nUpgrade" +msgstr "Klonen\n&&\nUpgraden" #: ../liveusb/dialog.py:165 msgid "Create Live USB" @@ -136,7 +136,7 @@ msgstr "Erzeuge %s MB persistentes Overlay" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "Das Gerät ist momentan nicht angeschlossen, sodass wir den freien Speicherplatz nicht bestimmen können." +msgstr "Das Gerät ist momentan nicht eingehängt, sodass wir den freien Speicherplatz nicht bestimmen können." #: ../liveusb/dialog.py:157 #, python-format @@ -264,7 +264,7 @@ msgstr "Partition ist FAT16. Beschränkung der max. Datei-Grösse auf 2 GB" #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "Die Partition ist FAT32; Overlay-Größe wird auf 4G beschränkt" +msgstr "Die Partition ist FAT32; max. Datei-Größe wird auf 4G beschränkt" #: ../liveusb/creator.py:226 ../liveusb/creator.py:837 #, python-format @@ -343,7 +343,7 @@ msgstr "Der Master Boot Record auf Ihrem Gerät ist leer. Drücken Sie auf \"Liv msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte editieren Sie die Berechtigungen oder wählen Sie eine andere Datei aus." +msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte korrigieren Sie die Berechtigungen oder wählen Sie eine andere Datei aus." #: ../liveusb/creator.py:337 #, python-format @@ -365,7 +365,7 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "Dieser Button startet den Prozess zur Erstellung eines LiveUSB Mediums. Dies beinhaltet auch das Herunterladen einer Tails Version (sollte keine existierendes Image ausgewählt worden sein), Entpacken der ISO-Datei auf das USB-Speichermedium, Erstellung des endgültigen Systems und der Installation des Bootloaders." +msgstr "Dieser Button startet den Prozess zur Erstellung eines LiveUSB Mediums. Dies beinhaltet auch das Herunterladen einer Tails Version (sollte keine existierendes Image ausgewählt worden sein), Entpacken der ISO-Datei auf das USB-Speichermedium, Erstellung der Persistent-Datei und der Installation des Bootloaders." #: ../liveusb/dialog.py:158 msgid "" @@ -471,7 +471,7 @@ msgstr "Unbekannte Version: %s" #: ../liveusb/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "Entbinde '%(udi)s' von '%(device)s'" +msgstr "Aushängen '%(udi)s' von '%(device)s'" #: ../liveusb/creator.py:818 #, python-format @@ -488,7 +488,7 @@ msgstr "Nicht unterstütztes Dateisystem: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "Nicht unterstütztes Dateisystem: %s \nSollten Sie versuchen ein Upgrade eines manuell installierten Tails Systems durchzuführen (falls Sie also das System ohne diesen Installer installiert haben), gibt es dafür keine Unterstützung: Sie müssen es erneut installieren, z.B. indem Sie den Menüpunkt \"Clone & Install\" auswählen." +msgstr "Nicht unterstütztes Dateisystem: %s \nSollten Sie versuchen ein Upgrade eines manuell installierten Tails Systems durchzuführen (falls Sie also das System ohne diesen Installer installiert haben), gibt es dafür keine Unterstützung: Sie müssen es erneut installieren, z.B. indem Sie den Menüpunkt \"Klonen & Installieren\" auswählen." #: ../liveusb/creator.py:1197 #, python-format

1 0