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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 21 Aug '19

21 Aug '19

commit 34bfc577ae743a339bdbed8ce9c0b6926ec42945 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 13:50:18 2019 +0000 Update translations for tails-misc --- kab.po | 829 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pt_PT.po | 4 +- 2 files changed, 831 insertions(+), 2 deletions(-) diff --git a/kab.po b/kab.po new file mode 100644 index 000000000..a0bf38d4f --- /dev/null +++ b/kab.po @@ -0,0 +1,829 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-12 11:57+0200\n" +"PO-Revision-Date: 2013-07-25 09:07+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Kabyle (http://www.transifex.com/otf/torproject/language/kab/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: kab\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 +msgid "Tor is ready" +msgstr "" + +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 +msgid "You can now access the Internet." +msgstr "" + +#: config/chroot_local-includes/etc/whisperback/config.py:69 +#, python-format +msgid "" +"<h1>Help us fix your bug!</h1>\n" +"Read <a href=\"%s\">our bug reporting instructions</a>.\n" +"Do not include more personal information than\n" +"needed!\n" +"<h2>About giving us an email address</h2>\n" +"\n" +"Giving us an email address allows us to contact you to clarify the problem. This\n" +"is needed for the vast majority of the reports we receive as most reports\n" +"without any contact information are useless. On the other hand it also provides\n" +"an opportunity for eavesdroppers, like your email or Internet provider, to\n" +"confirm that you are using Tails.\n" +"\n" +msgstr "" + +#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8 +#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1 +msgid "Additional Software" +msgstr "" + +#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51 +msgid "" +"You can install additional software automatically from your persistent " +"storage when starting Tails." +msgstr "" + +#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77 +msgid "" +"The following software is installed automatically from your persistent " +"storage when starting Tails." +msgstr "" + +#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171 +msgid "" +"To add more, install some software using <a " +"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " +"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." +msgstr "" + +#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154 +msgid "_Create persistent storage" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/electrum:57 +msgid "Persistence is disabled for Electrum" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/electrum:59 +msgid "" +"When you reboot Tails, all of Electrum's data will be lost, including your " +"Bitcoin wallet. It is strongly recommended to only run Electrum when its " +"persistence feature is activated." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/electrum:60 +msgid "Do you want to start Electrum anyway?" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/electrum:63 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 +msgid "_Launch" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/electrum:64 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 +msgid "_Exit" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/keepassxc:15 +#, sh-format +msgid "" +"<big>Do you want to rename your KeePassXC database?</big>\n" +"\n" +"You have a KeePassXC database in your Persistent folder:\n" +"\n" +"${filename}\n" +"\n" +"Renaming it to keepassx.kdbx would allow KeePassXC to open it automatically in the future." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/keepassxc:23 +msgid "Rename" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/keepassxc:24 +msgid "Keep current name" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21 +msgid "su is disabled. Please use sudo instead." +msgstr "" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 +msgid "Lock screen" +msgstr "" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79 +msgid "Suspend" +msgstr "" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83 +msgid "Restart" +msgstr "" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:87 +msgid "Power Off" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-about:22 +#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 +msgid "Tails" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-about:25 +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 +msgid "About Tails" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-about:35 +msgid "The Amnesic Incognito Live System" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-about:36 +#, python-format +msgid "" +"Build information:\n" +"%s" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-about:54 +msgid "not available" +msgstr "" + +#. Translators: Don't translate {details}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148 +#, python-brace-format +msgid "" +"{details} Please check your list of additional software or read the system " +"log to understand the problem." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +msgid "" +"Please check your list of additional software or read the system log to " +"understand the problem." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 +msgid "Show Log" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 +msgid "Configure" +msgstr "" + +#. Translators: Don't translate {beginning} or {last}, they are +#. placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223 +#, python-brace-format +msgid "{beginning} and {last}" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:224 +msgid ", " +msgstr "" + +#. Translators: Don't translate {packages}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:290 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320 +#, python-brace-format +msgid "Add {packages} to your additional software?" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292 +msgid "" +"To install it automatically from your persistent storage when starting " +"Tails." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 +msgid "Install Every Time" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326 +msgid "Install Only Once" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:301 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:372 +msgid "The configuration of your additional software failed." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322 +msgid "" +"To install it automatically when starting Tails, you can create a persistent" +" storage and activate the Additional Software feature." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 +msgid "Create Persistent Storage" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333 +msgid "Creating your persistent storage failed." +msgstr "" + +#. Translators: Don't translate {packages}, it's a placeholder and +#. will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:342 +#, python-brace-format +msgid "You could install {packages} automatically when starting Tails" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345 +msgid "" +"To do so, you need to run Tails from a USB stick installed using Tails " +"Installer." +msgstr "" + +#. Translators: Don't translate {packages}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:360 +#, python-brace-format +msgid "Remove {packages} from your additional software?" +msgstr "" + +#. Translators: Don't translate {packages}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:364 +#, python-brace-format +msgid "This will stop installing {packages} automatically." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154 +msgid "Remove" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119 +#: config/chroot_local-includes/usr/local/bin/tor-browser:46 +msgid "Cancel" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545 +msgid "Installing your additional software from persistent storage..." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:547 +msgid "This can take several minutes." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:560 +msgid "The installation of your additional software failed" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:575 +msgid "Additional software installed successfully" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:595 +msgid "The check for upgrades of your additional software failed" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:597 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:605 +msgid "" +"Please check your network connection, restart Tails, or read the system log " +"to understand the problem." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 +msgid "The upgrade of your additional software failed" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37 +msgid "Documentation" +msgstr "" + +#. Translators: Don't translate {package}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:94 +#, python-brace-format +msgid "" +"Remove {package} from your additional software? This will stop installing " +"the package automatically." +msgstr "" + +#. Translators: Don't translate {pkg}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:105 +#, python-brace-format +msgid "Failed to remove {pkg}" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122 +msgid "Failed to read additional software configuration" +msgstr "" + +#. Translators: Don't translate {package}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:152 +#, python-brace-format +msgid "Stop installing {package} automatically" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:178 +msgid "" +"To do so, install some software using <a href=\"synaptic.desktop\">Synaptic " +"Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the " +"command line</a>." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:187 +msgid "" +"To do so, unlock your persistent storage when starting Tails and install " +"some software using <a href=\"synaptic.desktop\">Synaptic Package " +"Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command " +"line</a>." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:197 +msgid "" +"To do so, create a persistent storage and install some software using <a " +"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " +"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:205 +msgid "" +"To do so, install Tails on a USB stick using <a href=\"tails-" +"installer.desktop\">Tails Installer</a> and create a persistent storage." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:252 +msgid "[package not available]" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 +msgid "Synchronizing the system's clock" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53 +msgid "" +"Tor needs an accurate clock to work properly, especially for Hidden " +"Services. Please wait..." +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 +msgid "Failed to synchronize the clock!" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110 +msgid "Lock Screen" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125 +msgid "Screen Locker" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131 +msgid "Set up a password to unlock the screen." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149 +msgid "Password" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150 +msgid "Confirm" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-security-check:124 +msgid "This version of Tails has known security issues:" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-security-check:135 +msgid "Known security issues" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#, sh-format +msgid "Network card ${nic} disabled" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +msgid "All networking disabled" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35 +msgid "" +"\"Not enough memory available to check for upgrades.\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual\"" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 +msgid "error:" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 +msgid "Error" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 +msgid "Warning: virtual machine detected!" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 +msgid "Warning: non-free virtual machine detected!" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:77 +msgid "" +"Both the host operating system and the virtualization software are able to " +"monitor what you are doing in Tails. Only free software can be considered " +"trustworthy, for both the host operating system and the virtualization " +"software." +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81 +msgid "Learn more" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 +msgid "Tor is not ready" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 +msgid "Tor is not ready. Start Tor Browser anyway?" +msgstr "" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:45 +msgid "Start Tor Browser" +msgstr "" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:35 +msgid "Tor Status" +msgstr "" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:50 +msgid "Open Onion Circuits" +msgstr "" + +#. Translators: Don't translate {volume_label} or {volume_size}, +#. they are placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58 +#, python-brace-format +msgid "{volume_label} ({volume_size})" +msgstr "" + +#. Translators: Don't translate {partition_name} or {partition_size}, +#. they are placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63 +#, python-brace-format +msgid "{partition_name} ({partition_size})" +msgstr "" + +#. Translators: Don't translate {volume_size}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68 +#, python-brace-format +msgid "{volume_size} Volume" +msgstr "" + +#. Translators: Don't translate {volume_name}, it's a placeholder and +#. will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107 +#, python-brace-format +msgid "{volume_name} (Read-Only)" +msgstr "" + +#. Translators: Don't translate {partition_name} and {container_path}, they +#. are placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115 +#, python-brace-format +msgid "{partition_name} in {container_path}" +msgstr "" + +#. Translators: Don't translate {volume_name} and {path_to_file_container}, +#. they are placeholders and will be replaced. You should only have to +#. translate +#. this string if it makes sense to reverse the order of the placeholders. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122 +#, python-brace-format +msgid "{volume_name} – {path_to_file_container}" +msgstr "" + +#. Translators: Don't translate {partition_name} and {drive_name}, they +#. are placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128 +#, python-brace-format +msgid "{partition_name} on {drive_name}" +msgstr "" + +#. Translators: Don't translate {volume_name} and {drive_name}, +#. they are placeholders and will be replaced. You should only have to +#. translate +#. this string if it makes sense to reverse the order of the placeholders. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135 +#, python-brace-format +msgid "{volume_name} – {drive_name}" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222 +msgid "Wrong passphrase or parameters" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224 +msgid "Error unlocking volume" +msgstr "" + +#. Translators: Don't translate {volume_name} or {error_message}, +#. they are placeholder and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228 +#, python-brace-format +msgid "" +"Couldn't unlock volume {volume_name}:\n" +"{error_message}" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330 +msgid "One or more applications are keeping the volume busy." +msgstr "" + +#. Translators: Don't translate {volume_name} or {error_message}, +#. they are placeholder and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336 +#, python-brace-format +msgid "" +"Couldn't lock volume {volume_name}:\n" +"{error_message}" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338 +msgid "Locking the volume failed" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83 +msgid "No file containers added" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98 +msgid "No VeraCrypt devices detected" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:40 +#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1 +msgid "Unlock VeraCrypt Volumes" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114 +msgid "Container already added" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115 +#, python-format +msgid "The file container %s should already be listed." +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131 +msgid "Container opened read-only" +msgstr "" + +#. Translators: Don't translate {path}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:133 +#, python-brace-format +msgid "" +"The file container {path} could not be opened with write access. It was opened read-only instead. You will not be able to modify the content of the container.\n" +"{error_message}" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138 +msgid "Error opening file" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160 +msgid "Not a VeraCrypt container" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161 +#, python-format +msgid "The file %s does not seem to be a VeraCrypt container." +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163 +msgid "Failed to add container" +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164 +#, python-format +msgid "" +"Could not add file container %s: Timeout while waiting for loop setup.\n" +"Please try using the Disks application instead." +msgstr "" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209 +msgid "Choose File Container" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 +msgid "Do you really want to launch the Unsafe Browser?" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 +msgid "" +"Network activity within the Unsafe Browser is not anonymous.\\nOnly " +"use the Unsafe Browser if necessary, for example\\nif you have to login or " +"register to activate your Internet connection." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 +msgid "Starting the Unsafe Browser..." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 +msgid "This may take a while, so please be patient." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "Shutting down the Unsafe Browser..." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "" +"This may take a while, and you may not restart the Unsafe Browser until it " +"is properly shut down." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 +msgid "Failed to restart Tor." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 +#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 +msgid "Unsafe Browser" +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91 +msgid "" +"Another Unsafe Browser is currently running, or being cleaned up. Please " +"retry in a while." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99 +msgid "Failed to setup chroot." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 +msgid "Failed to configure browser." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110 +msgid "" +"No DNS server was obtained through DHCP or manually configured in " +"NetworkManager." +msgstr "" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121 +msgid "Failed to run browser." +msgstr "" + +#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 +msgid "Report an error" +msgstr "" + +#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 +msgid "Tails documentation" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:1 +msgid "Root Terminal" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:2 +msgid "Opens a terminal as the root user, using gksu to ask for the password" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 +msgid "Learn how to use Tails" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 +msgid "Learn more about Tails" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 +msgid "Tor Browser" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 +msgid "Anonymous Web Browser" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 +msgid "Browse the World Wide Web without anonymity" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3 +msgid "Unsafe Web Browser" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2 +msgid "Mount VeraCrypt encrypted file containers and devices" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2 +msgid "" +"Configure the additional software installed from your persistent storage " +"when starting Tails" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 +msgid "Tails specific tools" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 +msgid "To start a Root Terminal, you need to authenticate." +msgstr "" + +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1 +msgid "Remove an additional software package" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2 +msgid "" +"Authentication is required to remove a package from your additional software" +" ($(command_line))" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61 +msgid "File Containers" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:80 +msgid "_Add" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:86 +msgid "Add a file container" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:103 +msgid "Partitions and Drives" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:121 +msgid "" +"This application is not affiliated with or endorsed by the VeraCrypt project" +" or IDRIX." +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29 +msgid "_Open" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38 +msgid "Lock this volume" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52 +msgid "_Unlock" +msgstr "" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61 +msgid "Detach this volume" +msgstr "" + +#: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1 +msgid "TrueCrypt/VeraCrypt container" +msgstr "" diff --git a/pt_PT.po b/pt_PT.po index 5b2695c9d..e36877c0d 100644 --- a/pt_PT.po +++ b/pt_PT.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-12 11:57+0200\n" -"PO-Revision-Date: 2019-08-12 16:11+0000\n" -"Last-Translator: Rui <xymarior(a)yandex.com>\n" +"PO-Revision-Date: 2019-08-21 13:20+0000\n" +"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] checkIncludes: Separate file-handling from rule-handling
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 47d9bcfef8cff23225850545400f60a93fe18f49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 11:58:12 2019 -0400 checkIncludes: Separate file-handling from rule-handling This is our shift from directory-at-a-time processing to file-at-a-time processing. --- scripts/maint/checkIncludes.py | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index c4e77c71e..9daaf1363 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -126,9 +126,14 @@ class Rules(object): include_rules_cache = {} def load_include_rules(fname): - """ Read a rules file from 'fname', and return it as a Rules object. """ + """ Read a rules file from 'fname', and return it as a Rules object. + Return 'None' if fname does not exist. + """ if fname in include_rules_cache: return include_rules_cache[fname] + if not os.path.exists(fname): + include_rules_cache[fname] = None + return None result = Rules(os.path.split(fname)[0]) with open_file(fname) as f: for line in f: @@ -139,6 +144,11 @@ def load_include_rules(fname): include_rules_cache[fname] = result return result +def get_all_include_rules(): + return [ rules for (fname,rules) in + sorted(include_rules_cache.items()) + if rules is not None ] + def remove_self_edges(graph): """Takes a directed graph in as an adjacency mapping (a mapping from node to a list of the nodes to which it connects). @@ -187,18 +197,12 @@ if __name__ == '__main__': list_unused = False log_sorted_levels = False - uses_dirs = { } - for dirpath, dirnames, fnames in os.walk("src"): - if ".may_include" in fnames: - rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) - for fname in fnames: - if fname_is_c(fname): + for fname in fnames: + if fname_is_c(fname): + rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) + if rules is not None: rules.applyToFile(os.path.join(dirpath,fname)) - if list_unused: - rules.noteUnusedRules() - - uses_dirs[rules.incpath] = rules.getAllowedDirectories() if trouble: err( @@ -206,6 +210,14 @@ if __name__ == '__main__': files in its enclosing directory.""".format(RULES_FNAME)) sys.exit(1) + if list_unused: + for rules in get_all_include_rules(): + rules.noteUnusedRules() + + uses_dirs = { } + for rules in get_all_include_rules(): + uses_dirs[rules.incpath] = rules.getAllowedDirectories() + remove_self_edges(uses_dirs) all_levels = toposort(uses_dirs)

