July 2021 - tor-commits - lists.torproject.org

[rbm/master] Bug 28396: Create tmp files in rbm_tmp_dir instead of tmp_dir
by gk＠torproject.org 05 Jul '21

05 Jul '21

commit 8238f07edf404b82047fb09b76262e9a674ab146 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 4 20:38:30 2020 +0200 Bug 28396: Create tmp files in rbm_tmp_dir instead of tmp_dir rbm_tmp_dir is a directory inside tmp_dir that is automatically removed when rbm exits. We also fix an issue in urlget when used within the exec script of an input file. In this case the input_files_id was depending on the value of tmp_dir because it is used in urlget. We fix that be setting getting_input_files_id when computing input_files ids, so that urlget can avoid using tmp_dir in this case. --- doc/rbm_config.asc | 7 +++++-- lib/RBM.pm | 19 +++++++------------ lib/RBM/DefaultConfig.pm | 13 +++++++++++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 4c65a73..09776e4 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -223,8 +223,11 @@ input_files_id:: filename to trigger a rebuild when any of its input files is changed. This identifier is based on: the +input_file_id+ option of an input file if it is present, the +filename+ for an input - file of type +project+, and the +filename+ and the sha256sum of - the file for any other type of input file. + file of type +project+, the value of +exec+ for an input file + of type +exec+, and the +filename+ and the sha256sum of the file + for any other type of input file. In the case of an input file + of type +exec+, the value of +exec+ is computed with +getting_id+ + set to true. input_files_paths:: The value of this option is an array of all the paths of input diff --git a/lib/RBM.pm b/lib/RBM.pm index d2aeab2..52b90ed 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -270,17 +270,11 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub get_tmp_dir { - my ($project, $options) = @_; - my $tmp_dir = project_config($project, 'tmp_dir', $options); - make_path($tmp_dir); - return $tmp_dir; -} - sub set_git_gpg_wrapper { my ($project) = @_; my $w = project_config($project, 'gpg_wrapper'); - my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); + my (undef, $tmp) = File::Temp::tempfile( + DIR => project_config($project, 'rbm_tmp_dir')); path($tmp)->spew_utf8($w); chmod 0700, $tmp; system('git', 'config', 'gpg.program', $tmp) == 0 @@ -342,7 +336,7 @@ sub git_tag_sign_id { sub file_sign_id { my ($project, $options) = @_; my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR => - get_tmp_dir($project, $options)); + project_config($project, 'rbm_tmp_dir', $options)); path($gpg_wrapper)->spew_utf8(project_config($project, 'gpg_wrapper', $options)); chmod 0700, $gpg_wrapper; my ($stdout, $stderr, $success, $exit_code) = @@ -576,7 +570,7 @@ sub maketar { || exit_error 'Error running git archive.'; if (project_config($project, 'git_submodule', $options)) { my $tmpdir = File::Temp->newdir( - get_tmp_dir($project, $options) . '/rbm-XXXXX'); + project_config($project, 'rbm_tmp_dir', $options) . '/rbm-XXXXX'); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $commit_hash); exit_error "Cannot checkout $commit_hash: $stderr" unless $success; @@ -760,7 +754,8 @@ sub input_file_id { return $t->('input_file_id') if $input_file->{input_file_id}; return $input_file->{project} . ':' . $filename if $input_file->{project}; return $filename . ':' . $t->('sha256sum') if $input_file->{sha256sum}; - return $filename . ':' . sha256_hex($t->('exec', { norec => { output_dir => '/out' } })) + my $opts = { norec => { output_dir => '/out', getting_id => 1, }}; + return $filename . ':' . sha256_hex($t->('exec', $opts)) if $input_file->{exec}; return input_file_id_hash($fname, $filename); } @@ -1029,7 +1024,7 @@ sub build_run { valid_project($project); $options = { %$options, build_id => Data::UUID->new->create_str }; my $old_cwd = getcwd; - my $tmpdir = File::Temp->newdir(get_tmp_dir($project, $options) + my $tmpdir = File::Temp->newdir(project_config($project, 'rbm_tmp_dir', $options) . '/rbm-XXXXX'); my $srcdir = $tmpdir->dirname; my @cfiles; diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index c19d160..370f755 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -14,6 +14,7 @@ use RBM; use Cwd qw(getcwd); use IO::CaptureOutput qw(capture_exec); use File::Temp; +use File::Path qw(make_path); sub lsb_release { my ($project, $options) = @_; @@ -89,8 +90,9 @@ sub rbm_tmp_dir { my ($project, $options) = @_; CORE::state $rbm_tmp_dir; return $rbm_tmp_dir->dirname if $rbm_tmp_dir; - my $tmp_dir = RBM::get_tmp_dir($project, $options) + my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) || RBM::exit_error('No tmp_dir specified'); + make_path($tmp_dir); $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', DIR => $tmp_dir); return $rbm_tmp_dir->dirname; @@ -397,7 +399,14 @@ OPT_END urlget => <<URLGET, #!/bin/sh set -e -tmpfile="\$(mktemp -p [% shell_quote(c("tmp_dir")) %])" +[% + IF c("getting_id"); + SET rbm_tmp_dir = '/tmp'; + ELSE; + SET rbm_tmp_dir = c("rbm_tmp_dir"); + END; + -%] +tmpfile="\$(mktemp -p [% shell_quote(rbm_tmp_dir) %])" wget -O"\$tmpfile" [% shell_quote(c("URL")) %] mv -f "\$tmpfile" [% shell_quote(dest_dir _ "/" _ c("filename")) %] URLGET

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit 2ad31056c01f0bd63eb75a2931c20a73cbdec863 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 22:16:19 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- mk.po | 94 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/mk.po b/mk.po index 090b5febc6..02b822b090 100644 --- a/mk.po +++ b/mk.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-07-04 21:45+0000\n" +"PO-Revision-Date: 2021-07-04 21:49+0000\n" "Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -95,7 +95,7 @@ msgstr "_Излез" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/DownloadProgress.pm:59 msgid "Unknown time" -msgstr "" +msgstr "Непознато време" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -104,8 +104,8 @@ msgstr "" #, perl-brace-format msgid "1y" msgid_plural "{count}y" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1г" +msgstr[1] "{count}г" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -114,8 +114,8 @@ msgstr[1] "" #, perl-brace-format msgid "1d" msgid_plural "{count}d" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1д" +msgstr[1] "{count}д" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -124,8 +124,8 @@ msgstr[1] "" #, perl-brace-format msgid "1h" msgid_plural "{count}h" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1ч" +msgstr[1] "{count}ч" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -134,8 +134,8 @@ msgstr[1] "" #, perl-brace-format msgid "1m" msgid_plural "{count}m" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1м" +msgstr[1] "{count}м" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -144,34 +144,34 @@ msgstr[1] "" #, perl-brace-format msgid "1s" msgid_plural "{count}s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1с" +msgstr[1] "{count}с" #. Translators: don't translate {time}, {downloaded}, {size} #. and {speed}, they are placeholders and will be replaced. #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/DownloadProgress.pm:139 #, perl-brace-format msgid "#{time} left — {downloaded} of {size} ({speed}/sec)\n" -msgstr "" +msgstr "#{time} преостанува — {downloaded} на {size} ({speed}/сек)\n" #. Translators: KB is the short form for kilobyte #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Role/FormatByte.pm:33 msgid "KB" -msgstr "" +msgstr "KB" #. Translators: MB is the short form for megabyte #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Role/FormatByte.pm:35 msgid "MB" -msgstr "" +msgstr "MB" #. Translators: GB is the short form for gigabyte #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Role/FormatByte.pm:37 msgid "GB" -msgstr "" +msgstr "ГБ" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Role/FormatByte.pm:43 msgid "bytes" -msgstr "" +msgstr "бајти" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:198 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:710 @@ -192,7 +192,7 @@ msgstr "<b>Се појави грешка за време на ажурирањ #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:304 msgid "Error while downloading the signing key" -msgstr "" +msgstr "Грешка при преземање на сертификациониот клуч" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:316 msgid "Error while updating the signing key" @@ -262,7 +262,7 @@ msgstr "Достапното делумно ажурирање бара {memory_ msgid "" "An error ocurred while detecting available upgrades.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Настана грешка при детектирање на достапни ажурирања.\nОва не би требало да се случи. Ве молиме пријавете грешка." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:470 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:489 @@ -478,16 +478,16 @@ msgstr "_Администраторска Лозинка" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:187 msgid "_MAC Address Anonymization" -msgstr "" +msgstr "Анонимизирање на _MAC адреса" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:250 msgid "_Offline Mode" -msgstr "" +msgstr "Мод _Offline" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413 msgid "Enable networking (default)" -msgstr "" +msgstr "Овозможи вмрежување (стандардно)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:261 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:459 @@ -500,7 +500,7 @@ msgstr "_Мрежно поврзување" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:324 msgid "Obsolete" -msgstr "" +msgstr "Застарено" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:339 msgid "_Unsafe Browser" @@ -1222,7 +1222,7 @@ msgstr "Дотдатотеки" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225 msgid "Symlink every file in the Dotfiles folder into the Home folder" -msgstr "" +msgstr "Симлинкувај ја секоја датотека во Dotfiles фолдерот во Дома фолдерот" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111 msgid "Custom" @@ -1632,7 +1632,7 @@ msgstr "Мрежната картичка ${nic} е оневозможена" msgid "" "MAC address anonymization failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC address anonymization." -msgstr "" +msgstr "Анонимизирањето на MAC адресата не успеа за мрежната картичка ${nic_name} (${nic}) па поради тоа е привремено оневозможена.\nМожеби повеќе ќе сакате повторно да го стартувате Tails и да го оневозможите анонимизирањето на MAC адресата. " #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:66 msgid "All networking disabled" @@ -1643,7 +1643,7 @@ msgstr "Сите мрежни поврзувања се оневозможени msgid "" "MAC address anonymization 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 address anonymization." -msgstr "" +msgstr "Анонимизирањето на MAC адресата не успеа за мрежната картичка ${nic_name} (${nic}). Враќањето на грешката исто така не успеа па целото мрежно поврзување беше оневозможено.\nМожеби повеќе ќе сакате повторно да го стартувате Tails и да го оневозможите анонимизирањето на MAC адресата. " #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:36 #, python-brace-format @@ -1691,50 +1691,50 @@ msgstr "Научи повеќе" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/config.py:8 #: ../config/chroot_local-includes/usr/share/applications/tca.desktop.in.h:1 msgid "Tor Connection" -msgstr "" +msgstr "Tor Поврзување" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:203 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:495 #, python-brace-format msgid "Invalid: {exception}" -msgstr "" +msgstr "Неточно: {exception}" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:215 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:508 msgid "You need to configure an obfs4 bridge to hide that you are using Tor" -msgstr "" +msgstr "Треба да конфигурирате obfs4 мост за да сокриете дека користите Tor" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:308 msgid "Connecting to Tor without bridges…" -msgstr "" +msgstr "Поврзување на Tor без мостови..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:315 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:339 msgid "Connecting to Tor with default bridges…" -msgstr "" +msgstr "Поврзување на Tor со стандардните мостови..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:322 msgid "Connecting to Tor with custom bridges…" -msgstr "" +msgstr "Поврзување на Tor со прилагодени мостови..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:414 msgid "" "Connected to Tor successfully!\n" "\n" "You can now browse the Internet anonymously and uncensored." -msgstr "" +msgstr "Успешно поврзување на Tor!\n\nСега можете да прелистувате на Интернет анонимно и нецензурирано." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:498 msgid "Bridge address malformed" -msgstr "" +msgstr "Адресата на мостот е неисправна" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:514 msgid "Setting a bridge is needed if you want to hide that you are using Tor" -msgstr "" +msgstr "Поставувањето на мост е потребно ако сакате да сокриете дека користите Tor" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:777 msgid "Are you sure you want to lose progress?" -msgstr "" +msgstr "Дали сте сигурни дека сакате да го изгубите постигнатото?" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:781 msgid "" @@ -2550,16 +2550,16 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142 msgid "obfs4 (recommended)" -msgstr "" +msgstr "obfs4 (препорачано)" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143 msgid "meek" -msgstr "" +msgstr "meek" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1069 msgid "None" -msgstr "" +msgstr "Ништо" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194 msgid "Request a new bridge" @@ -2760,7 +2760,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1671 msgid "Proxy Type" -msgstr "" +msgstr "Тип на Прокси" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1685 msgid "No proxy" @@ -2768,31 +2768,31 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1686 msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1687 msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1688 msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1704 msgid "Address" -msgstr "" +msgstr "Адреса" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1718 msgid "Username" -msgstr "" +msgstr "Корисничко име" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1732 msgid "IP address or hostname" -msgstr "" +msgstr "IP адреси или име на хост" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1747 msgid "Port" -msgstr "" +msgstr "Порта" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1841 msgid "_Save Proxy Settings"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit 8ae7948d877842875c46a9170aa1ab4a69bccc45 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 22:15:40 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- mk.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mk.po b/mk.po index b58778b786..02b822b090 100644 --- a/mk.po +++ b/mk.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-07-04 21:45+0000\n" +"PO-Revision-Date: 2021-07-04 21:49+0000\n" "Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -1722,19 +1722,19 @@ msgid "" "Connected to Tor successfully!\n" "\n" "You can now browse the Internet anonymously and uncensored." -msgstr "" +msgstr "Успешно поврзување на Tor!\n\nСега можете да прелистувате на Интернет анонимно и нецензурирано." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:498 msgid "Bridge address malformed" -msgstr "" +msgstr "Адресата на мостот е неисправна" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:514 msgid "Setting a bridge is needed if you want to hide that you are using Tor" -msgstr "" +msgstr "Поставувањето на мост е потребно ако сакате да сокриете дека користите Tor" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:777 msgid "Are you sure you want to lose progress?" -msgstr "" +msgstr "Дали сте сигурни дека сакате да го изгубите постигнатото?" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:781 msgid ""

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit 86dc5defae2107f2fb820d996e9a79570dda4165 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 21:46:21 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- mk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk.po b/mk.po index 2fe503cb8d..090b5febc6 100644 --- a/mk.po +++ b/mk.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-07-02 09:26+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-07-04 21:45+0000\n" +"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit cdcd17d00724b948d858dcd21921997113b6c6b1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 21:45:39 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- mk.po | 62 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/mk.po b/mk.po index e7dc959f09..b58778b786 100644 --- a/mk.po +++ b/mk.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-07-02 09:26+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-07-04 21:45+0000\n" +"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,7 +95,7 @@ msgstr "_Излез" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/DownloadProgress.pm:59 msgid "Unknown time" -msgstr "" +msgstr "Непознато време" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -104,8 +104,8 @@ msgstr "" #, perl-brace-format msgid "1y" msgid_plural "{count}y" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1г" +msgstr[1] "{count}г" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -114,8 +114,8 @@ msgstr[1] "" #, perl-brace-format msgid "1d" msgid_plural "{count}d" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1д" +msgstr[1] "{count}д" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -124,8 +124,8 @@ msgstr[1] "" #, perl-brace-format msgid "1h" msgid_plural "{count}h" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1ч" +msgstr[1] "{count}ч" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -134,8 +134,8 @@ msgstr[1] "" #, perl-brace-format msgid "1m" msgid_plural "{count}m" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1м" +msgstr[1] "{count}м" #. Translators: Don't translate {count}, it's a place holder and #. will be replaced. @@ -144,15 +144,15 @@ msgstr[1] "" #, perl-brace-format msgid "1s" msgid_plural "{count}s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1с" +msgstr[1] "{count}с" #. Translators: don't translate {time}, {downloaded}, {size} #. and {speed}, they are placeholders and will be replaced. #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/DownloadProgress.pm:139 #, perl-brace-format msgid "#{time} left — {downloaded} of {size} ({speed}/sec)\n" -msgstr "" +msgstr "#{time} преостанува — {downloaded} на {size} ({speed}/сек)\n" #. Translators: KB is the short form for kilobyte #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Role/FormatByte.pm:33 @@ -167,11 +167,11 @@ msgstr "MB" #. Translators: GB is the short form for gigabyte #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Role/FormatByte.pm:37 msgid "GB" -msgstr "" +msgstr "ГБ" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Role/FormatByte.pm:43 msgid "bytes" -msgstr "" +msgstr "бајти" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:198 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:710 @@ -192,7 +192,7 @@ msgstr "<b>Се појави грешка за време на ажурирањ #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:304 msgid "Error while downloading the signing key" -msgstr "" +msgstr "Грешка при преземање на сертификациониот клуч" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:316 msgid "Error while updating the signing key" @@ -262,7 +262,7 @@ msgstr "Достапното делумно ажурирање бара {memory_ msgid "" "An error ocurred while detecting available upgrades.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Настана грешка при детектирање на достапни ажурирања.\nОва не би требало да се случи. Ве молиме пријавете грешка." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:470 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:489 @@ -478,16 +478,16 @@ msgstr "_Администраторска Лозинка" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:187 msgid "_MAC Address Anonymization" -msgstr "" +msgstr "Анонимизирање на _MAC адреса" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:250 msgid "_Offline Mode" -msgstr "" +msgstr "Мод _Offline" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413 msgid "Enable networking (default)" -msgstr "" +msgstr "Овозможи вмрежување (стандардно)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:261 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:459 @@ -500,7 +500,7 @@ msgstr "_Мрежно поврзување" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:324 msgid "Obsolete" -msgstr "" +msgstr "Застарено" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:339 msgid "_Unsafe Browser" @@ -1222,7 +1222,7 @@ msgstr "Дотдатотеки" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225 msgid "Symlink every file in the Dotfiles folder into the Home folder" -msgstr "" +msgstr "Симлинкувај ја секоја датотека во Dotfiles фолдерот во Дома фолдерот" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111 msgid "Custom" @@ -1632,7 +1632,7 @@ msgstr "Мрежната картичка ${nic} е оневозможена" msgid "" "MAC address anonymization failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC address anonymization." -msgstr "" +msgstr "Анонимизирањето на MAC адресата не успеа за мрежната картичка ${nic_name} (${nic}) па поради тоа е привремено оневозможена.\nМожеби повеќе ќе сакате повторно да го стартувате Tails и да го оневозможите анонимизирањето на MAC адресата. " #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:66 msgid "All networking disabled" @@ -1643,7 +1643,7 @@ msgstr "Сите мрежни поврзувања се оневозможени msgid "" "MAC address anonymization 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 address anonymization." -msgstr "" +msgstr "Анонимизирањето на MAC адресата не успеа за мрежната картичка ${nic_name} (${nic}). Враќањето на грешката исто така не успеа па целото мрежно поврзување беше оневозможено.\nМожеби повеќе ќе сакате повторно да го стартувате Tails и да го оневозможите анонимизирањето на MAC адресата. " #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:36 #, python-brace-format @@ -1691,31 +1691,31 @@ msgstr "Научи повеќе" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/config.py:8 #: ../config/chroot_local-includes/usr/share/applications/tca.desktop.in.h:1 msgid "Tor Connection" -msgstr "" +msgstr "Tor Поврзување" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:203 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:495 #, python-brace-format msgid "Invalid: {exception}" -msgstr "" +msgstr "Неточно: {exception}" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:215 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:508 msgid "You need to configure an obfs4 bridge to hide that you are using Tor" -msgstr "" +msgstr "Треба да конфигурирате obfs4 мост за да сокриете дека користите Tor" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:308 msgid "Connecting to Tor without bridges…" -msgstr "" +msgstr "Поврзување на Tor без мостови..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:315 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:339 msgid "Connecting to Tor with default bridges…" -msgstr "" +msgstr "Поврзување на Tor со стандардните мостови..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:322 msgid "Connecting to Tor with custom bridges…" -msgstr "" +msgstr "Поврзување на Tor со прилагодени мостови..." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:414 msgid ""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit 046e863a6d1662f9e6205b84ba0e166f5f3b818b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 15:15:14 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+pl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index cf88813b93..3792351102 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -687,7 +687,7 @@ msgstr "" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) msgid "## Get prepared!" -msgstr "" +msgstr "## Przygotuj się!" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -837,7 +837,7 @@ msgstr "" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) msgid "### How to submit your findings" -msgstr "" +msgstr "### Jak przesłać wyniki" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -871,12 +871,12 @@ msgstr "" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) msgid "## Additional links" -msgstr "" +msgstr "## Dodatkowe linki" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) msgid "From the Tor Project:" -msgstr "" +msgstr "Z projektu Tor:" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit 69812472192bc8d6c8d80ab6c0413a6075511b97 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 14:45:10 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+pl.po | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index 0f00c48bb5..cf88813b93 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -486,7 +486,7 @@ msgstr "" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) msgid "### Tor Browser for Desktop" -msgstr "" +msgstr "### Przeglądarka Tor na komputery stacjonarne" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -590,11 +590,14 @@ msgid "" "At Tor, we don't collect invasive data about user behavior, only the data " "necessary to improve our services. We test our software, not people." msgstr "" +"W Tor nie zbieramy inwazyjnych danych o zachowaniu użytkowników, a jedynie " +"dane niezbędne do ulepszania naszych usług. Testujemy nasze oprogramowanie, " +"a nie ludzi." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) msgid "## Be a good listener and open-minded" -msgstr "" +msgstr "## Bądź dobrym i otwartym słuchaczem" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -602,6 +605,8 @@ msgid "" "Listening is a skill that helps build bridges. We believe this doesn't just " "apply to our services, but our communities too." msgstr "" +"Słuchanie to umiejętność, która pomaga budować mosty. Wierzymy, że dotyczy " +"to nie tylko naszych usług, ale także naszych społeczności." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit 86e15e13a08911cae1a1a27e3f18c35b12f24486 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 12:47:24 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fi.po b/contents+fi.po index b22ed2325c..43b8ac254c 100644 --- a/contents+fi.po +++ b/contents+fi.po @@ -3,7 +3,6 @@ # Juhana Uuttu <juhana.uuttu(a)gmail.com>, 2019 # Panu Ahvenharju, 2019 # oselotti, 2019 -# IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2019 # erinm, 2020 # Mikko Päivärinta <paivarinta.mikko.o(a)gmail.com>, 2020 @@ -697,6 +696,7 @@ msgid "" "Tor Browser 10.0 is the first stable release of the 10.0 series based on " "Firefox 78esr." msgstr "" +"Tor-selain 10.0 on ensimmäinen vakaa julkaisu 10.0 sarjaa Firefox 78esr:lla" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) @@ -1494,7 +1494,7 @@ msgstr "Kieli" #: templates/download-languages.html:12 templates/download-options.html:12 msgid "Windows" -msgstr "Ikkuna" +msgstr "Windows" #: templates/download-languages.html:13 msgid "macOS"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit f69d01fd4a3da7a0a83e9c9570bde27f66b82774 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 12:17:25 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fi.po | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/contents+fi.po b/contents+fi.po index 3efba93f50..b22ed2325c 100644 --- a/contents+fi.po +++ b/contents+fi.po @@ -532,6 +532,8 @@ msgid "" "Given that there is no solution that works perfectly for all our user " "groups, we also approached this problem from a broad angle." msgstr "" +"Koska ei ole yhtä ratkaisua, joka toimii täydellisesti kaikille " +"käyttäjäryhmillemme, lähestymme tätä ongelmaa laajemmin. " #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) @@ -593,7 +595,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) msgid "**Give Feedback**" -msgstr "" +msgstr "**Anna palautetta**" #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) @@ -604,6 +606,8 @@ msgid "" "release, [please let us know](https://support.torproject.org/misc/bug-or-" "feedback/)." msgstr "" +"Jos löydät bugin tai sinulla on ehdotus tämän julkaisun parantamiseksi, " +"[kerro meille](https://support.torproject.org/misc/bug-or-feedback/)." #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) @@ -613,16 +617,18 @@ msgid "" "Thanks to all of the teams across Tor, and the many volunteers, who " "contributed to this release." msgstr "" +"Kiitos kaikille Tor verkkoa ylläpitäville ja monille tämän julkaisun " +"muutoksiin osallistuneille." #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.title) msgid "Tor Browser 10" -msgstr "" +msgstr "Tor-selain 10" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) msgid "## New Release: Tor Browser 10" -msgstr "" +msgstr "## Uusi julkaisu: Tor-selain 10" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) @@ -630,6 +636,8 @@ msgid "" "The new shiny Tor Browser 10 for Desktop is now available from the Tor " "Browser download page and also from our distribution directory!" msgstr "" +"Uusi Tor-selain 10 tietokoneversio on nyt saatavilla Tor-selaimen " +"lataussivulta ja jakeluhakemistostamme!" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) @@ -637,6 +645,8 @@ msgid "" "The Android version for Tor Browser 10 is under active development and we " "are supporting the current version until the new one is ready." msgstr "" +"Tor-selain 10 android versio on kehitteillä ja tuemme nykyistä versiota, " +"kunnes uusi on valmis." #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) @@ -658,6 +668,8 @@ msgid "" "Tor Browser 10 ships with Firefox 78.3.0esr, updates NoScript to 11.0.44, " "and Tor to 0.4.4.5." msgstr "" +"Tor-selain 10 on Firefox 78.3.0esr pohjainen, päivittää NoScriptin versioon " +"11.0.44 ja Torin versioon 0.4.4.5." #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) @@ -665,6 +677,8 @@ msgid "" "This release includes important [security updates to " "Firefox](https://www.mozilla.org/en-US/security/advisories/mfsa2020-43/)." msgstr "" +"Tämä julkaisu sisältää tärkeitä [tietoturvapäivityksiä " +"Firefoxiin](https://www.mozilla.org/en-US/security/advisories/mfsa2020-43/)." #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) @@ -673,6 +687,9 @@ msgid "" "a [new extended support release](https://www.mozilla.org/en-" "US/firefox/enterprise/#overview) of Mozilla Firefox." msgstr "" +"Tämä uusi Tor-selain julkaisu keskittyy tekemään Tor-selaimesta vakaan " +"[uudella pitkän tuen firefoxilla](https://www.mozilla.org/en-" +"US/firefox/enterprise/#overview)" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 04 Jul '21

04 Jul '21

commit 47c69ad87add1bdf611dbc93d4aa2e0af5d08c2b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 4 11:47:37 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fi.po | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/contents+fi.po b/contents+fi.po index a81d6b92a4..3efba93f50 100644 --- a/contents+fi.po +++ b/contents+fi.po @@ -462,6 +462,9 @@ msgid "" " onion service, users received a standard Firefox error message, with no " "information about why they were unable to connect to the onion site." msgstr "" +"Edellisissä Tor-selaimen julkaisuissa virheen sattuessa onion palveluihin " +"yhdistäessä, käyttäjälle näytettiin perus Firefoxin virhe ilmoitus, ilman " +"tietoa miksi selain ei voi yhdistää onion sivulle." #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) @@ -495,7 +498,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) msgid "**Onion Names**" -msgstr "" +msgstr "**Onion Nimet**" #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) @@ -504,11 +507,15 @@ msgid "" "humans to remember (ie, https://torproject.org vs. " "http://expyuzz4wqqyqhjn.onion/)" msgstr "" +"Kryptograafisista suojauksista johtuen, onion-osoitteiden URL:ät eivät ole " +"helposti muistettavissa (esim. https://torproject.org vs " +"http://expyuzz4wqqyqhjn.onion/)" #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) msgid "This makes it hard for users to discover or return to an onion site." msgstr "" +"Tämä tekee onion-sivun löytämisen tai onion-sivulle palaamisen vaikeaksi." #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) @@ -516,6 +523,8 @@ msgid "" "We found that organically, developers have approached this problem in " "different ways, mostly with solutions tailored for their service." msgstr "" +"Huomasimme, että kehittäjät ovat luoneet useita ratkaisuja tähän ongelmaan, " +"pääasiassa omiin palveluihin suunniteltuja. " #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body)

1 0