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

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 81be25055732d24b6a4d296e8876d8ebfc81f6d4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 04:47:59 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+ka.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 83af3031e..14cfe0102 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1,7 +1,7 @@ # Translators: # erinm, 2019 -# Georgianization, 2019 # Emma Peel, 2019 +# Georgianization, 2019 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Georgianization, 2019\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2198,7 +2198,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/ #: (content/becoming-tor-translator/contents+en-US.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">" #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/ #: (content/becoming-tor-translator/contents+en-US.lrtopic.body) @@ -2288,6 +2288,8 @@ msgid "" "The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) " "also has information about the translations with bigger priority." msgstr "" +"თარგმნის შესახებ მნიშვნელოვანი მასალა, ასევე შეგიძლიათ იხილოთ საიტზე " +"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor)." #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/ #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 2261ee5782bcb8cd460c07b77d43f7ab35a4e436 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 04:47:50 2019 +0000 Update translations for tbmanual-contentspot --- contents+ka.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 83af3031e..14cfe0102 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1,7 +1,7 @@ # Translators: # erinm, 2019 -# Georgianization, 2019 # Emma Peel, 2019 +# Georgianization, 2019 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Georgianization, 2019\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2198,7 +2198,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/ #: (content/becoming-tor-translator/contents+en-US.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">" #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/ #: (content/becoming-tor-translator/contents+en-US.lrtopic.body) @@ -2288,6 +2288,8 @@ msgid "" "The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) " "also has information about the translations with bigger priority." msgstr "" +"თარგმნის შესახებ მნიშვნელოვანი მასალა, ასევე შეგიძლიათ იხილოთ საიტზე " +"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor)." #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/ #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit f42aa0b037044e8e1553f7d0d947daf957faff9c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 00:50:44 2019 +0000 Update translations for support-portal --- contents+ru.po | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index 8f5a12737..22a9239cc 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -325,6 +325,9 @@ msgid "" "you download is the one we have created and has not been modified by some " "attacker." msgstr "" +"Ниже мы объясним, почему это важно, и как подтвердить то, что программа Tor," +" которую вы скачали именно та, какой она была создана и что она не была " +"изменена атакующими." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -333,6 +336,10 @@ msgid "" "accompanied by a file with the same name as the package and the extension " "\".asc\". These .asc files are GPG signatures." msgstr "" +"Каждый файл на нашей [странице " +"загрузки](https://www.torproject.org/download/) сопровождается файлом с " +"таким же именем, как и скачиваемый, и с расширением \".asc\". Эти .asc файлы" +" - это GPG подписи." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -340,6 +347,8 @@ msgid "" "They allow you to verify the file you've downloaded is exactly the one that " "we intended you to get." msgstr "" +"Они позволяют Вам удостовериться в том, что Вы скачали именно тот файл, " +"который намеревались." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 186b577f7e99efad8d6daca87f541bef2f7fe8f6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 00:20:53 2019 +0000 Update translations for support-portal --- contents+ru.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index ec1599752..8f5a12737 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -9,6 +9,7 @@ # erinm, 2019 # Emma Peel, 2019 # Sergey Smirnov <cj75300(a)gmail.com>, 2019 +# Тимур Нагорских <timnagorskikh2k18(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-08 17:07+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Sergey Smirnov <cj75300(a)gmail.com>, 2019\n" +"Last-Translator: Тимур Нагорских <timnagorskikh2k18(a)gmail.com>, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -306,7 +307,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.title) msgid "How can I verify Tor Browser's signature?" -msgstr "" +msgstr "Как я могу подтвердить цифровую подпись браузера Tor?" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -314,6 +315,8 @@ msgid "" "Digital signature is a process ensuring that a certain package was generated" " by its developers and has not been tampered with." msgstr "" +"Цифровая подпись - это процесс подтверждения того, что конкретный файл " +"сгенерирован его разработчиками и с тех пор не изменялся." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 2bf44cebca8bb7ce3153ddb96237a47dc6fac3bd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 00:20:00 2019 +0000 Update translations for torcheck_completed --- ru/torcheck.po | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/ru/torcheck.po b/ru/torcheck.po index 4d90024d8..b61f64e2f 100644 --- a/ru/torcheck.po +++ b/ru/torcheck.po @@ -7,6 +7,7 @@ # anotherguy <apeks37(a)yandex.ru>, 2015 # Den Arefyev <>, 2012 # Denis Barbu <denisbarbu(a)icloud.com>, 2015 +# Emma Peel, 2019 # foo <im-infamous(a)yandex.ru>, 2014 # Iullia Zernova <loose-freed(a)yandex.ru>, 2015 # joshua ridney, 2015 @@ -18,12 +19,13 @@ # Sergey Smirnov <cj75300(a)gmail.com>, 2018 # Timofey Lisunov <solokot(a)gmail.com>, 2018 # Uho Lot <yavinav(a)gmail.com>, 2016 +# Тимур Нагорских <timnagorskikh2k18(a)gmail.com>, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-08 06:05+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-04-10 00:05+0000\n" +"Last-Translator: Тимур Нагорских <timnagorskikh2k18(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,9 +47,9 @@ msgid "There is a security update available for Tor Browser." msgstr "Доступно обновление безопасности для Tor Browser." msgid "" -"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " -"here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Нажмите здесь для перехода к скачиванию наших программ</a>" +"<a href=\"https://www.torproject.org/download/\">Click here to go to the " +"download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/\">Нажмите здесь для перехода к скачиванию наших программ</a>" msgid "Sorry. You are not using Tor." msgstr "Извините. В данный момент вы не используете Tor." @@ -55,24 +57,16 @@ msgstr "Извините. В данный момент вы не использ msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" -" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " -"configuring your Tor client</a>." -msgstr "Если вы пытаетесь настроить клиент Tor, пожалуйста, используйте <a href=\"https://www.torproject.org/\">официальный сайт Tor</a>, особенно <a href=\"https://www.torproject.org-docs-faq#DoesntWork\">инструкции по настройке</a>." +" href=\"https://support.torproject.org/#faq\">frequently asked " +"questions</a>." +msgstr "Если вы пытаетесь использовать клиент Tor, пожалуйста прочитайте документацию на <a href=\"https://www.torproject.org/\">веб-сайте Tor</a> и, в особенности, в разделе <a href=\"https://support.torproject.org/#faq\">\"Часто задаваемые вопросы\"</a>. " msgid "Sorry, your query failed or an unexpected response was received." msgstr "Извините, не удалось обработать ваш запрос, или был получен неожиданный ответ сервера." -msgid "" -"A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Временное отключение услуг предотвращает обнаружение, если вашим исходным IP-адресом является узел <a href=\"https://www.torproject.org/\">Tor</a>." - msgid "Your IP address appears to be: " msgstr "Ваш IP-адрес: " -msgid "Are you using Tor?" -msgstr "Вы используете Tor?" - msgid "This page is also available in the following languages:" msgstr "Эта страница доступна на следующих языках:" @@ -90,9 +84,6 @@ msgstr "Подробнее »" msgid "Go" msgstr "Перейти" -msgid "Short User Manual" -msgstr "Краткое руководство пользователя" - msgid "Donate to Support Tor" msgstr "Пожертвуйте на поддержку Tor" @@ -116,3 +107,6 @@ msgstr "Запустить ретранслятор" msgid "Stay Anonymous" msgstr "Остаться анонимным" + +msgid "Relay Search" +msgstr "Поиск ретрансляторов"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit d0ef24b849b3a6e8481d9cfa47c9632726c91a1d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 00:19:54 2019 +0000 Update translations for torcheck --- ru/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ru/torcheck.po b/ru/torcheck.po index e947e7862..b61f64e2f 100644 --- a/ru/torcheck.po +++ b/ru/torcheck.po @@ -19,12 +19,13 @@ # Sergey Smirnov <cj75300(a)gmail.com>, 2018 # Timofey Lisunov <solokot(a)gmail.com>, 2018 # Uho Lot <yavinav(a)gmail.com>, 2016 +# Тимур Нагорских <timnagorskikh2k18(a)gmail.com>, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 06:47+0000\n" -"Last-Translator: Emma Peel\n" +"PO-Revision-Date: 2019-04-10 00:05+0000\n" +"Last-Translator: Тимур Нагорских <timnagorskikh2k18(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +59,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "" +msgstr "Если вы пытаетесь использовать клиент Tor, пожалуйста прочитайте документацию на <a href=\"https://www.torproject.org/\">веб-сайте Tor</a> и, в особенности, в разделе <a href=\"https://support.torproject.org/#faq\">\"Часто задаваемые вопросы\"</a>. " msgid "Sorry, your query failed or an unexpected response was received." msgstr "Извините, не удалось обработать ваш запрос, или был получен неожиданный ответ сервера." @@ -108,4 +109,4 @@ msgid "Stay Anonymous" msgstr "Остаться анонимным" msgid "Relay Search" -msgstr "" +msgstr "Поиск ретрансляторов"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 10 Apr '19

