August 2015 - tor-commits - lists.torproject.org

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Aug '15

10 Aug '15

commit 30cda9595bdf3d3b186062cf025b1f5e769cadd0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 21:45:25 2015 +0000 Update translations for tails-persistence-setup --- en_GB/en_GB.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 45517c6..760a347 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -10,10 +10,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-03-21 20:34+0000\n" +"POT-Creation-Date: 2015-08-05 19:02+0200\n" +"PO-Revision-Date: 2015-08-10 21:36+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" +"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 10 Aug '15

10 Aug '15

commit 5b0c2f91d4fb4b3019eceb3ea3c139311974852f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 21:45:22 2015 +0000 Update translations for liveusb-creator_completed --- en_GB/en_GB.po | 213 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 115 insertions(+), 98 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 73cac9f..ea56dc8 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -6,6 +6,7 @@ # Andi Chandler <andi(a)gowling.com>, 2014 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 # Foorack <maxfaxalv(a)gmail.com>, 2015 +# Isabell Long <isabell(a)issyl0.co.uk>, 2015 # eire123 <jonnydennis10(a)gmail.com>, 2013 # Richard Shaylor <rshaylor(a)me.com>, 2014 # ronnietse <tseronnie(a)ymail.com>, 2014 @@ -13,37 +14,45 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-11 19:14+0100\n" -"PO-Revision-Date: 2015-02-14 09:01+0000\n" -"Last-Translator: Foorack <maxfaxalv(a)gmail.com>\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" +"POT-Creation-Date: 2015-08-04 10:45+0200\n" +"PO-Revision-Date: 2015-08-10 21:37+0000\n" +"Last-Translator: Isabell Long <isabell(a)issyl0.co.uk>\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: ../liveusb/gui.py:451 +msgid "\"Clone & Install\"" +msgstr "\"Clone & Install\"" + +#: ../liveusb/gui.py:453 +msgid "\"Install from ISO\"" +msgstr "\"Install from ISO\"" + #: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format msgid "%(distribution)s Installer" msgstr "%(distribution)s Installer" -#: ../liveusb/gui.py:775 +#: ../liveusb/gui.py:804 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s selected" -#: ../liveusb/gui.py:425 +#: ../liveusb/gui.py:424 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:431 +#: ../liveusb/gui.py:430 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1097 #, python-format msgid "%s already bootable" msgstr "%s already bootable" @@ -100,16 +109,16 @@ 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:1162 ../liveusb/creator.py:1425 +#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Calculating the SHA1 of %s" -#: ../liveusb/creator.py:1373 +#: ../liveusb/creator.py:1407 msgid "Cannot find" msgstr "Cannot find" -#: ../liveusb/creator.py:556 +#: ../liveusb/creator.py:560 #, python-format msgid "Cannot find device %s" msgstr "Cannot find device %s" @@ -128,12 +137,12 @@ msgid "" "Upgrade" msgstr "Clone\n&&\nUpgrade" -#: ../liveusb/creator.py:408 +#: ../liveusb/creator.py:417 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Creating %sMB persistent overlay" -#: ../liveusb/gui.py:553 +#: ../liveusb/gui.py:582 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." @@ -143,58 +152,58 @@ msgstr "Device is not yet mounted, so we cannot determine the amount of free spa msgid "Download %(distribution)s" msgstr "Download %(distribution)s" -#: ../liveusb/gui.py:749 +#: ../liveusb/gui.py:778 msgid "Download complete!" msgstr "Download complete!" -#: ../liveusb/gui.py:753 +#: ../liveusb/gui.py:782 msgid "Download failed: " msgstr "Download failed: " -#: ../liveusb/gui.py:88 +#: ../liveusb/gui.py:89 #, python-format msgid "Downloading %s..." msgstr "Downloading %s..." -#: ../liveusb/creator.py:1158 +#: ../liveusb/creator.py:1192 msgid "Drive is a loopback, skipping MBR reset" msgstr "Drive is a loopback, skipping MBR reset" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:837 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Entering unmount_device for '%(device)s'" -#: ../liveusb/creator.py:1238 +#: ../liveusb/creator.py:1272 msgid "Error probing device" msgstr "Error probing device" -#: ../liveusb/gui.py:212 +#: ../liveusb/gui.py:213 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:384 +#: ../liveusb/creator.py:393 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:147 +#: ../liveusb/creator.py:155 msgid "Extracting live image to the target device..." msgstr "Extracting live image to the target device..." -#: ../liveusb/creator.py:1106 +#: ../liveusb/creator.py:1140 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formatting %(device)s as FAT32" -#: ../liveusb/creator.py:142 +#: ../liveusb/creator.py:150 msgid "ISO MD5 checksum passed" msgstr "ISO MD5 checksum passed" -#: ../liveusb/creator.py:140 +#: ../liveusb/creator.py:148 msgid "ISO MD5 checksum verification failed" msgstr "ISO MD5 checksum verification failed" @@ -208,73 +217,81 @@ msgstr "If you do not select an existing Live ISO, the selected release will be msgid "Install Tails" msgstr "Install Tails" -#: ../liveusb/gui.py:616 +#: ../liveusb/gui.py:645 msgid "Installation complete!" msgstr "Installation complete!" -#: ../liveusb/gui.py:264 +#: ../liveusb/gui.py:265 #, python-format msgid "Installation complete! (%s)" msgstr "Installation complete! (%s)" -#: ../liveusb/gui.py:617 +#: ../liveusb/gui.py:646 msgid "Installation was completed. Press OK to close this program." msgstr "Installation was completed. Press OK to close this program." -#: ../liveusb/creator.py:963 ../liveusb/creator.py:1279 +#: ../liveusb/creator.py:990 ../liveusb/creator.py:1313 msgid "Installing bootloader..." msgstr "Installing bootloader..." -#: ../liveusb/gui.py:269 +#: ../liveusb/gui.py:454 +#, python-format +msgid "" +"It is impossible to upgrade the device %(pretty_name)s because it was not " +"created using Tails Installer. You should instead use %(action)s to upgrade " +"Tails on this device." +msgstr "It is impossible to upgrade the device %(pretty_name)s because it was not created using Tails Installer. You should instead use %(action)s to upgrade Tails on this device." + +#: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" msgstr "LiveUSB creation failed!" -#: ../liveusb/creator.py:1374 +#: ../liveusb/creator.py:1408 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:1250 +#: ../liveusb/creator.py:1284 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:849 +#: ../liveusb/creator.py:859 #, python-format msgid "Mount %s exists after unmounting" msgstr "Mount %s exists after unmounting" -#: ../liveusb/gui.py:559 +#: ../liveusb/gui.py:588 #, python-format msgid "No free space on device %(device)s" msgstr "No free space on device %(device)s" -#: ../liveusb/creator.py:816 +#: ../liveusb/creator.py:826 msgid "No mount points found" msgstr "No mount points found" -#: ../liveusb/creator.py:401 +#: ../liveusb/creator.py:410 #, python-format msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "Not enough free space on device.\n%dMB ISO + %dMB overlay > %dMB free space" -#: ../liveusb/gui.py:540 +#: ../liveusb/gui.py:569 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partition is FAT16; Restricting overlay size to 2G" -#: ../liveusb/gui.py:536 +#: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Partition is FAT32; Restricting overlay size to 4G" -#: ../liveusb/creator.py:228 ../liveusb/creator.py:856 +#: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format msgid "Partitioning device %(device)s" msgstr "Partitioning device %(device)s" -#: ../liveusb/gui.py:607 +#: ../liveusb/gui.py:636 msgid "Persistent Storage" msgstr "Persistent Storage" @@ -282,53 +299,53 @@ msgstr "Persistent Storage" msgid "Persistent Storage (0 MB)" msgstr "Persistent Storage (0 MB)" -#: ../liveusb/gui.py:669 ../liveusb/gui.py:698 +#: ../liveusb/gui.py:698 ../liveusb/gui.py:727 msgid "Please confirm your device selection" msgstr "Please confirm your device selection" -#: ../liveusb/gui.py:453 +#: ../liveusb/gui.py:481 msgid "Refreshing releases..." msgstr "Refreshing releases..." -#: ../liveusb/gui.py:458 +#: ../liveusb/gui.py:486 msgid "Releases updated!" msgstr "Releases updated!" -#: ../liveusb/creator.py:970 ../liveusb/creator.py:1297 +#: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 #, python-format msgid "Removing %(file)s" msgstr "Removing %(file)s" -#: ../liveusb/creator.py:483 +#: ../liveusb/creator.py:492 msgid "Removing existing Live OS" msgstr "Remove existing Live OS" -#: ../liveusb/creator.py:1152 +#: ../liveusb/creator.py:1186 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Resetting Master Boot Record of %s" -#: ../liveusb/gui.py:760 +#: ../liveusb/gui.py:789 msgid "Select Live ISO" msgstr "Select Live ISO" -#: ../liveusb/creator.py:184 +#: ../liveusb/creator.py:192 msgid "Setting up OLPC boot file..." msgstr "Setting up OLPC boot file..." -#: ../liveusb/creator.py:730 +#: ../liveusb/creator.py:742 #, 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:133 +#: ../liveusb/creator.py:141 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:1186 +#: ../liveusb/creator.py:1220 msgid "Synchronizing data on disk..." msgstr "Synchronizing data on disk..." @@ -336,13 +353,20 @@ msgstr "Synchronizing data on disk..." msgid "Target Device" msgstr "Target Device" -#: ../liveusb/gui.py:763 +#: ../liveusb/gui.py:438 +#, python-format +msgid "" +"The device \"%(pretty_name)s\" is too small to install Tails (at least " +"%(size)s GB is required)." +msgstr "The device \"%(pretty_name)s\" is too small to install Tails (at least %(size)s GB is required)." + +#: ../liveusb/gui.py:792 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:345 +#: ../liveusb/creator.py:354 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -380,134 +404,127 @@ 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:925 +#: ../liveusb/creator.py:952 msgid "Trying to continue anyway." msgstr "Trying to continue anyway." -#: ../liveusb/gui.py:407 +#: ../liveusb/gui.py:464 msgid "USB drive found" msgstr "USB drive found" -#: ../liveusb/creator.py:958 +#: ../liveusb/creator.py:985 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Unable to change volume label: %(message)s" -#: ../liveusb/creator.py:492 ../liveusb/creator.py:503 +#: ../liveusb/creator.py:501 ../liveusb/creator.py:512 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Unable to chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:469 +#: ../liveusb/creator.py:478 #, 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:402 +#: ../liveusb/gui.py:403 msgid "Unable to find any USB drive" msgstr "Unable to find any USB drive" -#: ../liveusb/creator.py:1240 +#: ../liveusb/creator.py:1274 msgid "Unable to find any supported device" msgstr "Unable to find any supported device" -#: ../liveusb/creator.py:1083 +#: ../liveusb/creator.py:1117 msgid "Unable to find partition" msgstr "Unable to find partition" -#: ../liveusb/creator.py:1320 +#: ../liveusb/creator.py:1354 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:662 +#: ../liveusb/gui.py:691 msgid "Unable to mount device" msgstr "Unable to mount device" -#: ../liveusb/creator.py:804 +#: ../liveusb/creator.py:814 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Unable to mount device: %(message)s" -#: ../liveusb/creator.py:508 +#: ../liveusb/creator.py:517 #, 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:496 +#: ../liveusb/creator.py:505 #, 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:1155 +#: ../liveusb/creator.py:1189 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:769 +#: ../liveusb/gui.py:798 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:711 +#: ../liveusb/creator.py:723 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Unable to write on %(device)s, skipping." -#: ../liveusb/creator.py:390 +#: ../liveusb/creator.py:399 msgid "Unknown ISO, skipping checksum verification" msgstr "Unknown ISO, skipping checksum verification" -#: ../liveusb/creator.py:800 +#: ../liveusb/creator.py:810 #, 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:779 ../liveusb/creator.py:937 +#: ../liveusb/creator.py:791 ../liveusb/creator.py:964 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Unknown filesystem. Your device may need to be reformatted." -#: ../liveusb/gui.py:84 +#: ../liveusb/gui.py:85 #, python-format msgid "Unknown release: %s" msgstr "Unknown release: %s" -#: ../liveusb/creator.py:841 +#: ../liveusb/creator.py:851 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Unmounting '%(udi)s' on '%(device)s'" -#: ../liveusb/creator.py:837 +#: ../liveusb/creator.py:847 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Unmounting mounted filesystems on '%(device)s'" -#: ../liveusb/creator.py:922 +#: ../liveusb/creator.py:949 #, 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:940 +#: ../liveusb/creator.py:794 ../liveusb/creator.py:967 #, python-format msgid "Unsupported filesystem: %s" msgstr "Unsupported filesystem: %s" -#: ../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:1253 +#: ../liveusb/creator.py:1287 #, 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/creator.py:882 +#: ../liveusb/creator.py:892 #, python-format msgid "Updating properties of system partition %(system_partition)s" msgstr "Updating properties of system partition %(system_partition)s" @@ -520,47 +537,47 @@ msgstr "Upgrade from ISO" msgid "Use existing Live system ISO" msgstr "Use existing Live system ISO" -#: ../liveusb/creator.py:135 +#: ../liveusb/creator.py:143 msgid "Verifying ISO MD5 checksum" msgstr "Verifying ISO MD5 checksum" -#: ../liveusb/creator.py:364 +#: ../liveusb/creator.py:373 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Verifying SHA1 checksum of LiveCD image..." -#: ../liveusb/creator.py:368 +#: ../liveusb/creator.py:377 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verifying SHA256 checksum of LiveCD image..." -#: ../liveusb/creator.py:934 ../liveusb/creator.py:1246 +#: ../liveusb/creator.py:961 ../liveusb/creator.py:1280 msgid "Verifying filesystem..." msgstr "Verifying filesystem..." -#: ../liveusb/gui.py:696 +#: ../liveusb/gui.py:725 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:376 +#: ../liveusb/gui.py:377 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:154 +#: ../liveusb/creator.py:162 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Wrote to device at %(speed)d MB/sec" -#: ../liveusb/gui.py:670 +#: ../liveusb/gui.py:699 #, 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:686 +#: ../liveusb/gui.py:715 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -568,17 +585,17 @@ 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:618 +#: ../liveusb/creator.py:622 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:754 +#: ../liveusb/gui.py:783 msgid "You can try again to resume your download" msgstr "You can try again to resume your download" -#: ../liveusb/creator.py:94 +#: ../liveusb/creator.py:95 msgid "You must run this application as root" msgstr "You must run this application as root"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 10 Aug '15

