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

[gettor/master] Update upload files script
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit 0e04d0b0269cd7425664c76587e9e6ba1bff01c9 Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 20:58:51 2019 +0200 Update upload files script --- scripts/update_files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_files b/scripts/update_files index c4027bd..fc4b884 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -58,5 +58,5 @@ for f in $(ls); do # Update Google Drive rclone copy $f gdrive:releases # Update Internet Archive - ia upload $f - --remote-name=$f --metadata="title:New Tor Browser release ${f}." --metadata="mediatype:movies" + ia upload $f - --remote-name=$f --metadata="title:New Tor Browser release ${f}." --metadata="mediatype:software" done

1 0

[gettor/master] Update upload files script
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit f8ab2e4c15da7b002fb1d2567f93dcadd17af4fb Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 20:27:15 2019 +0200 Update upload files script --- scripts/update_files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_files b/scripts/update_files index ae6055e..c4027bd 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -58,5 +58,5 @@ for f in $(ls); do # Update Google Drive rclone copy $f gdrive:releases # Update Internet Archive - ia upload <identifier> - --remote-name=$f --metadata="title:New Tor Browser release ${f}." --metadata="mediatype:movies" + ia upload $f - --remote-name=$f --metadata="title:New Tor Browser release ${f}." --metadata="mediatype:movies" done

1 0

