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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 407bb88b798a02c3832cd786ec28193f0b2238bc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 09:45:47 2014 +0000 Update translations for tails-misc --- en_GB.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/en_GB.po b/en_GB.po index ce00893..172bc37 100644 --- a/en_GB.po +++ b/en_GB.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# richardshaylor <rshaylor(a)me.com>, 2014 +# Andi Chandler <andi(a)gowling.com>, 2014 +# Richard Shaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-21 01:59+0200\n" +"PO-Revision-Date: 2014-09-02 09:43+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -413,32 +414,32 @@ msgstr "This may take a while, so please be patient." msgid "Failed to setup chroot." msgstr "Failed to setup chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Unsafe Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "Shutting down the Unsafe Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "This may take a while, and you may not restart the Unsafe Browser until it is properly shut down." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "Failed to restart Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Another Unsafe Browser is currently running, or being cleaned up. Please retry in a while." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." @@ -481,7 +482,7 @@ msgstr "Anonymous overlay network" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" -msgstr "" +msgstr "Learn more about Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot"

1 0

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

02 Sep '14

commit c1e476084a895e274fded75089683d2cce8d070f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 09:45:33 2014 +0000 Update translations for tails-greeter_completed --- en_GB/en_GB.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index e51fd2a..c2b40d7 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -4,13 +4,13 @@ # # Translators: # Andi Chandler <andi(a)gowling.com>, 2014 -# richardshaylor <rshaylor(a)me.com>, 2014 +# Richard Shaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-14 13:14+0200\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" +"POT-Creation-Date: 2014-08-31 10:36+0200\n" +"PO-Revision-Date: 2014-09-02 09:45+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -103,13 +103,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D #: ../glade/optionswindow.glade.h:12 msgid "" -"This option makes Tails look more like Microsoft Windows XP. This may be " +"This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "This option makes Tails look more like Microsoft Windows XP. This may be useful in public places in order to avoid attracting suspicion." +msgstr "This option makes Tails look more like Microsoft Windows 8. This may be useful in public places in order to avoid attracting suspicion." #: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows XP Camouflage" -msgstr "Activate Microsoft Windows XP Camouflage" +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "Activate Microsoft Windows 8 Camouflage" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -198,7 +198,7 @@ msgid "" "%(stderr)s" msgstr "live-persist failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Other..."

1 0

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

02 Sep '14

commit 593abdc82a7ef7365e140ecc4ad6f37a25b64ce8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 09:45:30 2014 +0000 Update translations for tails-greeter --- en_GB/en_GB.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 1f92043..c2b40d7 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -4,14 +4,14 @@ # # Translators: # Andi Chandler <andi(a)gowling.com>, 2014 -# richardshaylor <rshaylor(a)me.com>, 2014 +# Richard Shaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 10:36+0200\n" +"PO-Revision-Date: 2014-09-02 09:45+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,11 +105,11 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "This option makes Tails look more like Microsoft Windows 8. This may be useful in public places in order to avoid attracting suspicion." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "" +msgstr "Activate Microsoft Windows 8 Camouflage" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -198,7 +198,7 @@ msgid "" "%(stderr)s" msgstr "live-persist failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Other..."

1 0

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

02 Sep '14