1 0

[tor/master] Move the executable part of checkIncludes.py inside an if block.
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 475749351dcf7a89ad921f120a6daac80310edde Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 11:30:22 2019 -0400 Move the executable part of checkIncludes.py inside an if block. I'll want to make this block into a series of functions in a subsequent commit, but I'm doing this separately to get the indentation change out of the way. This branch will end up with making checkIncludes.py an integrated part of practracker, for ticket 31176. --- scripts/maint/checkIncludes.py | 91 +++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index ec9350b9b..a6672b097 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -134,48 +134,49 @@ def load_include_rules(fname): result.addPattern(line) return result -list_unused = False -log_sorted_levels = False - -uses_dirs = { } - -for dirpath, dirnames, fnames in os.walk("src"): - if ".may_include" in fnames: - rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) - for fname in fnames: - if fname_is_c(fname): - rules.applyToFile(os.path.join(dirpath,fname)) - if list_unused: - rules.noteUnusedRules() - - uses_dirs[rules.incpath] = rules.getAllowedDirectories() - -if trouble: - err( -"""To change which includes are allowed in a C file, edit the {} -files in its enclosing directory.""".format(RULES_FNAME)) - sys.exit(1) - -all_levels = [] - -n = 0 -while uses_dirs: - n += 0 - cur_level = [] - for k in list(uses_dirs): - uses_dirs[k] = [ d for d in uses_dirs[k] - if (d in uses_dirs and d != k)] - if uses_dirs[k] == []: - cur_level.append(k) - for k in cur_level: - del uses_dirs[k] - n += 1 - if cur_level and log_sorted_levels: - print(n, cur_level) - if n > 100: - break - -if uses_dirs: - print("There are circular .may_include dependencies in here somewhere:", - uses_dirs) - sys.exit(1) +if __name__ == '__main__': + list_unused = False + log_sorted_levels = False + + uses_dirs = { } + + for dirpath, dirnames, fnames in os.walk("src"): + if ".may_include" in fnames: + rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) + for fname in fnames: + if fname_is_c(fname): + rules.applyToFile(os.path.join(dirpath,fname)) + if list_unused: + rules.noteUnusedRules() + + uses_dirs[rules.incpath] = rules.getAllowedDirectories() + + if trouble: + err( + """To change which includes are allowed in a C file, edit the {} + files in its enclosing directory.""".format(RULES_FNAME)) + sys.exit(1) + + all_levels = [] + + n = 0 + while uses_dirs: + n += 0 + cur_level = [] + for k in list(uses_dirs): + uses_dirs[k] = [ d for d in uses_dirs[k] + if (d in uses_dirs and d != k)] + if uses_dirs[k] == []: + cur_level.append(k) + for k in cur_level: + del uses_dirs[k] + n += 1 + if cur_level and log_sorted_levels: + print(n, cur_level) + if n > 100: + break + + if uses_dirs: + print("There are circular .may_include dependencies in here somewhere:", + uses_dirs) + sys.exit(1)

