April 2019 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit e308ea18c87d07dee869d5ecbd6d221d1cd96a37 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:16:14 2019 +0000 Update translations for liveusb-creator --- sw/sw.po | 190 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 104 insertions(+), 86 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index 69e482c44..510b964ba 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -5,11 +5,11 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-16 11:40+0200\n" -"PO-Revision-Date: 2018-08-16 14:46+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2019-02-24 07:24+0100\n" +"PO-Revision-Date: 2012-10-03 17:40+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,194 +76,194 @@ msgstr "" msgid "Removing existing Live OS" msgstr "" -#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456 +#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "" -#: ../tails_installer/creator.py:449 +#: ../tails_installer/creator.py:450 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "" -#: ../tails_installer/creator.py:462 +#: ../tails_installer/creator.py:464 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "" -#: ../tails_installer/creator.py:510 +#: ../tails_installer/creator.py:512 #, python-format msgid "Cannot find device %s" msgstr "" -#: ../tails_installer/creator.py:711 +#: ../tails_installer/creator.py:713 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "" -#: ../tails_installer/creator.py:741 +#: ../tails_installer/creator.py:743 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "" -#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008 +#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "" -#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011 +#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013 #, python-format msgid "Unsupported filesystem: %s" msgstr "" -#: ../tails_installer/creator.py:805 +#: ../tails_installer/creator.py:807 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" msgstr "" -#: ../tails_installer/creator.py:810 +#: ../tails_installer/creator.py:812 #, python-format msgid "Unable to mount device: %(message)s" msgstr "" -#: ../tails_installer/creator.py:815 +#: ../tails_installer/creator.py:817 msgid "No mount points found" msgstr "" -#: ../tails_installer/creator.py:826 +#: ../tails_installer/creator.py:828 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "" -#: ../tails_installer/creator.py:836 +#: ../tails_installer/creator.py:838 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "" -#: ../tails_installer/creator.py:840 +#: ../tails_installer/creator.py:842 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "" -#: ../tails_installer/creator.py:851 +#: ../tails_installer/creator.py:853 #, python-format msgid "Mount %s exists after unmounting" msgstr "" -#: ../tails_installer/creator.py:864 +#: ../tails_installer/creator.py:866 #, python-format msgid "Partitioning device %(device)s" msgstr "" -#: ../tails_installer/creator.py:993 +#: ../tails_installer/creator.py:995 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "" -#: ../tails_installer/creator.py:996 +#: ../tails_installer/creator.py:998 msgid "Trying to continue anyway." msgstr "" -#: ../tails_installer/creator.py:1005 ../tails_installer/creator.py:1401 +#: ../tails_installer/creator.py:1007 ../tails_installer/creator.py:1405 msgid "Verifying filesystem..." msgstr "" -#: ../tails_installer/creator.py:1029 +#: ../tails_installer/creator.py:1031 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "" -#: ../tails_installer/creator.py:1034 ../tails_installer/creator.py:1434 +#: ../tails_installer/creator.py:1037 ../tails_installer/creator.py:1440 msgid "Installing bootloader..." msgstr "" -#: ../tails_installer/creator.py:1061 +#: ../tails_installer/creator.py:1064 #, python-format msgid "Could not find the '%s' COM32 module" msgstr "" -#: ../tails_installer/creator.py:1069 ../tails_installer/creator.py:1452 +#: ../tails_installer/creator.py:1072 ../tails_installer/creator.py:1458 #, python-format msgid "Removing %(file)s" msgstr "" -#: ../tails_installer/creator.py:1183 +#: ../tails_installer/creator.py:1186 #, python-format msgid "%s already bootable" msgstr "" -#: ../tails_installer/creator.py:1203 +#: ../tails_installer/creator.py:1206 msgid "Unable to find partition" msgstr "" -#: ../tails_installer/creator.py:1226 +#: ../tails_installer/creator.py:1229 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "" -#: ../tails_installer/creator.py:1286 +#: ../tails_installer/creator.py:1289 msgid "Could not find syslinux' gptmbr.bin" msgstr "" -#: ../tails_installer/creator.py:1299 +#: ../tails_installer/creator.py:1302 #, python-format msgid "Reading extracted MBR from %s" msgstr "" -#: ../tails_installer/creator.py:1303 +#: ../tails_installer/creator.py:1306 #, python-format msgid "Could not read the extracted MBR from %(path)s" msgstr "" -#: ../tails_installer/creator.py:1316 ../tails_installer/creator.py:1317 +#: ../tails_installer/creator.py:1319 ../tails_installer/creator.py:1320 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "" -#: ../tails_installer/creator.py:1322 +#: ../tails_installer/creator.py:1325 msgid "Drive is a loopback, skipping MBR reset" msgstr "" -#: ../tails_installer/creator.py:1326 ../tails_installer/creator.py:1580 +#: ../tails_installer/creator.py:1329 ../tails_installer/creator.py:1589 #, python-format msgid "Calculating the SHA1 of %s" msgstr "" -#: ../tails_installer/creator.py:1351 +#: ../tails_installer/creator.py:1354 msgid "Synchronizing data on disk..." msgstr "" -#: ../tails_installer/creator.py:1393 +#: ../tails_installer/creator.py:1397 msgid "Error probing device" msgstr "" -#: ../tails_installer/creator.py:1395 +#: ../tails_installer/creator.py:1399 msgid "Unable to find any supported device" msgstr "" -#: ../tails_installer/creator.py:1405 +#: ../tails_installer/creator.py:1409 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "" -#: ../tails_installer/creator.py:1408 +#: ../tails_installer/creator.py:1412 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "" -#: ../tails_installer/creator.py:1475 +#: ../tails_installer/creator.py:1481 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "" -#: ../tails_installer/creator.py:1528 +#: ../tails_installer/creator.py:1536 msgid "Cannot find" msgstr "" -#: ../tails_installer/creator.py:1529 +#: ../tails_installer/creator.py:1537 msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." @@ -294,72 +294,86 @@ msgstr "" msgid "Tails installation failed!" msgstr "" -#: ../tails_installer/gui.py:361 +#: ../tails_installer/gui.py:369 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 "" -#: ../tails_installer/gui.py:373 +#: ../tails_installer/gui.py:381 msgid "Tails Installer" msgstr "" -#: ../tails_installer/gui.py:423 ../data/tails-installer.ui.h:2 +#: ../tails_installer/gui.py:441 +msgid "Tails Installer is deprecated in Debian" +msgstr "" + +#: ../tails_installer/gui.py:443 +msgid "" +"To install Tails from scratch, use GNOME Disks instead.\n" +"<a href='https://tails.boum.org/install/linux/usb-overview'>See the installation instructions</a>\n" +"\n" +"To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" +"<a href='https://tails.boum.org/upgrade/tails-overview'>See the manual upgrade instructions</a>" +msgstr "" + +#: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" msgstr "" -#: ../tails_installer/gui.py:430 ../data/tails-installer.ui.h:3 +#: ../tails_installer/gui.py:457 ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" msgstr "" -#: ../tails_installer/gui.py:467 +#: ../tails_installer/gui.py:494 ../tails_installer/gui.py:815 msgid "Upgrade" msgstr "" -#: ../tails_installer/gui.py:469 +#: ../tails_installer/gui.py:496 msgid "Manual Upgrade Instructions" msgstr "" -#: ../tails_installer/gui.py:471 +#: ../tails_installer/gui.py:498 msgid "https://tails.boum.org/upgrade/" msgstr "" -#: ../tails_installer/gui.py:479 ../data/tails-installer.ui.h:7 +#: ../tails_installer/gui.py:506 ../tails_installer/gui.py:727 +#: ../tails_installer/gui.py:792 ../data/tails-installer.ui.h:7 msgid "Install" msgstr "" -#: ../tails_installer/gui.py:482 ../data/tails-installer.ui.h:1 +#: ../tails_installer/gui.py:509 ../data/tails-installer.ui.h:1 msgid "Installation Instructions" msgstr "" -#: ../tails_installer/gui.py:484 +#: ../tails_installer/gui.py:511 msgid "https://tails.boum.org/install/" msgstr "" -#: ../tails_installer/gui.py:490 +#: ../tails_installer/gui.py:517 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" msgstr "" -#: ../tails_installer/gui.py:502 +#: ../tails_installer/gui.py:529 msgid "No ISO image selected" msgstr "" -#: ../tails_installer/gui.py:503 +#: ../tails_installer/gui.py:530 msgid "Please select a Tails ISO image." msgstr "" -#: ../tails_installer/gui.py:545 +#: ../tails_installer/gui.py:572 msgid "No device suitable to install Tails could be found" msgstr "" -#: ../tails_installer/gui.py:547 +#: ../tails_installer/gui.py:574 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." msgstr "" -#: ../tails_installer/gui.py:581 +#: ../tails_installer/gui.py:608 #, python-format msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " @@ -367,45 +381,49 @@ msgid "" "different model." msgstr "" -#: ../tails_installer/gui.py:591 +#: ../tails_installer/gui.py:618 #, python-format msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." msgstr "" -#: ../tails_installer/gui.py:604 +#: ../tails_installer/gui.py:631 #, python-format msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "https://tails.boum.org/install/download" msgstr "" -#: ../tails_installer/gui.py:625 +#: ../tails_installer/gui.py:652 msgid "An error happened while installing Tails" msgstr "" -#: ../tails_installer/gui.py:637 +#: ../tails_installer/gui.py:664 msgid "Refreshing releases..." msgstr "" -#: ../tails_installer/gui.py:642 +#: ../tails_installer/gui.py:669 msgid "Releases updated!" msgstr "" -#: ../tails_installer/gui.py:695 +#: ../tails_installer/gui.py:722 msgid "Installation complete!" msgstr "" -#: ../tails_installer/gui.py:744 +#: ../tails_installer/gui.py:738 +msgid "Cancel" +msgstr "" + +#: ../tails_installer/gui.py:774 msgid "Unable to mount device" msgstr "" -#: ../tails_installer/gui.py:751 ../tails_installer/gui.py:783 +#: ../tails_installer/gui.py:781 ../tails_installer/gui.py:814 msgid "Confirm the target USB stick" msgstr "" -#: ../tails_installer/gui.py:752 +#: ../tails_installer/gui.py:782 #, python-format msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" @@ -413,62 +431,62 @@ msgid "" "All data on this USB stick will be lost." msgstr "" -#: ../tails_installer/gui.py:770 +#: ../tails_installer/gui.py:801 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" msgstr "" -#: ../tails_installer/gui.py:778 +#: ../tails_installer/gui.py:809 msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." msgstr "" -#: ../tails_installer/gui.py:779 +#: ../tails_installer/gui.py:810 #, python-format msgid "%(description)s%(persistence_message)s" msgstr "" -#: ../tails_installer/gui.py:821 +#: ../tails_installer/gui.py:853 msgid "Download complete!" msgstr "" -#: ../tails_installer/gui.py:825 +#: ../tails_installer/gui.py:857 msgid "Download failed: " msgstr "" -#: ../tails_installer/gui.py:826 +#: ../tails_installer/gui.py:858 msgid "You can try again to resume your download" msgstr "" -#: ../tails_installer/gui.py:834 +#: ../tails_installer/gui.py:866 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "" -#: ../tails_installer/gui.py:840 +#: ../tails_installer/gui.py:872 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 "" -#: ../tails_installer/gui.py:846 +#: ../tails_installer/gui.py:878 #, python-format msgid "%(filename)s selected" msgstr "" -#: ../tails_installer/source.py:28 +#: ../tails_installer/source.py:29 msgid "Unable to find LiveOS on ISO" msgstr "" -#: ../tails_installer/source.py:34 +#: ../tails_installer/source.py:35 #, python-format msgid "Could not guess underlying block device: %s" msgstr "" -#: ../tails_installer/source.py:49 +#: ../tails_installer/source.py:50 #, python-format msgid "" "There was a problem executing `%s`.\n" @@ -476,29 +494,29 @@ msgid "" "%s" msgstr "" -#: ../tails_installer/source.py:63 +#: ../tails_installer/source.py:64 #, python-format msgid "'%s' does not exist" msgstr "" -#: ../tails_installer/source.py:65 +#: ../tails_installer/source.py:66 #, python-format msgid "'%s' is not a directory" msgstr "" -#: ../tails_installer/source.py:75 +#: ../tails_installer/source.py:76 #, python-format msgid "Skipping '%(filename)s'" msgstr "" -#: ../tails_installer/utils.py:44 +#: ../tails_installer/utils.py:55 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" msgstr "" -#: ../tails_installer/utils.py:124 +#: ../tails_installer/utils.py:135 msgid "Could not open device for writing." msgstr ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 85a693e30c89a04876d30875f5476dd784778072 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:16:01 2019 +0000 Update translations for https_everywhere --- sw/https-everywhere.dtd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sw/https-everywhere.dtd b/sw/https-everywhere.dtd index c7534a578..c98a6671e 100644 --- a/sw/https-everywhere.dtd +++ b/sw/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> <!ENTITY https-everywhere.menu.showCounter "Show Counter"> <!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> @@ -18,6 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> <!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> +<!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere User Rules"> <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sites Disabled"> <!ENTITY https-everywhere.options.updateChannelsWarning "Warning: Adding update channels can cause attackers to hijack your browser. Only edit this section if you know what you're doing!"> <!ENTITY https-everywhere.options.addUpdateChannel "Add Update Channel"> @@ -32,8 +33,9 @@ <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> <!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Block all unencrypted requests' option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Encrypt All Sites Eligible' (EASE) option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> <!ENTITY https-everywhere.cancel.he_blocking_network "network-based downgrade attacks"> +<!ENTITY https-everywhere.cancel.open_page "Open insecure page"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 7791459c2b2b6e1098db29e4624313e18c6b3261 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:15:17 2019 +0000 Update translations for bridgedb --- sw/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 169 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 7c231cec9..cfe65ec0e 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -5,15 +5,16 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Swahili (http://www.transifex.com/projects/p/torproject/language/sw/)\n" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2011-02-19 16:53+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: sw\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -28,57 +29,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -89,7 +215,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -100,7 +226,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -112,7 +238,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -121,20 +247,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -142,12 +268,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -155,48 +281,48 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -205,21 +331,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -227,153 +353,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit db2beb54397b7642e11dc89c1c7d614ac8c67a2b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:15:04 2019 +0000 Update translations for abouttor-homepage --- sw/aboutTor.dtd | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sw/aboutTor.dtd b/sw/aboutTor.dtd new file mode 100644 index 000000000..4f360a91b --- /dev/null +++ b/sw/aboutTor.dtd @@ -0,0 +1,30 @@ + + +<!ENTITY aboutTor.title "About Tor"> + +<!ENTITY aboutTor.viewChangelog.label "View Changelog"> + +<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.failure.label "Something Went Wrong!"> +<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> + +<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Questions?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> + +<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> +<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit de0babab9b0917bdee45907d3ec6f0ea74f55cbc Merge: 33e0c0310 42aae0e69 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 3 17:59:46 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket28816 | 4 ++++ changes/ticket29897 | 3 +++ src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ src/feature/dircache/dircache.c | 5 +---- 5 files changed, 27 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.0] dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 194b25f0c7043b2485bb90da6fb24c0e96957875 Author: teor <teor(a)torproject.org> Date: Tue Mar 26 18:12:16 2019 +1000 dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add() Implements ticket 29897. --- changes/ticket29897 | 3 +++ src/feature/dircache/dircache.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/ticket29897 b/changes/ticket29897 new file mode 100644 index 000000000..232a79fbc --- /dev/null +++ b/changes/ticket29897 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor handle_get_next_bandwidth() to use connection_dir_buf_add(). + Implements ticket 29897. diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index caa085dd6..62eb4c86c 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1486,13 +1486,10 @@ handle_get_next_bandwidth(dir_connection_t *conn, conn->compress_state = tor_compress_new(1, compress_method, choose_compression_level(len/2)); log_debug(LD_DIR, "Compressing bandwidth file."); - connection_buf_add_compress(bandwidth, len, conn, 0); - /* Flush the compression state. */ - connection_buf_add_compress("", 0, conn, 1); } else { log_debug(LD_DIR, "Not compressing bandwidth file."); - connection_buf_add(bandwidth, len, TO_CONN(conn)); } + connection_dir_buf_add((const char*)bandwidth, len, conn, 1); tor_free(bandwidth); return 0; }