commit 02cc8d59fd0df2a992beb2216435e161e3d9576e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 09:45:26 2014 +0000 Update translations for liveusb-creator_completed --- en_GB/en_GB.po | 266 +++++++++++++++++++++++++++----------------------------- 1 file changed, 130 insertions(+), 136 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 4ff6a7a..030ff97 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -3,16 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Andi Chandler <andi(a)gowling.com>, 2014 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 # eire123 <jonnydennis10(a)gmail.com>, 2013 -# richardshaylor <rshaylor(a)me.com>, 2014 +# Richard Shaylor <rshaylor(a)me.com>, 2014 +# ronnietse <tseronnie(a)ymail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:33+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 10:31+0200\n" +"PO-Revision-Date: 2014-09-02 09:44+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,76 +22,76 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 +#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format msgid "%(distribution)s Installer" msgstr "%(distribution)s Installer" -#: ../liveusb/gui.py:808 +#: ../liveusb/gui.py:773 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s selected" -#: ../liveusb/gui.py:439 +#: ../liveusb/gui.py:423 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:445 +#: ../liveusb/gui.py:429 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1020 +#: ../liveusb/creator.py:1059 #, python-format msgid "%s already bootable" msgstr "%s already bootable" -#: ../liveusb/launcher_ui.py:165 +#: ../liveusb/launcher_ui.py:156 msgid "" "<!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\">\n" "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 align=\"center\" 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;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</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 align=\"center\" 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;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</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:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:160 +#: ../liveusb/launcher_ui.py:151 msgid "" "<!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\">\n" "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;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</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;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</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:11pt; 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:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:162 +#: ../liveusb/launcher_ui.py:153 msgid "" "<!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\">\n" "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;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</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;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</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:11pt; 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:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:164 +#: ../liveusb/launcher_ui.py:155 msgid "" "<!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\">\n" "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 device 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 device from a new ISO image.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Upgrade an already installed Tails device 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:11pt; 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:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:154 msgid "Alt+B" msgstr "Alt+B" -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:153 msgid "Browse" msgstr "Browse" -#: ../liveusb/dialog.py:169 +#: ../liveusb/dialog.py:160 msgid "" "By allocating extra space on your USB stick for a persistent overlay, you " "will be able to store data and make permanent modifications to your live " @@ -97,54 +99,54 @@ msgid "" "persist after a reboot." msgstr "By allocating extra space on your USB stick for a persistent overlay, you 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." -#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Calculating the SHA1 of %s" -#: ../liveusb/creator.py:1333 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "Cannot find" -#: ../liveusb/creator.py:542 +#: ../liveusb/creator.py:556 #, python-format msgid "Cannot find device %s" msgstr "Cannot find device %s" -#: ../liveusb/launcher_ui.py:159 +#: ../liveusb/launcher_ui.py:150 msgid "" "Clone\n" "&&\n" "Install" msgstr "Clone\n&&\nInstall" -#: ../liveusb/launcher_ui.py:161 +#: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" msgstr "Clone\n&&\nUpgrade" -#: ../liveusb/creator.py:400 +#: ../liveusb/creator.py:408 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Creating %sMB persistent overlay" -#: ../liveusb/gui.py:567 +#: ../liveusb/gui.py:551 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Device is not yet mounted, so we cannot determine the amount of free space." -#: ../liveusb/dialog.py:166 +#: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" msgstr "Download %(distribution)s" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:747 msgid "Download complete!" msgstr "Download complete!" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:751 msgid "Download failed: " msgstr "Download failed: " @@ -153,210 +155,204 @@ msgstr "Download failed: " msgid "Downloading %s..." msgstr "Downloading %s..." -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "Drive is a loopback, skipping MBR reset" -#: ../liveusb/creator.py:813 +#: ../liveusb/creator.py:827 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Entering unmount_device for '%(device)s'" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "Error probing device" -#: ../liveusb/gui.py:227 +#: ../liveusb/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Error: Cannot set the label or obtain the UUID of your device. Unable to continue." -#: ../liveusb/creator.py:376 +#: ../liveusb/creator.py:384 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "Error: The SHA1 of your Live CD is invalid. You can run this program with the --noverify argument to bypass this verification check." -#: ../liveusb/creator.py:145 +#: ../liveusb/creator.py:147 msgid "Extracting live image to the target device..." msgstr "Extracting live image to the target device..." -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formatting %(device)s as FAT32" -#: ../liveusb/creator.py:140 +#: ../liveusb/creator.py:142 msgid "ISO MD5 checksum passed" msgstr "ISO MD5 checksum passed" -#: ../liveusb/creator.py:138 +#: ../liveusb/creator.py:140 msgid "ISO MD5 checksum verification failed" msgstr "ISO MD5 checksum verification failed" -#: ../liveusb/dialog.py:165 +#: ../liveusb/dialog.py:156 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "If you do not select an existing Live ISO, the selected release will be downloaded for you." -#: ../liveusb/dialog.py:174 +#: ../liveusb/dialog.py:165 msgid "Install Tails" msgstr "Install Tails" -#: ../liveusb/gui.py:630 +#: ../liveusb/gui.py:614 msgid "Installation complete!" msgstr "Installation complete!" -#: ../liveusb/gui.py:279 +#: ../liveusb/gui.py:264 #, python-format msgid "Installation complete! (%s)" msgstr "Installation complete! (%s)" -#: ../liveusb/gui.py:631 +#: ../liveusb/gui.py:615 msgid "Installation was completed. Press OK to close this program." msgstr "Installation was completed. Press OK to close this program." -#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "Installing bootloader..." -#: ../liveusb/gui.py:284 +#: ../liveusb/gui.py:269 msgid "LiveUSB creation failed!" msgstr "LiveUSB creation failed!" -#: ../liveusb/creator.py:1334 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Make sure to extract the entire liveusb-creator zip file before running this program." -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Make sure your USB key is plugged in and formatted with the FAT filesystem" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:849 #, python-format msgid "Mount %s exists after unmounting" msgstr "Mount %s exists after unmounting" -#: ../liveusb/gui.py:573 +#: ../liveusb/gui.py:557 #, python-format msgid "No free space on device %(device)s" msgstr "No free space on device %(device)s" -#: ../liveusb/creator.py:802 +#: ../liveusb/creator.py:816 msgid "No mount points found" msgstr "No mount points found" -#: ../liveusb/creator.py:393 +#: ../liveusb/creator.py:401 msgid "Not enough free space on device." msgstr "Not enough free space on device." -#: ../liveusb/gui.py:554 +#: ../liveusb/gui.py:538 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partition is FAT16; Restricting overlay size to 2G" -#: ../liveusb/gui.py:550 +#: ../liveusb/gui.py:534 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Partition is FAT32; Restricting overlay size to 4G" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 +#: ../liveusb/creator.py:228 ../liveusb/creator.py:856 #, python-format msgid "Partitioning device %(device)s" msgstr "Partitioning device %(device)s" -#: ../liveusb/gui.py:621 +#: ../liveusb/gui.py:605 msgid "Persistent Storage" msgstr "Persistent Storage" -#: ../liveusb/dialog.py:170 +#: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" msgstr "Persistent Storage (0 MB)" -#: ../liveusb/gui.py:702 ../liveusb/gui.py:731 +#: ../liveusb/gui.py:667 ../liveusb/gui.py:696 msgid "Please confirm your device selection" msgstr "Please confirm your device selection" -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:451 msgid "Refreshing releases..." msgstr "Refreshing releases..." -#: ../liveusb/gui.py:472 +#: ../liveusb/gui.py:456 msgid "Releases updated!" msgstr "Releases updated!" -#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "Removing %(file)s" -#: ../liveusb/creator.py:469 +#: ../liveusb/creator.py:483 msgid "Removing existing Live OS" msgstr "Remove existing Live OS" -#: ../liveusb/creator.py:1112 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Resetting Master Boot Record of %s" -#: ../liveusb/gui.py:793 +#: ../liveusb/gui.py:758 msgid "Select Live ISO" msgstr "Select Live ISO" -#: ../liveusb/creator.py:182 +#: ../liveusb/creator.py:184 msgid "Setting up OLPC boot file..." msgstr "Setting up OLPC boot file..." -#: ../liveusb/creator.py:716 +#: ../liveusb/creator.py:730 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Some partitions of the target device %(device)s are mounted. They will be unmounted before starting the installation process." -#: ../liveusb/creator.py:131 +#: ../liveusb/creator.py:133 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Source type does not support verification of ISO MD5 checksum, skipping" -#: ../liveusb/creator.py:1146 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "Synchronizing data on disk..." -#: ../liveusb/dialog.py:168 +#: ../liveusb/dialog.py:159 msgid "Target Device" msgstr "Target Device" -#: ../liveusb/gui.py:667 -msgid "" -"The Master Boot Record on your device is blank. Pressing 'Install Tails' " -"again will reset the MBR on this device." -msgstr "The Master Boot Record on your device is blank. Pressing 'Install Tails' again will reset the MBR on this device." - -#: ../liveusb/gui.py:796 +#: ../liveusb/gui.py:761 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "The selected file is unreadable. Please fix its permissions or select another file." -#: ../liveusb/creator.py:337 +#: ../liveusb/creator.py:345 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." msgstr "There was a problem executing the following command: `%(command)s`.\nA more detailed error log has been written to '%(filename)s'." -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:151 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." msgstr "This button allows you to browse for an existing Live system ISO that you have previously downloaded. If you do not select one, a release will be downloaded for you automatically." -#: ../liveusb/dialog.py:173 +#: ../liveusb/dialog.py:164 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -364,103 +360,103 @@ msgid "" "installing the bootloader." msgstr "This button will begin the LiveUSB creation process. This entails 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." -#: ../liveusb/dialog.py:167 +#: ../liveusb/dialog.py:158 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." msgstr "This is the USB stick that you want to install your Live system on. This device must be formatted with the FAT filesystem." -#: ../liveusb/dialog.py:172 +#: ../liveusb/dialog.py:163 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "This is the progress bar that will indicate how far along in the LiveUSB creation process you are" -#: ../liveusb/dialog.py:171 +#: ../liveusb/dialog.py:162 msgid "This is the status console, where all messages get written to." msgstr "This is the status console, where all messages get written to." -#: ../liveusb/creator.py:879 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." msgstr "Trying to continue anyway." -#: ../liveusb/creator.py:911 +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Unable to change volume label: %(message)s" -#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 +#: ../liveusb/creator.py:492 ../liveusb/creator.py:503 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Unable to chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:459 +#: ../liveusb/creator.py:469 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "Unable to copy %(infile)s to %(outfile)s: %(message)s" -#: ../liveusb/gui.py:418 +#: ../liveusb/gui.py:402 msgid "Unable to find any USB drive" msgstr "Unable to find any USB drive" -#: ../liveusb/creator.py:1200 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "Unable to find any supported device" -#: ../liveusb/creator.py:1040 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "Unable to find partition" -#: ../liveusb/creator.py:1280 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Unable to get Win32_LogicalDisk; win32com query did not return any results" -#: ../liveusb/gui.py:695 +#: ../liveusb/gui.py:660 msgid "Unable to mount device" msgstr "Unable to mount device" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:804 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Unable to mount device: %(message)s" -#: ../liveusb/creator.py:494 +#: ../liveusb/creator.py:508 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Unable to remove directory from previous LiveOS: %(message)s" -#: ../liveusb/creator.py:482 +#: ../liveusb/creator.py:496 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Unable to remove file from previous LiveOS: %(message)s" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Unable to reset MBR. You may not have the `syslinux` package installed." -#: ../liveusb/gui.py:802 +#: ../liveusb/gui.py:767 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Unable to use the selected file. You may have better luck if you move your ISO to the root of your drive (ie: C:\\)" -#: ../liveusb/creator.py:697 +#: ../liveusb/creator.py:711 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Unable to write on %(device)s, skipping." -#: ../liveusb/creator.py:382 +#: ../liveusb/creator.py:390 msgid "Unknown ISO, skipping checksum verification" msgstr "Unknown ISO, skipping checksum verification" -#: ../liveusb/creator.py:786 +#: ../liveusb/creator.py:800 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Unknown dbus exception while trying to mount device: %(message)s" -#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Unknown filesystem. Your device may need to be reformatted." @@ -469,96 +465,94 @@ msgstr "Unknown filesystem. Your device may need to be reformatted." msgid "Unknown release: %s" msgstr "Unknown release: %s" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:841 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Unmounting '%(udi)s' on '%(device)s'" -#: ../liveusb/creator.py:823 +#: ../liveusb/creator.py:837 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Unmounting mounted filesystems on '%(device)s'" -#: ../liveusb/creator.py:876 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Unsupported device '%(device)s', please report a bug." -#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "Unsupported filesystem: %s" -#: ../liveusb/creator.py:768 +#: ../liveusb/creator.py:782 #, python-format 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 "Unsupported filesystem: %s\nIn 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." -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Unsupported filesystem: %s\nPlease backup and format your USB key with the FAT filesystem." -#: ../liveusb/launcher_ui.py:163 +#: ../liveusb/creator.py:882 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Updating properties of system partition %(system_partition)s" + +#: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" msgstr "Upgrade from ISO" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" msgstr "Use existing Live system ISO" -#: ../liveusb/creator.py:133 +#: ../liveusb/creator.py:135 msgid "Verifying ISO MD5 checksum" msgstr "Verifying ISO MD5 checksum" -#: ../liveusb/creator.py:356 +#: ../liveusb/creator.py:364 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Verifying SHA1 checksum of LiveCD image..." -#: ../liveusb/creator.py:360 +#: ../liveusb/creator.py:368 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verifying SHA256 checksum of LiveCD image..." -#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr "Verifying filesystem..." -#: ../liveusb/gui.py:729 +#: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Warning: Creating a new persistent overlay will delete your existing one." -#: ../liveusb/gui.py:681 -msgid "" -"Warning: The Master Boot Record on your device does not match your system's " -"syslinux MBR. If you have trouble booting this stick, try running the " -"liveusb-creator with the --reset-mbr option." -msgstr "Warning: The Master Boot Record on your device does not match your system's syslinux MBR. If you have trouble booting this stick, try running the liveusb-creator with the --reset-mbr option." - -#: ../liveusb/gui.py:392 +#: ../liveusb/gui.py:376 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 "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." -#: ../liveusb/creator.py:152 +#: ../liveusb/creator.py:154 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Wrote to device at %(speed)d MB/sec" -#: ../liveusb/gui.py:703 +#: ../liveusb/gui.py:668 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "You are going to install Tails on the %(size)s %(vendor)s %(model)s device (%(device)s). All data on the selected device will be lost. Continue?" -#: ../liveusb/gui.py:719 +#: ../liveusb/gui.py:684 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -566,20 +560,20 @@ msgid "" "unchanged. Continue?" msgstr "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s device (%(device)s). Any persistent volume on this device will remain unchanged. Continue?" -#: ../liveusb/creator.py:604 +#: ../liveusb/creator.py:618 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "You are using an old version of syslinux-extlinux that does not support the ext4 filesystem" -#: ../liveusb/gui.py:787 +#: ../liveusb/gui.py:752 msgid "You can try again to resume your download" msgstr "You can try again to resume your download" -#: ../liveusb/creator.py:92 +#: ../liveusb/creator.py:94 msgid "You must run this application as root" msgstr "You must run this application as root" -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:155 msgid "or" msgstr "or"