1 0

[tor/master] checkIncludes: introduce rules-file caching.
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 3f35ac772b0428e77c93968fdfc6f4add1c9f15d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 11:35:13 2019 -0400 checkIncludes: introduce rules-file caching. We'll want this so that we can have each file evaluated independently, rather than a directory at a time. --- scripts/maint/checkIncludes.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index a6672b097..a67397bfa 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -123,8 +123,12 @@ class Rules(object): return allowed +include_rules_cache = {} + def load_include_rules(fname): """ Read a rules file from 'fname', and return it as a Rules object. """ + if fname in include_rules_cache: + return include_rules_cache[fname] result = Rules(os.path.split(fname)[0]) with open_file(fname) as f: for line in f: @@ -132,6 +136,7 @@ def load_include_rules(fname): if line.startswith("#") or not line: continue result.addPattern(line) + include_rules_cache[fname] = result return result if __name__ == '__main__':

1 0

[tor/master] checkIncludes.py: extract topological sort code
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 65a69f861e192ae77c7edafe46bc2674bc39b9ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 11:49:52 2019 -0400 checkIncludes.py: extract topological sort code Our topological sort code really deserves a function of its own. Additionally, don't print from inside the topological sort code: instead, return a result, and let the caller print it. --- scripts/maint/checkIncludes.py | 67 +++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 17 deletions(-) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index a67397bfa..c4e77c71e 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -139,6 +139,50 @@ def load_include_rules(fname): include_rules_cache[fname] = result return result +def remove_self_edges(graph): + """Takes a directed graph in as an adjacency mapping (a mapping from + node to a list of the nodes to which it connects). + + Remove all edges from a node to itself.""" + + for k in list(graph): + graph[k] = [ d for d in graph[k] if d != k ] + +def toposort(graph, limit=100): + """Takes a directed graph in as an adjacency mapping (a mapping from + node to a list of the nodes to which it connects). Tries to + perform a topological sort on the graph, arranging the nodes into + "levels", such that every member of each level is only reachable + by members of later levels. + + Returns a list of the members of each level. + + Modifies the input graph, removing every member that could be + sorted. If the graph does not become empty, then it contains a + cycle. + + "limit" is the max depth of the graph after which we give up trying + to sort it and conclude we have a cycle. + """ + all_levels = [] + + n = 0 + while graph: + n += 0 + cur_level = [] + all_levels.append(cur_level) + for k in list(graph): + graph[k] = [ d for d in graph[k] if d in graph ] + if graph[k] == []: + cur_level.append(k) + for k in cur_level: + del graph[k] + n += 1 + if n > limit: + break + + return all_levels + if __name__ == '__main__': list_unused = False log_sorted_levels = False @@ -162,24 +206,13 @@ if __name__ == '__main__': files in its enclosing directory.""".format(RULES_FNAME)) sys.exit(1) - all_levels = [] + remove_self_edges(uses_dirs) + all_levels = toposort(uses_dirs) - n = 0 - while uses_dirs: - n += 0 - cur_level = [] - for k in list(uses_dirs): - uses_dirs[k] = [ d for d in uses_dirs[k] - if (d in uses_dirs and d != k)] - if uses_dirs[k] == []: - cur_level.append(k) - for k in cur_level: - del uses_dirs[k] - n += 1 - if cur_level and log_sorted_levels: - print(n, cur_level) - if n > 100: - break + if log_sorted_levels: + for (n, cur_level) in enumerate(all_levels): + if cur_level: + print(n, cur_level) if uses_dirs: print("There are circular .may_include dependencies in here somewhere:",