1 0

[tor/release-0.4.0] Add changes file
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit c2222ba169a059e1a6ce04cb9014fe8870674d87 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Feb 9 16:56:54 2019 +0200 Add changes file --- changes/ticket28816 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket28816 b/changes/ticket28816 new file mode 100644 index 000000000..02878ccfd --- /dev/null +++ b/changes/ticket28816 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Introduce a connection_dir_buf_add() helper function that checks for + compress_state of dir_connection_t and automatically writes a string to + directory connection with or without compression. Resolves issue 28816.

1 0

[tor/release-0.4.0] Add connection_dir_buf_add() helper function
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 6ab1929f00e625a0056eb29c5308ae9f3155a049 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Feb 9 16:06:32 2019 +0200 Add connection_dir_buf_add() helper function --- src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index c8b19344b..7f2e96b4d 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -4341,6 +4341,23 @@ connection_write_to_buf_impl_,(const char *string, size_t len, connection_write_to_buf_commit(conn, written); } +/** + * Write a string (of size len to directory connection + * dir_conn. Apply compression if connection is configured to use + * it and finalize it if done is true. + */ +void +connection_dir_buf_add(const char *string, size_t len, + dir_connection_t *dir_conn, int done) +{ + if (dir_conn->compress_state != NULL) { + connection_buf_add_compress(string, len, dir_conn, done); + return; + } + + connection_buf_add(string, len, TO_CONN(dir_conn)); +} + void connection_buf_add_compress(const char *string, size_t len, dir_connection_t *conn, int done) diff --git a/src/core/mainloop/connection.h b/src/core/mainloop/connection.h index 411f13a8b..c93f1ef8e 100644 --- a/src/core/mainloop/connection.h +++ b/src/core/mainloop/connection.h @@ -226,6 +226,8 @@ MOCK_DECL(void, connection_write_to_buf_impl_, /* DOCDOC connection_write_to_buf */ static void connection_buf_add(const char *string, size_t len, connection_t *conn); +void connection_dir_buf_add(const char *string, size_t len, + dir_connection_t *dir_conn, int done); static inline void connection_buf_add(const char *string, size_t len, connection_t *conn) {

1 0

[tor/release-0.4.0] Merge branch 'tor-github/pr/867' into maint-0.4.0
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 42aae0e693be6f96eef9d124867c7e0915b6ab78 Merge: 828f1829c 194b25f0c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 3 17:59:02 2019 +0300 Merge branch 'tor-github/pr/867' into maint-0.4.0 changes/ticket28816 | 4 ++++ changes/ticket29897 | 3 +++ src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ src/feature/dircache/dircache.c | 5 +---- 5 files changed, 27 insertions(+), 4 deletions(-)

1 0

[tor/master] dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 194b25f0c7043b2485bb90da6fb24c0e96957875 Author: teor <teor(a)torproject.org> Date: Tue Mar 26 18:12:16 2019 +1000 dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add() Implements ticket 29897. --- changes/ticket29897 | 3 +++ src/feature/dircache/dircache.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/ticket29897 b/changes/ticket29897 new file mode 100644 index 000000000..232a79fbc --- /dev/null +++ b/changes/ticket29897 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor handle_get_next_bandwidth() to use connection_dir_buf_add(). + Implements ticket 29897. diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index caa085dd6..62eb4c86c 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1486,13 +1486,10 @@ handle_get_next_bandwidth(dir_connection_t *conn, conn->compress_state = tor_compress_new(1, compress_method, choose_compression_level(len/2)); log_debug(LD_DIR, "Compressing bandwidth file."); - connection_buf_add_compress(bandwidth, len, conn, 0); - /* Flush the compression state. */ - connection_buf_add_compress("", 0, conn, 1); } else { log_debug(LD_DIR, "Not compressing bandwidth file."); - connection_buf_add(bandwidth, len, TO_CONN(conn)); } + connection_dir_buf_add((const char*)bandwidth, len, conn, 1); tor_free(bandwidth); return 0; }

1 0