10 Aug '15

commit e15560c72ba8fe418902427955ee66d3325bc509 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 21:45:18 2015 +0000 Update translations for liveusb-creator --- en_GB/en_GB.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index a8cf9a8..ea56dc8 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -6,6 +6,7 @@ # Andi Chandler <andi(a)gowling.com>, 2014 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 # Foorack <maxfaxalv(a)gmail.com>, 2015 +# Isabell Long <isabell(a)issyl0.co.uk>, 2015 # eire123 <jonnydennis10(a)gmail.com>, 2013 # Richard Shaylor <rshaylor(a)me.com>, 2014 # ronnietse <tseronnie(a)ymail.com>, 2014 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-04 10:45+0200\n" -"PO-Revision-Date: 2015-08-05 08:28+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-08-10 21:37+0000\n" +"Last-Translator: Isabell Long <isabell(a)issyl0.co.uk>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,11 +26,11 @@ msgstr "" #: ../liveusb/gui.py:451 msgid "\"Clone & Install\"" -msgstr "" +msgstr "\"Clone & Install\"" #: ../liveusb/gui.py:453 msgid "\"Install from ISO\"" -msgstr "" +msgstr "\"Install from ISO\"" #: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format @@ -239,7 +240,7 @@ msgid "" "It is impossible to upgrade the device %(pretty_name)s because it was not " "created using Tails Installer. You should instead use %(action)s to upgrade " "Tails on this device." -msgstr "" +msgstr "It is impossible to upgrade the device %(pretty_name)s because it was not created using Tails Installer. You should instead use %(action)s to upgrade Tails on this device." #: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" @@ -357,7 +358,7 @@ msgstr "Target Device" msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "" +msgstr "The device \"%(pretty_name)s\" is too small to install Tails (at least %(size)s GB is required)." #: ../liveusb/gui.py:792 msgid ""