10 Apr '19

commit 05e8d4f0902f1504322b08abd58a9208620b7260 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 00:16:41 2019 +0000 Update translations for tails-misc_completed --- ru.po | 104 +++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 55 insertions(+), 49 deletions(-) diff --git a/ru.po b/ru.po index 5c6a3d891..d6bedd6af 100644 --- a/ru.po +++ b/ru.po @@ -29,13 +29,14 @@ # Uho Lot <yavinav(a)gmail.com>, 2016 # Виктор Ерухин <folkraft(a)rambler.ru>, 2018 # Руслан <nasretdinov.r.r(a)ya.ru>, 2014 +# Тимур Нагорских <timnagorskikh2k18(a)gmail.com>, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-14 21:20+0100\n" -"PO-Revision-Date: 2019-01-24 16:33+0000\n" -"Last-Translator: Andrey\n" +"POT-Creation-Date: 2019-04-06 14:00+0200\n" +"PO-Revision-Date: 2019-04-09 23:51+0000\n" +"Last-Translator: Тимур Нагорских <timnagorskikh2k18(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,15 +81,15 @@ msgid "" "storage when starting Tails." msgstr "Следующее программное обеспечение автоматически устанавливается из вашего постоянного хранилища при запуске Tails." -#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132 -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:172 +#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:173 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 "Чтобы добавить больше, установите программное обеспечение с помощью <a href=\"synaptic.desktop\">диспетчера пакетов Synaptic</a> или <a href=\"org.gnome.Terminal.desktop\">APT в командной строке</a>." -#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151 +#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154 msgid "_Create persistent storage" msgstr "Создать постоянное хранилище" @@ -142,14 +143,18 @@ msgid "su is disabled. Please use sudo instead." msgstr "Использование su отключено. Используйте sudo." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 -msgid "Restart" -msgstr "Перезапуск" - -#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:78 msgid "Lock screen" msgstr "Блокировка экрана" -#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:81 +#: 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 "Выключение" @@ -180,89 +185,89 @@ msgstr "не найдено" #. Translators: Don't translate {details}, it's a placeholder and will #. be replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:150 #, python-brace-format msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." msgstr "{details} Пожалуйста, просмотрите список дополнительных программ или прочитайте системный журнал, чтобы понять проблему." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:155 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:156 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159 msgid "Show Log" msgstr "Показать журнал" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159 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:222 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:225 #, python-brace-format msgid "{beginning} and {last}" msgstr "{beginning} и {last}" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:226 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:289 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322 #, python-brace-format msgid "Add {packages} to your additional software?" msgstr "Добавить {packages} в ваше дополнительное программное обеспечение?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 msgid "" "To install it automatically from your persistent storage when starting " "Tails." msgstr "Чтобы автоматически установить его из постоянного хранилища при запуске Tails." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:296 msgid "Install Every Time" msgstr "установить Every Time" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:297 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:328 msgid "Install Only Once" msgstr "установить Only Once" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:303 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:374 msgid "The configuration of your additional software failed." msgstr "Не удалось выполнить конфигурацию вашего дополнительного программного обеспечения." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the Additional Software feature." msgstr "Чтобы установить его автоматически при запуске Tails, вы можете создать постоянное хранилище и активировать функцию дополнительного программного обеспечения." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:327 msgid "Create Persistent Storage" msgstr "Создание постоянного хранилища" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:335 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:341 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" msgstr "Вы можете установить {packages} автоматически при запуске Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:347 msgid "" "To do so, you need to run Tails from a USB stick installed using Tails " "Installer." @@ -270,60 +275,61 @@ msgstr "Для этого вам нужно запустить Tails с USB-на #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362 #, python-brace-format msgid "Remove {packages} from your additional software?" msgstr "Удалить {packages} из вашего дополнительного программного обеспечения?" #. Translators: Don't translate {packages}, it's a placeholder #. and will be replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 #, python-brace-format msgid "This will stop installing {packages} automatically." msgstr "Это автоматически прекратит установку {packages}." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:368 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:156 msgid "Remove" msgstr "Убрать" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:369 #: 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:544 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:547 msgid "Installing your additional software from persistent storage..." msgstr "Установка дополнительного программного обеспечения из постоянного хранилища ..." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:549 msgid "This can take several minutes." msgstr "Это может занять несколько минут." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:562 msgid "The installation of your additional software failed" msgstr "Не удалось установить дополнительное программное обеспечение" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:577 msgid "Additional software installed successfully" msgstr "Дополнительное программное обеспечение установлено успешно" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:597 msgid "The check for upgrades of your additional software failed" msgstr "Ошибка проверки обновлений вашего дополнительного программного обеспечения" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:599 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:607 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." msgstr "Пожалуйста, проверьте сетевое подключение, перезапустите Tails или прочитайте системный журнал, чтобы понять проблему." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:606 msgid "The upgrade of your additional software failed" msgstr "Не удалось обновить дополнительное программное обеспечение" -#: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37 +#: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:39 msgid "Documentation" msgstr "Документация" @@ -354,14 +360,14 @@ msgstr "Не удалось прочитать дополнительную ко msgid "Stop installing {package} automatically" msgstr "Прекратить установку {package} автоматически" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:179 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:180 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 "Для этого, установите программное обеспечение при помощи <a href=\"synaptic.desktop\">Synaptic Package Manager</a> или <a href=\"org.gnome.Terminal.desktop\">APT в командной строке</a>." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:189 msgid "" "To do so, unlock your persistent storage when starting Tails and install " "some software using <a href=\"synaptic.desktop\">Synaptic Package " @@ -369,20 +375,20 @@ msgid "" "line</a>." msgstr "Для этого разблокируйте ваше постоянное хранилище при запуске Tails и установите программное обеспечение при помощи <a href=\"synaptic.desktop\">Synaptic Package Manager</a> или <a href=\"org.gnome.Terminal.desktop\">APT в командной строке</a>." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:198 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:199 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 "Для этого создайте постоянное хранилище при запуске Tails и установите программное обеспечение при помощи Synaptic Package Manager или APT в командной строке." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:206 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:207 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 "Для этого установите Tails на USB-диск при помощи <a href=\"tails-installer.desktop\">Tails Installer</a>и создайте постоянное хранилище." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:253 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:254 msgid "[package not available]" msgstr "[package not available]"