1 0

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

02 Sep '14

commit aab1fb1f49418ea14a8de58ed55322f6488394f8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 09:45:21 2014 +0000 Update translations for liveusb-creator --- en_GB/en_GB.po | 61 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 6d90a04..030ff97 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Andi Chandler <andi(a)gowling.com>, 2014 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 # eire123 <jonnydennis10(a)gmail.com>, 2013 # Richard Shaylor <rshaylor(a)me.com>, 2014 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-20 16:27+0200\n" -"PO-Revision-Date: 2014-08-18 15:34+0000\n" -"Last-Translator: ronnietse <tseronnie(a)ymail.com>\n" +"POT-Creation-Date: 2014-08-31 10:31+0200\n" +"PO-Revision-Date: 2014-09-02 09:44+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +42,7 @@ msgstr "%(size)s %(label)s" msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1047 +#: ../liveusb/creator.py:1059 #, python-format msgid "%s already bootable" msgstr "%s already bootable" @@ -53,7 +54,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -msgstr "" +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:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:151 msgid "" @@ -62,7 +63,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +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:11pt; 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:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" #: ../liveusb/launcher_ui.py:153 msgid "" @@ -71,7 +72,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +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:11pt; 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:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" @@ -80,7 +81,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "" +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:11pt; 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:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" #: ../liveusb/dialog.py:154 msgid "Alt+B" @@ -98,12 +99,12 @@ msgid "" "persist after a reboot." msgstr "By allocating extra space on your USB stick for a persistent overlay, you 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." -#: ../liveusb/creator.py:1146 ../liveusb/creator.py:1409 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Calculating the SHA1 of %s" -#: ../liveusb/creator.py:1357 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "Cannot find" @@ -154,7 +155,7 @@ msgstr "Download failed: " msgid "Downloading %s..." msgstr "Downloading %s..." -#: ../liveusb/creator.py:1142 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "Drive is a loopback, skipping MBR reset" @@ -163,7 +164,7 @@ msgstr "Drive is a loopback, skipping MBR reset" msgid "Entering unmount_device for '%(device)s'" msgstr "Entering unmount_device for '%(device)s'" -#: ../liveusb/creator.py:1222 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "Error probing device" @@ -183,7 +184,7 @@ msgstr "Error: The SHA1 of your Live CD is invalid. You can run this program wi msgid "Extracting live image to the target device..." msgstr "Extracting live image to the target device..." -#: ../liveusb/creator.py:1090 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formatting %(device)s as FAT32" @@ -219,7 +220,7 @@ msgstr "Installation complete! (%s)" msgid "Installation was completed. Press OK to close this program." msgstr "Installation was completed. Press OK to close this program." -#: ../liveusb/creator.py:947 ../liveusb/creator.py:1263 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "Installing bootloader..." @@ -227,13 +228,13 @@ msgstr "Installing bootloader..." msgid "LiveUSB creation failed!" msgstr "LiveUSB creation failed!" -#: ../liveusb/creator.py:1358 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Make sure to extract the entire liveusb-creator zip file before running this program." -#: ../liveusb/creator.py:1234 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Make sure your USB key is plugged in and formatted with the FAT filesystem" @@ -289,7 +290,7 @@ msgstr "Refreshing releases..." msgid "Releases updated!" msgstr "Releases updated!" -#: ../liveusb/creator.py:954 ../liveusb/creator.py:1281 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "Removing %(file)s" @@ -298,7 +299,7 @@ msgstr "Removing %(file)s" msgid "Removing existing Live OS" msgstr "Remove existing Live OS" -#: ../liveusb/creator.py:1136 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Resetting Master Boot Record of %s" @@ -323,7 +324,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Source type does not support verification of ISO MD5 checksum, skipping" -#: ../liveusb/creator.py:1170 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "Synchronizing data on disk..." @@ -375,11 +376,11 @@ msgstr "This is the progress bar that will indicate how far along in the LiveUSB msgid "This is the status console, where all messages get written to." msgstr "This is the status console, where all messages get written to." -#: ../liveusb/creator.py:910 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." msgstr "Trying to continue anyway." -#: ../liveusb/creator.py:942 +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Unable to change volume label: %(message)s" @@ -398,15 +399,15 @@ msgstr "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgid "Unable to find any USB drive" msgstr "Unable to find any USB drive" -#: ../liveusb/creator.py:1224 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "Unable to find any supported device" -#: ../liveusb/creator.py:1067 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "Unable to find partition" -#: ../liveusb/creator.py:1304 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Unable to get Win32_LogicalDisk; win32com query did not return any results" @@ -430,7 +431,7 @@ msgstr "Unable to remove directory from previous LiveOS: %(message)s" msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Unable to remove file from previous LiveOS: %(message)s" -#: ../liveusb/creator.py:1139 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Unable to reset MBR. You may not have the `syslinux` package installed." @@ -455,7 +456,7 @@ msgstr "Unknown ISO, skipping checksum verification" msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Unknown dbus exception while trying to mount device: %(message)s" -#: ../liveusb/creator.py:779 ../liveusb/creator.py:921 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Unknown filesystem. Your device may need to be reformatted." @@ -474,12 +475,12 @@ msgstr "Unmounting '%(udi)s' on '%(device)s'" msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Unmounting mounted filesystems on '%(device)s'" -#: ../liveusb/creator.py:907 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Unsupported device '%(device)s', please report a bug." -#: ../liveusb/creator.py:784 ../liveusb/creator.py:924 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "Unsupported filesystem: %s" @@ -491,7 +492,7 @@ msgid "" "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 "Unsupported filesystem: %s\nIn 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." -#: ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -523,7 +524,7 @@ msgstr "Verifying SHA1 checksum of LiveCD image..." msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verifying SHA256 checksum of LiveCD image..." -#: ../liveusb/creator.py:918 ../liveusb/creator.py:1230 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr "Verifying filesystem..."