1 0

[webwml/master] Describe TB as portable
by sebastian＠torproject.org 10 Aug '15

10 Aug '15

commit f9ebf8bc4a95ebb72f78425221e070803d7dc4a6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Aug 10 23:25:48 2015 +0200 Describe TB as portable Suggestion by two_little_ponies on #tor-project, thanks! --- projects/en/torbrowser.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 79ab380..93f8e4f 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -28,7 +28,8 @@ <p>The <strong>Tor Browser</strong> lets you use Tor on Windows, Mac OS X, or Linux without needing to install any software. It can run off a USB flash drive, comes with a pre-configured web - browser to protect your anonymity, and is self-contained.</p> + browser to protect your anonymity, and is self-contained + (portable).</p> <p style="padding-top:10px;"><a href="<page donate/donate>">Do you like what we do? Please consider making a donation »</a></p> </div> <div class="pjsplash">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 10 Aug '15

10 Aug '15

commit 238bd0ae7d483f0bd773665d5e6348933f8c60c5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 21:15:58 2015 +0000 Update translations for torbutton-torbuttonproperties --- es_MX/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es_MX/torbutton.properties b/es_MX/torbutton.properties index c6999a6..75f5a5d 100644 --- a/es_MX/torbutton.properties +++ b/es_MX/torbutton.properties @@ -1,12 +1,12 @@ torbutton.button.tooltip.disabled = Habilitar Tor torbutton.button.tooltip.enabled = Deshabilitar Tor torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.ip_unknown = IP desconocido torbutton.circuit_display.onion_site = Onion site -torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = relay -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.tor_bridge = Puente +torbutton.circuit_display.unknown_country = País Desconocido torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click para habilitar Tor torbutton.panel.tooltip.enabled = Click para deshabilitar Tor

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 10 Aug '15