1 0

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

10 Apr '19

commit bc8d8ec680df37f362f41608c92ebec3e797ebbc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 10 00:16:33 2019 +0000 Update translations for tails-misc --- ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru.po b/ru.po index b12573679..d6bedd6af 100644 --- a/ru.po +++ b/ru.po @@ -29,13 +29,14 @@ # Uho Lot <yavinav(a)gmail.com>, 2016 # Виктор Ерухин <folkraft(a)rambler.ru>, 2018 # Руслан <nasretdinov.r.r(a)ya.ru>, 2014 +# Тимур Нагорских <timnagorskikh2k18(a)gmail.com>, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-06 14:00+0200\n" -"PO-Revision-Date: 2019-04-06 12:42+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-04-09 23:51+0000\n" +"Last-Translator: Тимур Нагорских <timnagorskikh2k18(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,7 +148,7 @@ msgstr "Блокировка экрана" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79 msgid "Suspend" -msgstr "" +msgstr "Приостановить" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83 msgid "Restart"

1 0

[snowflake/master] Simplified log scrubber
by cohosh＠torproject.org 09 Apr '19

09 Apr '19

commit 5bc881702815942057f5c8d265fbef7d4917c82e Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Mar 21 10:11:11 2019 -0400 Simplified log scrubber IPv6 regexes didn't need to be that precise, added more tests for edge-cases. --- server/server.go | 3 ++- server/server_test.go | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index ad1cd2a..74cffd6 100644 --- a/server/server.go +++ b/server/server.go @@ -64,7 +64,8 @@ type logScrubber struct { func (ls *logScrubber) Write(b []byte) (n int, err error) { //First scrub the input of IP addresses reIPv4 := regexp.MustCompile(`\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b`) - reIPv6 := regexp.MustCompile(`(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))`) + //Note that for embedded IPv4 address, the previous regex will scrub it + reIPv6 := regexp.MustCompile(`([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?`) scrubbedBytes := reIPv4.ReplaceAll(b, []byte("X.X.X.X")) scrubbedBytes = reIPv6.ReplaceAll(scrubbedBytes, []byte("X:X:X:X:X:X:X:X")) diff --git a/server/server_test.go b/server/server_test.go index c3514ed..537360a 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -59,6 +59,7 @@ func TestLogScrubber(t *testing.T) { log.Printf("%s", "http: TLS handshake error from 129.97.208.23:38310:") + //Example IPv4 address that ended up in log if bytes.Compare(buff.Bytes(), []byte("http: TLS handshake error from X.X.X.X:38310:\n")) != 0 { t.Errorf("log scrubber didn't scrub IPv4 address. Output: %s", string(buff.Bytes())) } @@ -66,9 +67,23 @@ func TestLogScrubber(t *testing.T) { log.Printf("%s", "http2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack") + //Example IPv6 address that ended up in log if bytes.Compare(buff.Bytes(), []byte("http2: panic serving [X:X:X:X:X:X:X:X]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n")) != 0 { t.Errorf("log scrubber didn't scrub IPv6 address. Output: %s", string(buff.Bytes())) } buff.Reset() + //Testing IPv6 edge cases + log.Printf("%s", "[1::]:58344") + log.Printf("%s", "[1:2:3:4:5:6::8]:58344") + log.Printf("%s", "[1::7:8]:58344") + log.Printf("%s", "[::4:5:6:7:8]:58344") + log.Printf("%s", "[::255.255.255.255]:58344") + log.Printf("%s", "[::ffff:0:255.255.255.255]:58344") + log.Printf("%s", "[2001:db8:3:4::192.0.2.33]:58344") + + if bytes.Compare(buff.Bytes(), []byte("[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:XX.X.X.X]:58344\n[X:X:X:X:X:X:X:XX.X.X.X]:58344\n[X:X:X:X:X:X:X:XX.X.X.X]:58344\n")) != 0 { + t.Errorf("log scrubber didn't scrub IPv6 address. Output: %s", string(buff.Bytes())) + } + buff.Reset() }