1 0

[arm/master] Replacing _halt_time with Controller's connection_time()
by atagar＠torproject.org 02 Sep '14

02 Sep '14

commit 24a2686530a4aef938a77493031be2e08160682c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 1 14:43:15 2014 -0700 Replacing _halt_time with Controller's connection_time() Replacing our attribute that tracked when tor disconnected with the Controller's new connection_time() method. --- arm/header_panel.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 13194e4..cd037a1 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -46,11 +46,6 @@ class HeaderPanel(panel.Panel, threading.Thread): self._halt = False # terminates thread if true self._cond = threading.Condition() # used for pausing the thread - # Time when the panel was paused or tor was stopped. This is used to - # freeze the uptime statistic (uptime increments normally when None). - - self._halt_time = None - # flag to indicate if we've already given file descriptor warnings self._is_fd_sixty_percent_warned = False @@ -198,10 +193,8 @@ class HeaderPanel(panel.Panel, threading.Thread): space_left -= x - 43 - initial_x if space_left >= 7 + len(vals.version_status): - version_color = CONFIG['attr.version_status_colors'].get(vals.version_status, 'white') - x = self.addstr(y, x, ' (') - x = self.addstr(y, x, vals.version_status, version_color) + x = self.addstr(y, x, vals.version_status, vals.version_color) self.addstr(y, x, ')') def _draw_ports_section(self, x, y, width, vals): @@ -223,13 +216,11 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(y, x, vals.format(', Control Socket: {socket_path}')) else: if width >= x + 19 + len(vals.control_port) + len(vals.auth_type): - auth_color = 'red' if vals.auth_type == 'open' else 'green' - x = self.addstr(y, x, ', Control Port (') - x = self.addstr(y, x, vals.auth_type, auth_color) + x = self.addstr(y, x, vals.auth_type, vals.auth_color) self.addstr(y, x, vals.format('): {control_port}')) else: - self.addstr(y, x, ', Control Port: %s' % vals.control_port) + self.addstr(y, x, vals.format(', Control Port: {control_port}')) def _draw_disconnected(self, x, y, width, vals): """ @@ -239,7 +230,7 @@ class HeaderPanel(panel.Panel, threading.Thread): """ x = self.addstr(y, x, 'Tor Disconnected', curses.A_BOLD, 'red') - self.addstr(y, x, ' (%s, press r to reconnect)' % vals.last_heartbeat) + self.addstr(y, x, vals.format(' ({last_heartbeat}, press r to reconnect)')) def _draw_resource_usage(self, x, y, width, vals): """ @@ -249,8 +240,8 @@ class HeaderPanel(panel.Panel, threading.Thread): """ if vals.start_time: - if not self.vals.is_connected: - now = self._halt_time + if not vals.is_connected: + now = vals.connection_time elif self.is_paused(): now = self.get_pause_time() else: @@ -428,7 +419,6 @@ class HeaderPanel(panel.Panel, threading.Thread): if event_type in (State.INIT, State.RESET): initial_height = self.get_height() - self._halt_time = None self.vals = Sampling(self.vals) @@ -442,8 +432,6 @@ class HeaderPanel(panel.Panel, threading.Thread): # just need to redraw ourselves self.redraw(True) elif event_type == State.CLOSED: - self._halt_time = time.time() - self.vals = Sampling(self.vals) self.redraw(True) @@ -464,6 +452,7 @@ class Sampling(object): tor_resources = arm.util.tracker.get_resource_tracker().get_value() self.is_connected = controller.is_alive() + self.connection_time = controller.connection_time() self.last_heartbeat = time.strftime('%H:%M %m/%d/%Y', time.localtime(controller.get_latest_heartbeat())) self.retrieved = time.time() self.arm_total_cpu_time = sum(os.times()[:3]) @@ -484,10 +473,12 @@ class Sampling(object): else: self.auth_type = 'open' + self.auth_color = 'red' if self.auth_type == 'open' else 'green' self.exit_policy = controller.get_exit_policy(None) self.flags = self._get_flags(controller) self.version = str(controller.get_version('Unknown')).split()[0] self.version_status = controller.get_info('status/version/current', 'Unknown') + self.version_color = CONFIG['attr.version_status_colors'].get(self.version_status, 'white') self.pid = controller.get_pid('') self.start_time = stem.util.system.get_start_time(controller.get_pid(None))