1 0

[tor/master] checkIncludes: refactor to use error-iteration style
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 3f4e89a7abb2a9027d83da48c84227a190f8b31d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 12:25:41 2019 -0400 checkIncludes: refactor to use error-iteration style This makes checkIncludes match practracker more closely, and lets us eliminate a global. --- scripts/maint/checkIncludes.py | 50 +++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index 9daaf1363..c398dc7a5 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -23,9 +23,6 @@ import os import re import sys -# Global: Have there been any errors? -trouble = False - if sys.version_info[0] <= 2: def open_file(fname): return open(fname, 'r') @@ -36,13 +33,6 @@ else: def warn(msg): print(msg, file=sys.stderr) -def err(msg): - """ Declare that an error has happened, and remember that there has - been an error. """ - global trouble - trouble = True - print(msg, file=sys.stderr) - def fname_is_c(fname): """ Return true iff 'fname' is the name of a file that we should search for possibly disallowed #include directives. """ @@ -65,6 +55,14 @@ def pattern_is_normal(s): return True return False +class Error(object): + def __init__(self, location, msg): + self.location = location + self.msg = msg + + def __str__(self): + return "{} at {}".format(self.msg, self.location) + class Rules(object): """ A 'Rules' object is the parsed version of a .may_include file. """ def __init__(self, dirpath): @@ -88,7 +86,7 @@ class Rules(object): return True return False - def applyToLines(self, lines, context=""): + def applyToLines(self, lines, loc_prefix=""): lineno = 0 for line in lines: lineno += 1 @@ -96,18 +94,19 @@ class Rules(object): if m: include = m.group(1) if not self.includeOk(include): - err("Forbidden include of {} on line {}{}".format( - include, lineno, context)) + yield Error("{}{}".format(loc_prefix,str(lineno)), + "Forbidden include of {}".format(include)) def applyToFile(self, fname): with open_file(fname) as f: #print(fname) - self.applyToLines(iter(f), " of {}".format(fname)) + for error in self.applyToLines(iter(f), "{}:".format(fname)): + yield error def noteUnusedRules(self): for p in self.patterns: if p not in self.usedPatterns: - print("Pattern {} in {} was never used.".format(p, self.dirpath)) + warn("Pattern {} in {} was never used.".format(p, self.dirpath)) def getAllowedDirectories(self): allowed = [] @@ -145,6 +144,8 @@ def load_include_rules(fname): return result def get_all_include_rules(): + """Return a list of all the Rules objects we have loaded so far, + sorted by their directory names.""" return [ rules for (fname,rules) in sorted(include_rules_cache.items()) if rules is not None ] @@ -193,16 +194,29 @@ def toposort(graph, limit=100): return all_levels +def consider_include_rules(fname): + dirpath = os.path.split(fname)[0] + rules_fname = os.path.join(dirpath, RULES_FNAME) + rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) + if rules is None: + return + + for err in rules.applyToFile(fname): + yield err + if __name__ == '__main__': list_unused = False log_sorted_levels = False + trouble = False + for dirpath, dirnames, fnames in os.walk("src"): for fname in fnames: if fname_is_c(fname): - rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) - if rules is not None: - rules.applyToFile(os.path.join(dirpath,fname)) + fullpath = os.path.join(dirpath,fname) + for err in consider_include_rules(fullpath): + print(err, file=sys.stderr) + trouble = True if trouble: err(