1 0

[snowflake/master] Sanitize IP addresses from server log output
by cohosh＠torproject.org 09 Apr '19

09 Apr '19

commit f586a4bab8fc428fa93ed7523da150fc45a13533 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Mar 20 15:50:55 2019 -0400 Sanitize IP addresses from server log output Added a scrubber that takes all logging output to the standard logger and passes through a series of regular expressions to replace IP addresses with safe strings (e.g., X.X.X.X:443). Ensure server logs to stdout are also scrubbed --- server/server.go | 28 ++++++++++++++++++++++++++-- server/server_test.go | 25 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/server/server.go b/server/server.go index 03095af..ad1cd2a 100644 --- a/server/server.go +++ b/server/server.go @@ -15,6 +15,7 @@ import ( "os" "os/signal" "path/filepath" + "regexp" "strings" "sync" "syscall" @@ -54,6 +55,22 @@ additional HTTP listener on port 80 to work with ACME. flag.PrintDefaults() } +// An io.Writer that can be used as the output for a logger that first +// sanitizes logs and then writes to the provided io.Writer +type logScrubber struct { + output io.Writer +} + +func (ls *logScrubber) Write(b []byte) (n int, err error) { + //First scrub the input of IP addresses + reIPv4 := regexp.MustCompile(`\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b`) + reIPv6 := regexp.MustCompile(`(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))`) + scrubbedBytes := reIPv4.ReplaceAll(b, []byte("X.X.X.X")) + scrubbedBytes = reIPv6.ReplaceAll(scrubbedBytes, + []byte("X:X:X:X:X:X:X:X")) + return ls.output.Write(scrubbedBytes) +} + // An abstraction that makes an underlying WebSocket connection look like an // io.ReadWriteCloser. type webSocketConn struct { @@ -280,8 +297,15 @@ func main() { log.Fatalf("can't open log file: %s", err) } defer f.Close() - log.SetOutput(f) - } + //We want to send the log output through our scrubber first + scrubber := &logScrubber{f} + log.SetOutput(scrubber) + } else { + // we still want to send log output through our scrubber, even + // if no log file was specified + scrubber := &logScrubber{os.Stdout} + log.SetOutput(scrubber) + } if !disableTLS && acmeHostnamesCommas == "" { log.Fatal("the --acme-hostnames option is required") diff --git a/server/server_test.go b/server/server_test.go index 84ac7ba..c3514ed 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -1,6 +1,8 @@ package main import ( + "bytes" + "log" "net" "strconv" "testing" @@ -47,3 +49,26 @@ func TestClientAddr(t *testing.T) { } } } + +func TestLogScrubber(t *testing.T) { + + var buff bytes.Buffer + scrubber := &logScrubber{&buff} + log.SetFlags(0) //remove all extra log output for test comparisons + log.SetOutput(scrubber) + + log.Printf("%s", "http: TLS handshake error from 129.97.208.23:38310:") + + if bytes.Compare(buff.Bytes(), []byte("http: TLS handshake error from X.X.X.X:38310:\n")) != 0 { + t.Errorf("log scrubber didn't scrub IPv4 address. Output: %s", string(buff.Bytes())) + } + buff.Reset() + + log.Printf("%s", "http2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack") + + if bytes.Compare(buff.Bytes(), []byte("http2: panic serving [X:X:X:X:X:X:X:X]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n")) != 0 { + t.Errorf("log scrubber didn't scrub IPv6 address. Output: %s", string(buff.Bytes())) + } + buff.Reset() + +}

1 0