1 0

[arm/master] Dropping _get_flags() helper
by atagar＠torproject.org 02 Sep '14

02 Sep '14

commit 24c56a01ea634291d91c7b970929fff2b4974893 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 1 16:59:26 2014 -0700 Dropping _get_flags() helper We can do this in one line via getattr(), so no need for a helper. --- arm/header_panel.py | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 2371667..beccb0c 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -435,6 +435,7 @@ class Sampling(object): def __init__(self, last_sampling = None): controller = tor_controller() + fingerprint = controller.get_info('fingerprint', None) or_listeners = controller.get_listeners(Listener.OR, []) fd_limit = controller.get_info('process/descriptor-limit', '-1') @@ -447,7 +448,7 @@ class Sampling(object): self.retrieved = time.time() self.arm_total_cpu_time = sum(os.times()[:3]) - self.fingerprint = controller.get_info('fingerprint', 'Unknown') + self.fingerprint = fingerprint if fingerprint else 'Unknown' self.nickname = controller.get_conf('Nickname', '') self.or_address = or_listeners[0][0] if or_listeners else controller.get_info('address', 'Unknown') self.or_port = or_listeners[0][1] if or_listeners else '' @@ -466,7 +467,7 @@ class Sampling(object): self.auth_color = 'red' if self.auth_type == 'open' else 'green' self.exit_policy = controller.get_exit_policy(None) - self.flags = self._get_flags(controller) + self.flags = getattr(controller.get_network_status(fingerprint, None), 'flags', []) self.version = str(controller.get_version('Unknown')).split()[0] self.version_status = controller.get_info('status/version/current', 'Unknown') self.version_color = CONFIG['attr.version_status_colors'].get(self.version_status, 'white') @@ -499,22 +500,6 @@ class Sampling(object): return formatted_msg - def _get_flags(self, controller): - """ - Provides the flags held by our relay. This is an empty list if it can't be - determined, likely because we don't have our own router status entry yet. - - :param stem.control.Controller controller: tor control connection - - :returns: **list** with the relays held by our relay - """ - - try: - my_fingerprint = controller.get_info('fingerprint') - return controller.get_network_status(my_fingerprint).flags - except stem.ControllerError: - return [] - def _get_cpu_percentage(self, last_sampling): """ Determine the cpu usage of our own process since the last sampling.

1 0

[arm/master] Dropping header panel's _get_fd_used()
by atagar＠torproject.org 02 Sep '14

02 Sep '14

commit de0f54cf1f9dc616bf712a52deead610220d0964 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 1 15:45:59 2014 -0700 Dropping header panel's _get_fd_used() Removing one of the header panel's helper functions now that it's in stem. --- arm/header_panel.py | 92 +++++++++++++++++---------------------------------- arm/util/tracker.py | 6 ++-- 2 files changed, 34 insertions(+), 64 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index cd037a1..2371667 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -51,7 +51,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._is_fd_sixty_percent_warned = False self._is_fd_ninety_percent_warned = False - self.vals = Sampling() + self._vals = Sampling() # listens for tor reload (sighup) events @@ -65,7 +65,7 @@ class HeaderPanel(panel.Panel, threading.Thread): is_wide = self.get_parent().getmaxyx()[1] >= MIN_DUAL_COL_WIDTH - if self.vals.is_relay: + if self._vals.is_relay: return 4 if is_wide else 6 else: return 3 if is_wide else 4 @@ -90,7 +90,7 @@ class HeaderPanel(panel.Panel, threading.Thread): if key in (ord('n'), ord('N')) and tor_controller().is_newnym_available(): self.send_newnym() - elif key in (ord('r'), ord('R')) and not self.vals.is_connected: + elif key in (ord('r'), ord('R')) and not self._vals.is_connected: # oldSocket = tor_tools.get_conn().get_controller().get_socket() # # controller = None @@ -139,7 +139,7 @@ class HeaderPanel(panel.Panel, threading.Thread): return is_keystroke_consumed def draw(self, width, height): - vals = self.vals # local reference to avoid concurrency concerns + vals = self._vals # local reference to avoid concurrency concerns is_wide = width + 1 >= MIN_DUAL_COL_WIDTH # space available for content @@ -304,7 +304,7 @@ class HeaderPanel(panel.Panel, threading.Thread): x = self.addstr(y, x, 'flags: ') - if len(vals.flags) > 0: + if vals.flags: for i, flag in enumerate(vals.flags): flag_color = CONFIG['attr.flag_colors'].get(flag, 'white') x = self.addstr(y, x, flag, curses.A_BOLD, flag_color) @@ -344,13 +344,11 @@ class HeaderPanel(panel.Panel, threading.Thread): available if in the process of building circuits. """ - newnym_wait = tor_controller().get_newnym_wait() - - if newnym_wait == 0: + if vals.newnym_wait == 0: self.addstr(y, x, "press 'n' for a new identity") else: - plural = 's' if newnym_wait > 1 else '' - self.addstr(y, x, 'building circuits, available again in %i second%s' % (newnym_wait, plural)) + plural = 's' if vals.newnym_wait > 1 else '' + self.addstr(y, x, 'building circuits, available again in %i second%s' % (vals.newnym_wait, plural)) def run(self): """ @@ -362,7 +360,7 @@ class HeaderPanel(panel.Panel, threading.Thread): while not self._halt: current_time = time.time() - if self.is_paused() or current_time - last_draw < 1 or not self.vals.is_connected: + if self.is_paused() or current_time - last_draw < 1 or not self._vals.is_connected: self._cond.acquire() if not self._halt: @@ -379,16 +377,16 @@ class HeaderPanel(panel.Panel, threading.Thread): is_changed = False - if self.vals.pid: + if self._vals.pid: # resource_tracker = arm.util.tracker.get_resource_tracker() # is_changed = self._last_resource_fetch != resource_tracker.run_counter() is_changed = True # TODO: we should decide to redraw or not based on if the sampling values have changed - if is_changed or (self.vals and current_time - self.vals.retrieved >= 20): - self.vals = Sampling(self.vals) + if is_changed or (self._vals and current_time - self._vals.retrieved >= 20): + self._vals = Sampling(self._vals) - if self.vals.fd_used and self.vals.fd_limit: - fd_percent = 100 * self.vals.fd_used / self.vals.fd_limit + if self._vals.fd_used and self._vals.fd_limit: + fd_percent = 100 * self._vals.fd_used / self._vals.fd_limit msg = "Tor's file descriptor usage is at %i%%." % fd_percent if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: @@ -413,28 +411,20 @@ class HeaderPanel(panel.Panel, threading.Thread): self._cond.release() def reset_listener(self, controller, event_type, _): - """ - Updates static parameters on tor reload (sighup) events. - """ + self._update() - if event_type in (State.INIT, State.RESET): - initial_height = self.get_height() + def _update(self): + previous_height = self.get_height() + self._vals = Sampling(self._vals) - self.vals = Sampling(self.vals) + if previous_height != self.get_height(): + # We're toggling between being a relay and client, causing the height + # of this panel to change. Redraw all content so we don't get + # overlapping content. - if self.get_height() != initial_height: - # We're toggling between being a relay and client, causing the height - # of this panel to change. Redraw all content so we don't get - # overlapping content. - - arm.controller.get_controller().redraw() - else: - # just need to redraw ourselves - self.redraw(True) - elif event_type == State.CLOSED: - self.vals = Sampling(self.vals) - - self.redraw(True) + arm.controller.get_controller().redraw() + else: + self.redraw(True) # just need to redraw ourselves class Sampling(object): @@ -465,6 +455,7 @@ class Sampling(object): self.control_port = controller.get_conf('ControlPort', '0') self.socket_path = controller.get_conf('ControlSocket', '') self.is_relay = bool(self.or_port) + self.newnym_wait = controller.get_newnym_wait() if controller.get_conf('HashedControlPassword', None): self.auth_type = 'password' @@ -483,7 +474,11 @@ class Sampling(object): self.pid = controller.get_pid('') self.start_time = stem.util.system.get_start_time(controller.get_pid(None)) self.fd_limit = int(fd_limit) if fd_limit.isdigit() else None - self.fd_used = self._get_fd_used(controller.get_pid(None)) if self.fd_limit else 0 + + try: + self.fd_used = stem.util.proc.file_descriptors_used(controller.get_pid(None)) + except IOError: + self.fd_used = None self.tor_cpu = '%0.1f' % (100 * tor_resources.cpu_sample) self.arm_cpu = '%0.1f' % (100 * self._get_cpu_percentage(last_sampling)) @@ -504,31 +499,6 @@ class Sampling(object): return formatted_msg - def _get_fd_used(self, pid): - """ - Provides the number of file descriptors currently being used by this - process. - - :param int pid: process id to look up - - :returns: **int** of the number of file descriptors used, **None** if this - can't be determined - """ - - # The file descriptor usage is the size of the '/proc/<pid>/fd' contents... - # - # http://linuxshellaccount.blogspot.com/2008/06/finding-number-of-open-file-d… - # - # I'm not sure about other platforms (like BSD) so erroring out there. - - if pid and stem.util.proc.is_available(): - try: - return len(os.listdir('/proc/%s/fd' % pid)) - except: - pass - - return None - def _get_flags(self, controller): """ Provides the flags held by our relay. This is an empty list if it can't be diff --git a/arm/util/tracker.py b/arm/util/tracker.py index 02b1943..224c99c 100644 --- a/arm/util/tracker.py +++ b/arm/util/tracker.py @@ -189,7 +189,7 @@ def _resources_via_proc(pid): :raises: **IOError** if unsuccessful """ - utime, stime, start_time = proc.get_stats( + utime, stime, start_time = proc.stats( pid, proc.Stat.CPU_UTIME, proc.Stat.CPU_STIME, @@ -197,8 +197,8 @@ def _resources_via_proc(pid): ) total_cpu_time = float(utime) + float(stime) - memory_in_bytes = proc.get_memory_usage(pid)[0] - total_memory = proc.get_physical_memory() + memory_in_bytes = proc.memory_usage(pid)[0] + total_memory = proc.physical_memory() uptime = time.time() - float(start_time) memory_in_percent = float(memory_in_bytes) / total_memory

1 0

[arm/master] Drop old cruft for limiting header panel refreshes
by atagar＠torproject.org 02 Sep '14

02 Sep '14

commit 9777ed646e740de2ad84ca78b15c88b0215b48cb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 1 17:05:01 2014 -0700 Drop old cruft for limiting header panel refreshes We once tried to be smart about refreshing the header panel's contents, breaking it into two phases... * cheap to query data that refreshes frequently * costly data we refresh periodically This was to avoid excessive GETINFO/GETCONF queries and system calls. However, Stem caches most controller data and our tracker module rate limits system calls so the header panel doesn't need to worry about this as much. Dropping the legacy cruft. --- arm/header_panel.py | 78 ++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index beccb0c..4ce13b5 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -43,8 +43,8 @@ class HeaderPanel(panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._halt = False # terminates thread if true - self._cond = threading.Condition() # used for pausing the thread + self._pause_condition = threading.Condition() + self._halt = False # terminates thread if true # flag to indicate if we've already given file descriptor warnings @@ -355,60 +355,43 @@ class HeaderPanel(panel.Panel, threading.Thread): Keeps stats updated, checking for new information at a set rate. """ - last_draw = time.time() - 1 + last_ran = -1 while not self._halt: current_time = time.time() - if self.is_paused() or current_time - last_draw < 1 or not self._vals.is_connected: - self._cond.acquire() + if self.is_paused() or not self._vals.is_connected or (time.time() - last_ran) < 1: + with self._pause_condition: + if not self._halt: + self._pause_condition.wait(0.2) - if not self._halt: - self._cond.wait(0.2) + continue # done waiting, try again - self._cond.release() - else: - # Update the volatile attributes (cpu, memory, flags, etc) if we have - # a new resource usage sampling (the most dynamic stat) or its been - # twenty seconds since last fetched (so we still refresh occasionally - # when resource fetches fail). - # - # Otherwise, just redraw the panel to change the uptime field. - - is_changed = False - - if self._vals.pid: - # resource_tracker = arm.util.tracker.get_resource_tracker() - # is_changed = self._last_resource_fetch != resource_tracker.run_counter() - is_changed = True # TODO: we should decide to redraw or not based on if the sampling values have changed - - if is_changed or (self._vals and current_time - self._vals.retrieved >= 20): - self._vals = Sampling(self._vals) - - if self._vals.fd_used and self._vals.fd_limit: - fd_percent = 100 * self._vals.fd_used / self._vals.fd_limit - msg = "Tor's file descriptor usage is at %i%%." % fd_percent - - if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: - self._is_fd_sixty_percent_warned, self._is_fd_ninety_percent_warned = True, True - msg += ' If you run out Tor will be unable to continue functioning.' - log.warn(msg) - elif fd_percent >= 60 and not self._is_fd_sixty_percent_warned: - self._is_fd_sixty_percent_warned = True - log.notice(msg) - - self.redraw(True) - last_draw += 1 + self._vals = Sampling(self._vals) + + if self._vals.fd_used and self._vals.fd_limit: + fd_percent = 100 * self._vals.fd_used / self._vals.fd_limit + msg = "Tor's file descriptor usage is at %i%%." % fd_percent + + if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: + self._is_fd_sixty_percent_warned, self._is_fd_ninety_percent_warned = True, True + msg += ' If you run out Tor will be unable to continue functioning.' + log.warn(msg) + elif fd_percent >= 60 and not self._is_fd_sixty_percent_warned: + self._is_fd_sixty_percent_warned = True + log.notice(msg) + + self.redraw(True) + last_ran = time.time() def stop(self): """ Halts further resolutions and terminates the thread. """ - self._cond.acquire() - self._halt = True - self._cond.notifyAll() - self._cond.release() + with self._pause_condition: + self._halt = True + self._pause_condition.notifyAll() def reset_listener(self, controller, event_type, _): self._update() @@ -435,6 +418,7 @@ class Sampling(object): def __init__(self, last_sampling = None): controller = tor_controller() + pid = controller.get_pid(None) fingerprint = controller.get_info('fingerprint', None) or_listeners = controller.get_listeners(Listener.OR, []) fd_limit = controller.get_info('process/descriptor-limit', '-1') @@ -472,12 +456,12 @@ class Sampling(object): self.version_status = controller.get_info('status/version/current', 'Unknown') self.version_color = CONFIG['attr.version_status_colors'].get(self.version_status, 'white') - self.pid = controller.get_pid('') - self.start_time = stem.util.system.get_start_time(controller.get_pid(None)) + self.pid = pid if pid else '' + self.start_time = stem.util.system.get_start_time(pid) self.fd_limit = int(fd_limit) if fd_limit.isdigit() else None try: - self.fd_used = stem.util.proc.file_descriptors_used(controller.get_pid(None)) + self.fd_used = stem.util.proc.file_descriptors_used(pid) except IOError: self.fd_used = None

1 0

[arm/master] Use log_once() rather than tracking separately
by atagar＠torproject.org 02 Sep '14

02 Sep '14

commit a827941efb16b120dcc86add53bac7b66d9f2c27 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 1 17:24:20 2014 -0700 Use log_once() rather than tracking separately Stem's log module has a log_once() method to avoid logging about the same thing multiple times. Using that rather than tracking it via a header panel attribute. --- arm/header_panel.py | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 4ce13b5..6e1f381 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -26,6 +26,7 @@ from util import panel, tor_controller MIN_DUAL_COL_WIDTH = 141 # minimum width where we'll show two columns SHOW_FD_THRESHOLD = 60 # show file descriptor usage if usage is over this percentage +UPDATE_RATE = 5 # rate in seconds at which we refresh CONFIG = conf.config_dict('arm', { 'attr.flag_colors': {}, @@ -43,17 +44,10 @@ class HeaderPanel(panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._pause_condition = threading.Condition() - self._halt = False # terminates thread if true - - # flag to indicate if we've already given file descriptor warnings - - self._is_fd_sixty_percent_warned = False - self._is_fd_ninety_percent_warned = False - self._vals = Sampling() - # listens for tor reload (sighup) events + self._pause_condition = threading.Condition() + self._halt = False # terminates thread if true tor_controller().add_status_listener(self.reset_listener) @@ -360,28 +354,14 @@ class HeaderPanel(panel.Panel, threading.Thread): while not self._halt: current_time = time.time() - if self.is_paused() or not self._vals.is_connected or (time.time() - last_ran) < 1: + if self.is_paused() or not self._vals.is_connected or (time.time() - last_ran) < UPDATE_RATE: with self._pause_condition: if not self._halt: self._pause_condition.wait(0.2) continue # done waiting, try again - self._vals = Sampling(self._vals) - - if self._vals.fd_used and self._vals.fd_limit: - fd_percent = 100 * self._vals.fd_used / self._vals.fd_limit - msg = "Tor's file descriptor usage is at %i%%." % fd_percent - - if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: - self._is_fd_sixty_percent_warned, self._is_fd_ninety_percent_warned = True, True - msg += ' If you run out Tor will be unable to continue functioning.' - log.warn(msg) - elif fd_percent >= 60 and not self._is_fd_sixty_percent_warned: - self._is_fd_sixty_percent_warned = True - log.notice(msg) - - self.redraw(True) + self._update() last_ran = time.time() def stop(self): @@ -472,6 +452,16 @@ class Sampling(object): self.hostname = uname_vals[1] self.platform = '%s %s' % (uname_vals[0], uname_vals[2]) # [platform name] [version] + if self.fd_used and self.fd_limit: + fd_percent = 100 * self.fd_used / self.fd_limit + msg = "Tor's file descriptor usage is at %i%%." % fd_percent + + if fd_percent >= 90: + msg += ' If you run out Tor will be unable to continue functioning.' + log.log_once('fd_used_at_ninety_percent', log.WARN, msg) + elif fd_percent >= 60: + log.log_once('fd_used_at_sixty_percent', log.NOTICE, msg) + def format(self, msg, crop_width = None): """ Applies our attributes to the given string.

1 0