10 Aug '15

commit 66a0c06dbcbc8ec2bf6f2bf8cde14255acab2b78 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 21:15:13 2015 +0000 Update translations for torcheck_completed --- es_MX/torcheck.po | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/es_MX/torcheck.po b/es_MX/torcheck.po index e4f8cec..7493bc1 100644 --- a/es_MX/torcheck.po +++ b/es_MX/torcheck.po @@ -2,6 +2,8 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Fernando Navarro <fernavarro2(a)yahoo.com>, 2015 +# Jacobo Nájera <jacobo(a)gnu.org>, 2015 # TheFreeman <maurocarrizales(a)outlook.com>, 2014 # Sofía Celi Ramos <soficeli0(a)gmail.com>, 2014 # RytVonD <the_lovely_cock(a)hotmail.co.uk>, 2014 @@ -9,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Sofía Celi Ramos <soficeli0(a)gmail.com>\n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" +"PO-Revision-Date: 2015-08-10 20:52+0000\n" +"Last-Translator: Fernando Navarro <fernavarro2(a)yahoo.com>\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,8 +30,8 @@ msgid "" "the Internet anonymously." msgstr "Porfavor dirigite a <a href=\"https://www.torproject.org/\"> el sitio web de Tor</a>para información más extensa acerca de cómo usar Tor de manera segura. Ahora eres libre de navegar por la Internet anónimamente " -msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Hay una actualización de seguridad disponible para el Tor Browser Bundle." +msgid "There is a security update available for Tor Browser." +msgstr "Hay actualizaciones de seguridad disponibles para Tor Browser." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -95,5 +97,11 @@ msgstr "JavaScript está habilitado" msgid "JavaScript is disabled." msgstr "JavaScript está deshabilitado" -msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "Sin embargo, no parece ser el Tor Browser Bundle." +msgid "However, it does not appear to be Tor Browser." +msgstr "Sin embargo, no parece ser el navegador Tor ." + +msgid "Run a Relay" +msgstr "Ejecutar un relé" + +msgid "Stay Anonymous" +msgstr "Manténgase Anónimo"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 10 Aug '15