1 0

[tor/master] Update pre-commit hook to find checkIncludes in its new location
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 9abbde2c244f40fcf06c34cd72c360a9770fcd7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 14:11:51 2019 -0400 Update pre-commit hook to find checkIncludes in its new location Also add a temporary script to redirect the hook, if people don't upgrade for a bit. --- scripts/git/pre-commit.git-hook | 4 ++-- scripts/maint/checkIncludes.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 2a2983719..7c7cf8857 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -36,8 +36,8 @@ elif [ -d src/common ]; then src/tools/*.[ch] fi -if test -e scripts/maint/checkIncludes.py; then - python scripts/maint/checkIncludes.py +if test -e scripts/maint/practracker/includes.py; then + python scripts/maint/practracker/includes.py fi if [ -e scripts/maint/practracker/practracker.py ]; then diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py new file mode 100755 index 000000000..926b201b3 --- /dev/null +++ b/scripts/maint/checkIncludes.py @@ -0,0 +1,14 @@ +#!/usr/bin/python +# Copyright 2018 The Tor Project, Inc. See LICENSE file for licensing info. + +# This file is no longer here; see practracker/includes.py for this +# functionality. This is a stub file that exists so that older git +# hooks will know where to look. + +import sys, os + +dirname = os.path.split(sys.argv[0])[0] +new_location = os.path.join(dirname, "practracker", "includes.py") +python = sys.executable + +os.execl(python, python, new_location, *sys.argv[1:])