[gettor/master] Update messages
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit 72c2c985ef3f5098da2b67496f89f2fdccdd65f7 Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 20:24:23 2019 +0200 Update messages --- scripts/add_links_to_db | 2 +- scripts/update_files | 2 +- share/locale/en.json | 2 +- share/locale/es.json | 2 +- share/locale/pt.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db index 2870482..a59563d 100755 --- a/scripts/add_links_to_db +++ b/scripts/add_links_to_db @@ -69,7 +69,7 @@ def main(): providers = { "gitlab": "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/", - "github": "https://github.com/TheTorProject/gettorbrowser/raw/torbrowser-releases/" + "github": "https://github.com/TheTorProject/gettorbrowser/raw/torbrowser-releases/", } prefixes = { diff --git a/scripts/update_files b/scripts/update_files index 6b9546a..ae6055e 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -58,5 +58,5 @@ for f in $(ls); do # Update Google Drive rclone copy $f gdrive:releases # Update Internet Archive - ia upload <identifier> - --remote-name=$f --metadata="title:New Tor Browser release ${f}." + ia upload <identifier> - --remote-name=$f --metadata="title:New Tor Browser release ${f}." --metadata="mediatype:movies" done diff --git a/share/locale/en.json b/share/locale/en.json index afa6427..8ed6722 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -1,5 +1,5 @@ { - "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", + "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following archives:\n\n- Internet Archive: https://archive.org/details/@gettor\n\n- Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\nDownl… the file: {}\n\n \n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body": "This is how you can request a tor browser bundle link.\n\n Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\nWe only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", "help_subject": "[GetTor] Help Email", diff --git a/share/locale/es.json b/share/locale/es.json index 8e99ef1..8ed6722 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -1,5 +1,5 @@ { - "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n \n--\nGetTor", + "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following archives:\n\n- Internet Archive: https://archive.org/details/@gettor\n\n- Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\nDownl… the file: {}\n\n \n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body": "This is how you can request a tor browser bundle link.\n\n Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\nWe only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", "help_subject": "[GetTor] Help Email", diff --git a/share/locale/pt.json b/share/locale/pt.json index afa6427..8ed6722 100644 --- a/share/locale/pt.json +++ b/share/locale/pt.json @@ -1,5 +1,5 @@ { - "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", + "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following archives:\n\n- Internet Archive: https://archive.org/details/@gettor\n\n- Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\nDownl… the file: {}\n\n \n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body": "This is how you can request a tor browser bundle link.\n\n Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\nWe only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", "help_subject": "[GetTor] Help Email",

1 0

[gettor/master] Update file script
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit 3dba52b3ee321af8a84f3464d6cd4ff5a98da6a6 Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 19:34:34 2019 +0200 Update file script --- scripts/update_files | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/update_files b/scripts/update_files index 574688b..6b9546a 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -11,8 +11,6 @@ cd ~/releases git checkout master -git branch -D releases -git push origin --delete releases git branch -D torbrowser-releases git push github --delete torbrowser-releases @@ -36,18 +34,15 @@ for row in $( ); if [[ $r = *[!\ ]* ]]; then git fetch --all - git checkout releases wget $r git add . git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads' - diffs=$(git diff origin/releases) + diffs=$(git diff origin/torbrowser-releases) if [ -z "$diffs" ]; then echo "No new releases" else - git push -f --follow-tags origin releases + git push -f --follow-tags origin torbrowser-releases fi - git checkout torbrowser-releases - git merge releases diffs=$(git diff github/torbrowser-releases) if [ -z "$diffs" ]; then echo "No new releases"

1 0

[gettor/master] Update links and update script
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit b1470f9aeecf219ca5debaad99c08d02f42976ff Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 19:19:47 2019 +0200 Update links and update script --- scripts/add_links_to_db | 2 +- scripts/update_files | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db index 72f557a..2870482 100755 --- a/scripts/add_links_to_db +++ b/scripts/add_links_to_db @@ -68,7 +68,7 @@ def main(): sys.exit(1) providers = { - "gitlab": "https://gitlab.com/thetorproject/gettorbrowser/raw/releases/", + "gitlab": "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/", "github": "https://github.com/TheTorProject/gettorbrowser/raw/torbrowser-releases/" } diff --git a/scripts/update_files b/scripts/update_files index 2312157..574688b 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -20,9 +20,8 @@ git fetch --all --prune git add . git commit -am 'Create release branch' -git checkout -b releases -git push -f --follow-tags origin releases git checkout -b torbrowser-releases +git push -f --follow-tags origin torbrowser-releases git push -f --follow-tags github torbrowser-releases

1 0

[gettor/master] Fix link message
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit b0cd58e0d66386ac9acb6d7f802e9ba9899f43e5 Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 19:10:25 2019 +0200 Fix link message --- gettor/services/email/sendmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 7951e9d..bba350d 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -182,7 +182,7 @@ class Sendmail(object): version = link[4] arch = link[3] url = link[0] - file = link[6] + file = link[7] sig_url = url + ".asc" link_str = "Tor Browser {} for {}-{}-{} ({}): {}\n".format(

1 0

[gettor/master] Update link message
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit 6bec9f7e7f084c5145f0dade439257fe443f232f Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 18:54:53 2019 +0200 Update link message --- share/locale/en.json | 2 +- share/locale/es.json | 4 ++-- share/locale/pt.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/locale/en.json b/share/locale/en.json index 8e99ef1..afa6427 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -1,5 +1,5 @@ { - "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n \n--\nGetTor", + "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body": "This is how you can request a tor browser bundle link.\n\n Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\nWe only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", "help_subject": "[GetTor] Help Email", diff --git a/share/locale/es.json b/share/locale/es.json index f424b33..8e99ef1 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -7,10 +7,10 @@ "help_config": "Custom config file location (optional)", "smtp_links_subject": "[GetTor] Links for your request", "smtp_mirrors_subject": "[GetTor] Mirrors", - "smtp_help_subject": "[GetTor] Ayuda", + "smtp_help_subject": "[GetTor] Help", "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale", "smtp_unsupported_locale_msg": "The locale you requested '{}' is not supported.", - "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n \n--\nGetTor", + "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", "smtp_mirrors_msg": "Hi! this is the GetTor robot.\n\nThank you for your request. Attached to this email you will find\nan updated list of mirrors of Tor Project's website.", "smtp_help_msg": "Hi! This is the GetTor robot. I am here to help you download the\nlatest version of Tor Browser.\n\nPlease reply to this message with one of the options below:\n\nwindows\nlinux\nosx\nmirrors\n\nI will then send you the download instructions.\n\nIf you are unsure, just send a blank reply to this message." } diff --git a/share/locale/pt.json b/share/locale/pt.json index 3006c7c..afa6427 100644 --- a/share/locale/pt.json +++ b/share/locale/pt.json @@ -1,5 +1,5 @@ { - "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n \n--\nGetTor", + "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body": "This is how you can request a tor browser bundle link.\n\n Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\nWe only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", "help_subject": "[GetTor] Help Email", @@ -10,7 +10,7 @@ "smtp_help_subject": "[GetTor] Help", "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale", "smtp_unsupported_locale_msg": "The locale you requested '{}' is not supported.", - "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n \n--\nGetTor", + "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", "smtp_mirrors_msg": "Hi! this is the GetTor robot.\n\nThank you for your request. Attached to this email you will find\nan updated list of mirrors of Tor Project's website.", "smtp_help_msg": "Hi! This is the GetTor robot. I am here to help you download the\nlatest version of Tor Browser.\n\nPlease reply to this message with one of the options below:\n\nwindows\nlinux\nosx\nmirrors\n\nI will then send you the download instructions.\n\nIf you are unsure, just send a blank reply to this message." }

1 0

[gettor/master] Update upload script
by hiro＠torproject.org 28 Sep '19

28 Sep '19

commit 35daafc31a92321aff90c57c74cd2e756fa20782 Author: hiro <hiro(a)torproject.org> Date: Sat Sep 28 18:07:15 2019 +0200 Update upload script --- scripts/update_files | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/update_files b/scripts/update_files index 0ce81b2..2312157 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -20,10 +20,11 @@ git fetch --all --prune git add . git commit -am 'Create release branch' -git checkout -b torbrowser-releases -git push -f --follow-tags github torbrowser-releases git checkout -b releases git push -f --follow-tags origin releases +git checkout -b torbrowser-releases +git push -f --follow-tags github torbrowser-releases + for row in $( curl -s 'https://aus1.torproject.org/torbrowser/update_3/release/downloads.json' |

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 28 Sep '19

28 Sep '19

commit e6f0a22c6f61732f3690bd6bb1718bac4dede63e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 28 14:54:02 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index 0428411db..5626ae42a 100644 --- a/contents+es.po +++ b/contents+es.po @@ -7704,7 +7704,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.title) msgid "How can I chat with Tor Project teams?" -msgstr "" +msgstr "¿Cómo puedo charlar con los equipos del Tor Project?" #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 28 Sep '19

28 Sep '19

commit ca7fce4f189fc55f9c833544818c14e95d2dc1c6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 28 14:24:01 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 3f977d0dc..0428411db 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1368,6 +1368,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.5-osx64_en-" "US.dmg{.asc,}" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.5-osx64_en-" +"US.dmg{.asc,}" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -7731,6 +7733,9 @@ msgid "" "used, you will get a message from the system and you should choose another " "nick." msgstr "" +"**APODO:** Elige el nombre que quieras, pero utiliza siempre el mismo para " +"comunicarte con la gente del Proyecto Tor. Si tu apodo ya está ocupado, el " +"sistema te lo notificará y tendrás que elegir otro nombre." #: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) @@ -7854,6 +7859,7 @@ msgstr "" #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "If all goes well, you will receive a message that you are registered." msgstr "" +"Si todo va bien, recibiras un mensaje diciéndote que te has registado." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -7880,7 +7886,7 @@ msgstr "`/nick tuapodo`" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "`/msg nickserv IDENTIFY YourPassWord`" -msgstr "" +msgstr "`/msg nickserv IDENTIFY TuContraseña`" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -7995,7 +8001,7 @@ msgstr "````" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Your nick is verified!" -msgstr "" +msgstr "Tu apodo ha sido verificado!" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8053,7 +8059,7 @@ msgstr "" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "#### 1. Install `apt-transport-https`" -msgstr "" +msgstr "#### 1. Instala `apt-transport-https`" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -8105,6 +8111,8 @@ msgid "" "deb-src https://deb.torproject.org/torproject.org tor-" "experimental-0.3.4.x-<DISTRIBUTION> main" msgstr "" +"deb-src https://deb.torproject.org/torproject.org tor-" +"experimental-0.3.4.x-<DISTRIBUTION> main" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -8117,6 +8125,8 @@ msgid "" "deb https://deb.torproject.org/torproject.org tor-nightly-" "master-<DISTRIBUTION> main" msgstr "" +"deb https://deb.torproject.org/torproject.org tor-nightly-" +"master-<DISTRIBUTION> main" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description)

1 0