10 Aug '15

commit d2fb77519512096659f2f46b68ff5065d0e49580 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 10 21:15:10 2015 +0000 Update translations for torcheck --- es_MX/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/es_MX/torcheck.po b/es_MX/torcheck.po index e796d26..7493bc1 100644 --- a/es_MX/torcheck.po +++ b/es_MX/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Fernando Navarro <fernavarro2(a)yahoo.com>, 2015 # Jacobo Nájera <jacobo(a)gnu.org>, 2015 # TheFreeman <maurocarrizales(a)outlook.com>, 2014 # Sofía Celi Ramos <soficeli0(a)gmail.com>, 2014 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-04-03 01:20+0000\n" -"Last-Translator: Jacobo Nájera <jacobo(a)gnu.org>\n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" +"PO-Revision-Date: 2015-08-10 20:52+0000\n" +"Last-Translator: Fernando Navarro <fernavarro2(a)yahoo.com>\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -97,10 +98,10 @@ msgid "JavaScript is disabled." msgstr "JavaScript está deshabilitado" msgid "However, it does not appear to be Tor Browser." -msgstr "" +msgstr "Sin embargo, no parece ser el navegador Tor ." msgid "Run a Relay" -msgstr "" +msgstr "Ejecutar un relé" msgid "Stay Anonymous" -msgstr "" +msgstr "Manténgase Anónimo"