1 0

[tor/master] checkIncludes: add a real main function and CLI
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 9eb12dde181df868932e866c26e39b633aba72c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 12:36:13 2019 -0400 checkIncludes: add a real main function and CLI --- scripts/maint/checkIncludes.py | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index c398dc7a5..c35fcfd85 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -204,19 +204,27 @@ def consider_include_rules(fname): for err in rules.applyToFile(fname): yield err -if __name__ == '__main__': + list_unused = False log_sorted_levels = False - trouble = False +def walk_c_files(topdir="src"): + """Run through all c and h files under topdir, looking for + include-rule violations. Yield those violations.""" - for dirpath, dirnames, fnames in os.walk("src"): + for dirpath, dirnames, fnames in os.walk(topdir): for fname in fnames: if fname_is_c(fname): fullpath = os.path.join(dirpath,fname) for err in consider_include_rules(fullpath): - print(err, file=sys.stderr) - trouble = True + yield err + +def run_check_includes(topdir, list_unused=False, log_sorted_levels=False): + trouble = False + + for err in walk_c_files(topdir): + print(err, file=sys.stderr) + trouble = True if trouble: err( @@ -244,3 +252,23 @@ if __name__ == '__main__': print("There are circular .may_include dependencies in here somewhere:", uses_dirs) sys.exit(1) + +def main(argv): + import argparse + + progname = argv[0] + parser = argparse.ArgumentParser(prog=progname) + parser.add_argument("--toposort", action="store_true", + help="Print a topologically sorted list of modules") + parser.add_argument("--list-unused", action="store_true", + help="List unused lines in .may_include files.") + parser.add_argument("topdir", default="src", nargs="?", + help="Top-level directory for the tor source") + args = parser.parse_args(argv[1:]) + + run_check_includes(topdir=args.topdir, + log_sorted_levels=args.toposort, + list_unused=args.list_unused) + +if __name__ == '__main__': + main(sys.argv)

1 0

[tor/master] Move checkIncludes inside practracker
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 6fb74753c2d6400ea6d7e118ce2428d0290728a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 14:10:40 2019 -0400 Move checkIncludes inside practracker Update the makefile accordingly. --- Makefile.am | 4 ++-- scripts/maint/{checkIncludes.py => practracker/includes.py} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8eeba5edb..e973593bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,7 +166,7 @@ EXTRA_DIST+= \ Makefile.nmake \ README \ ReleaseNotes \ - scripts/maint/checkIncludes.py \ + scripts/maint/practracker/includes.py \ scripts/maint/checkSpace.pl \ scripts/maint/practracker @@ -366,7 +366,7 @@ endif check-includes: if USEPYTHON - $(PYTHON) $(top_srcdir)/scripts/maint/checkIncludes.py + $(PYTHON) $(top_srcdir)/scripts/maint/practracker/includes.py endif check-best-practices: diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/practracker/includes.py similarity index 100% rename from scripts/maint/checkIncludes.py rename to scripts/maint/practracker/includes.py

1 0

[tor/master] Teach include-checker about advisory rules
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 720951f05664c38155a4515aa76b9c8d3a99269d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 17:04:00 2019 -0400 Teach include-checker about advisory rules A .may_includes file can be "advisory", which means that some violations of the rules are expected. We will track these violations with practracker, not as automatic errors. --- scripts/maint/practracker/includes.py | 24 ++++++++++++++++------ src/core/crypto/.may_include | 10 +++++++++ src/core/mainloop/.may_include | 20 ++++++++++++++++++ src/core/or/.may_include | 38 +++++++++++++++++++++++++++++++++++ src/core/proto/.may_include | 10 +++++++++ 5 files changed, 96 insertions(+), 6 deletions(-) diff --git a/scripts/maint/practracker/includes.py b/scripts/maint/practracker/includes.py index c35fcfd85..fbd68f4f5 100755 --- a/scripts/maint/practracker/includes.py +++ b/scripts/maint/practracker/includes.py @@ -56,9 +56,10 @@ def pattern_is_normal(s): return False class Error(object): - def __init__(self, location, msg): + def __init__(self, location, msg, is_advisory=False): self.location = location self.msg = msg + self.is_advisory = is_advisory def __str__(self): return "{} at {}".format(self.msg, self.location) @@ -73,8 +74,12 @@ class Rules(object): self.incpath = dirpath self.patterns = [] self.usedPatterns = set() + self.is_advisory = False def addPattern(self, pattern): + if pattern == "!advisory": + self.is_advisory = True + return if not pattern_is_normal(pattern): warn("Unusual pattern {} in {}".format(pattern, self.dirpath)) self.patterns.append(pattern) @@ -95,7 +100,8 @@ class Rules(object): include = m.group(1) if not self.includeOk(include): yield Error("{}{}".format(loc_prefix,str(lineno)), - "Forbidden include of {}".format(include)) + "Forbidden include of {}".format(include), + is_advisory=self.is_advisory) def applyToFile(self, fname): with open_file(fname) as f: @@ -204,7 +210,6 @@ def consider_include_rules(fname): for err in rules.applyToFile(fname): yield err - list_unused = False log_sorted_levels = False @@ -219,12 +224,16 @@ def walk_c_files(topdir="src"): for err in consider_include_rules(fullpath): yield err -def run_check_includes(topdir, list_unused=False, log_sorted_levels=False): +def run_check_includes(topdir, list_unused=False, log_sorted_levels=False, + list_advisories=False): trouble = False for err in walk_c_files(topdir): + if err.is_advisory and not list_advisories: + continue print(err, file=sys.stderr) - trouble = True + if not err.is_advisory: + trouble = True if trouble: err( @@ -262,13 +271,16 @@ def main(argv): help="Print a topologically sorted list of modules") parser.add_argument("--list-unused", action="store_true", help="List unused lines in .may_include files.") + parser.add_argument("--list-advisories", action="store_true", + help="List advisories as well as forbidden includes") parser.add_argument("topdir", default="src", nargs="?", help="Top-level directory for the tor source") args = parser.parse_args(argv[1:]) run_check_includes(topdir=args.topdir, log_sorted_levels=args.toposort, - list_unused=args.list_unused) + list_unused=args.list_unused, + list_advisories=args.list_advisories) if __name__ == '__main__': main(sys.argv) diff --git a/src/core/crypto/.may_include b/src/core/crypto/.may_include new file mode 100644 index 000000000..5782a3679 --- /dev/null +++ b/src/core/crypto/.may_include @@ -0,0 +1,10 @@ +!advisory + +orconfig.h + +lib/crypt_ops/*.h +lib/ctime/*.h +lib/cc/*.h +lib/log/*.h + +core/crypto/*.h diff --git a/src/core/mainloop/.may_include b/src/core/mainloop/.may_include new file mode 100644 index 000000000..79d6a130a --- /dev/null +++ b/src/core/mainloop/.may_include @@ -0,0 +1,20 @@ +!advisory + +orconfig.h + +lib/container/*.h +lib/dispatch/*.h +lib/evloop/*.h +lib/pubsub/*.h +lib/subsys/*.h +lib/buf/*.h +lib/crypt_ops/*.h +lib/err/*.h +lib/tls/*.h +lib/net/*.h +lib/evloop/*.h +lib/geoip/*.h +lib/sandbox/*.h +lib/compress/*.h + +core/mainloop/*.h \ No newline at end of file diff --git a/src/core/or/.may_include b/src/core/or/.may_include new file mode 100644 index 000000000..5173e8a2b --- /dev/null +++ b/src/core/or/.may_include @@ -0,0 +1,38 @@ +!advisory + +orconfig.h + +lib/arch/*.h +lib/buf/*.h +lib/cc/*.h +lib/compress/*.h +lib/container/*.h +lib/crypt_ops/*.h +lib/ctime/*.h +lib/defs/*.h +lib/encoding/*.h +lib/err/*.h +lib/evloop/*.h +lib/fs/*.h +lib/geoip/*.h +lib/intmath/*.h +lib/log/*.h +lib/malloc/*.h +lib/math/*.h +lib/net/*.h +lib/pubsub/*.h +lib/string/*.h +lib/subsys/*.h +lib/test/*.h +lib/testsupport/*.h +lib/thread/*.h +lib/time/*.h +lib/tls/*.h +lib/wallclock/*.h + +trunnel/*.h + +core/mainloop/*.h +core/proto/*.h +core/crypto/*.h +core/or/*.h \ No newline at end of file diff --git a/src/core/proto/.may_include b/src/core/proto/.may_include new file mode 100644 index 000000000..c1647a5cf --- /dev/null +++ b/src/core/proto/.may_include @@ -0,0 +1,10 @@ +!advisory + +orconfig.h + +lib/crypt_ops/*.h +lib/buf/*.h + +trunnel/*.h + +core/proto/*.h \ No newline at end of file

1 0