1 0

[tor/master] Remove a 9-function strongly connected component of tor's callgraph.
by nickm＠torproject.org 10 Aug '15

10 Aug '15

commit 8afbc154f794835633559f81a89232f1bccc1d8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 10 14:27:23 2015 -0400 Remove a 9-function strongly connected component of tor's callgraph. microdesc_free_() called get_microdesc_cache(), which had the fun side-effect of potentially reloading the whole cache from disk. Replace it with a variant that doesn't. --- changes/microdesc_cycle | 4 ++++ src/or/microdesc.c | 27 +++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/changes/microdesc_cycle b/changes/microdesc_cycle new file mode 100644 index 0000000..fddc2be --- /dev/null +++ b/changes/microdesc_cycle @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Simplify the microdesc_free() implementation so that it no longer + appears (to code analysis tools) to potentially invoke a huge suite + of other microdesc functions. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index ee48f6a..051603d 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -39,8 +39,13 @@ struct microdesc_cache_t { uint64_t total_len_seen; /** Total number of microdescriptors we have added to this cache */ unsigned n_seen; + + /** True iff we have loaded this cache from disk ever. */ + int is_loaded; }; +static microdesc_cache_t *get_microdesc_cache_noload(void); + /** Helper: computes a hash of <b>md</b> to place it in a hash table. */ static INLINE unsigned int microdesc_hash_(microdesc_t *md) @@ -113,12 +118,24 @@ static microdesc_cache_t *the_microdesc_cache = NULL; microdesc_cache_t * get_microdesc_cache(void) { + microdesc_cache_t *cache = get_microdesc_cache_noload(); + if (PREDICT_UNLIKELY(cache->is_loaded == 0)) { + microdesc_cache_reload(cache); + } + return cache; +} + +/** Return a pointer to the microdescriptor cache, creating (but not loading) + * it if necessary. */ +static microdesc_cache_t * +get_microdesc_cache_noload(void) +{ if (PREDICT_UNLIKELY(the_microdesc_cache==NULL)) { - microdesc_cache_t *cache = tor_malloc_zero(sizeof(microdesc_cache_t)); + microdesc_cache_t *cache = tor_malloc_zero(sizeof(*cache)); + tor_malloc_zero(sizeof(microdesc_cache_t)); HT_INIT(microdesc_map, &cache->map); cache->cache_fname = get_datadir_fname("cached-microdescs"); cache->journal_fname = get_datadir_fname("cached-microdescs.new"); - microdesc_cache_reload(cache); the_microdesc_cache = cache; } return the_microdesc_cache; @@ -353,6 +370,8 @@ microdesc_cache_reload(microdesc_cache_t *cache) microdesc_cache_clear(cache); + cache->is_loaded = 1; + mm = cache->cache_content = tor_mmap_file(cache->cache_fname); if (mm) { added = microdescs_add_to_cache(cache, mm->data, mm->data+mm->size, @@ -697,7 +716,7 @@ microdesc_free_(microdesc_t *md, const char *fname, int lineno) /* Make sure that the microdesc was really removed from the appropriate data structures. */ if (md->held_in_map) { - microdesc_cache_t *cache = get_microdesc_cache(); + microdesc_cache_t *cache = get_microdesc_cache_noload(); microdesc_t *md2 = HT_FIND(microdesc_map, &cache->map, md); if (md2 == md) { log_warn(LD_BUG, "microdesc_free() called from %s:%d, but md was still " @@ -710,7 +729,7 @@ microdesc_free_(microdesc_t *md, const char *fname, int lineno) tor_fragile_assert(); } if (md->held_by_nodes) { - microdesc_cache_t *cache = get_microdesc_cache(); + microdesc_cache_t *cache = get_microdesc_cache_noload(); int found=0; const smartlist_t *nodes = nodelist_get_list(); const int ht_badness = HT_REP_IS_BAD_(microdesc_map, &cache->map);

1 0

[torspec/master] Fix a typo in proposals/242-better-families.txt
by nickm＠torproject.org 10 Aug '15

10 Aug '15

commit 8307e968817e4178941c7647ef4ce6df5bb0c76b Author: teor <teor2345(a)gmail.com> Date: Mon Aug 10 14:10:54 2015 +1000 Fix a typo in proposals/242-better-families.txt Patch by "teor" (Tim Wilson-Brown). --- proposals/242-better-families.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/242-better-families.txt b/proposals/242-better-families.txt index b3a6399..400bc3c 100644 --- a/proposals/242-better-families.txt +++ b/proposals/242-better-families.txt @@ -59,7 +59,7 @@ Status: Open When generating microdescriptors using a suitable consensus method, the authorities include a "family-keys" line if the underlying server descriptor contains any family-cert lines. - For reach family-cert in the server descriptor, they add a + For each family-cert in the server descriptor, they add a base-64-encoded string of that family-cert's signing key. 6. Client behavior

1 0

[tor/master] Update callgraph code to find and output strongly connected components
by nickm＠torproject.org 10 Aug '15

10 Aug '15

commit def5883bbb744727d797558da07c490f6578aff9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 10 12:11:34 2015 -0400 Update callgraph code to find and output strongly connected components --- scripts/maint/analyze_callgraph.py | 51 +++++++++++++++++++++++++++++++++--- scripts/maint/display_callgraph.py | 17 ++++++++++-- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/scripts/maint/analyze_callgraph.py b/scripts/maint/analyze_callgraph.py index afafe14..69ae128 100755 --- a/scripts/maint/analyze_callgraph.py +++ b/scripts/maint/analyze_callgraph.py @@ -32,7 +32,7 @@ class Parser: self.extern = True m = re.match(r" CS<[^>]+> calls function '([^']+)'", line) if m: - self.calledfns.add(m.group(1)) + self.calledfns.add(m.group(1)) self.enter_func(None) def extract_callgraph(self): @@ -56,6 +56,46 @@ def transitive_closure(g): changed = True return g +def strongly_connected_components(g): + # From https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algo…, done stupidly. + index_of = {} + index = [ 0 ] + lowlink = {} + S = [] + onStack = set() + + all_sccs = [] + + def strongconnect(fn): + index_of[fn] = index[0] + lowlink[fn] = index[0] + index[0] += 1 + S.append(fn) + onStack.add(fn) + + for w in g.get(fn, []): + if w not in index_of: + strongconnect(w) + lowlink[fn] = min(lowlink[fn], lowlink[w]) + elif w in onStack: + lowlink[fn] = min(lowlink[fn], index_of[w]) + + if lowlink[fn] == index_of[fn]: + this_scc = [] + all_sccs.append(this_scc) + while True: + w = S.pop() + onStack.remove(w) + this_scc.append(w) + if w == fn: + break + + for v in g.keys(): + if v not in index_of: + strongconnect(v) + + return all_sccs + if __name__ == '__main__': p = Parser() for fname in sys.argv[1:]: @@ -63,10 +103,15 @@ if __name__ == '__main__': p.parse_callgraph_file(f) callgraph = p.extract_callgraph() + sccs = strongly_connected_components(callgraph) + closure = transitive_closure(callgraph) - with open('callgraph.cp', 'w') as f: + with open('callgraph.pkl', 'w') as f: cPickle.dump(callgraph, f) - with open('callgraph_closure.cp', 'w') as f: + with open('callgraph_closure.pkl', 'w') as f: cPickle.dump(closure, f) + + with open('callgraph_sccs.pkl', 'w') as f: + cPickle.dump(sccs, f) diff --git a/scripts/maint/display_callgraph.py b/scripts/maint/display_callgraph.py index 4e4ea63..9ead56c 100755 --- a/scripts/maint/display_callgraph.py +++ b/scripts/maint/display_callgraph.py @@ -2,8 +2,21 @@ import cPickle -callgraph = cPickle.load(open("callgraph.cp")) -closure = cPickle.load(open("callgraph_closure.cp")) +callgraph = cPickle.load(open("callgraph.pkl")) +closure = cPickle.load(open("callgraph_closure.pkl")) +sccs = cPickle.load(open("callgraph_sccs.pkl")) for n_reachable, fn in sorted(list((len(r), fn) for fn, r in closure.iteritems())): print "%s can reach %s other functions." %(fn, n_reachable) + + +c = [ (len(component), component) for component in sccs ] +c.sort() + +for n, component in c: + if n < 2: + continue + print n, component + + +

1 0