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

[tor-browser/tor-browser-89.0-10.0-1] Bug 40309: Avoid using regional OS locales
by boklm＠torproject.org 16 Jun '21

16 Jun '21

commit 02a2e317b6b82173b28767179273dd4c751eb486 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Jan 27 11:28:05 2021 +0100 Bug 40309: Avoid using regional OS locales Only use regional OS locales if the pref `intl.regional_prefs.use_os_locales` is set to true. --- intl/locale/LocaleService.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/intl/locale/LocaleService.cpp b/intl/locale/LocaleService.cpp index 022d41cab2e2..ac001ee98991 100644 --- a/intl/locale/LocaleService.cpp +++ b/intl/locale/LocaleService.cpp @@ -452,31 +452,6 @@ LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { OSPreferences::GetInstance()->GetRegionalPrefsLocales(aRetVal))) { return NS_OK; } - - // If we fail to retrieve them, return the app locales. - GetAppLocalesAsBCP47(aRetVal); - return NS_OK; - } - - // Otherwise, fetch OS Regional Preferences locales and compare the first one - // to the app locale. If the language subtag matches, we can safely use - // the OS Regional Preferences locale. - // - // This facilitates scenarios such as Firefox in "en-US" and User sets - // regional prefs to "en-GB". - nsAutoCString appLocale; - AutoTArray<nsCString, 10> regionalPrefsLocales; - LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocale); - - if (NS_FAILED(OSPreferences::GetInstance()->GetRegionalPrefsLocales( - regionalPrefsLocales))) { - GetAppLocalesAsBCP47(aRetVal); - return NS_OK; - } - - if (LocaleService::LanguagesMatch(appLocale, regionalPrefsLocales[0])) { - aRetVal = regionalPrefsLocales.Clone(); - return NS_OK; } // Otherwise use the app locales.

1 0

[tor-browser/tor-browser-89.0-10.0-1] Bug 40025: Remove Mozilla add-on install permissions
by boklm＠torproject.org 16 Jun '21

16 Jun '21

commit ea99a5ebd5ff41dce2be4bc93a840e406eb4d63b Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 27 18:12:55 2020 +0200 Bug 40025: Remove Mozilla add-on install permissions --- browser/app/permissions | 5 ----- 1 file changed, 5 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index 4938bd1e22e5..5c4c302f5ba5 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -11,11 +11,6 @@ origin uitour 1 https://3g2upl4pq6kufc4m.onion origin uitour 1 about:tor -# XPInstall -origin install 1 https://addons.mozilla.org - # Remote troubleshooting origin remote-troubleshooting 1 https://support.mozilla.org -# addon install -origin install 1 https://fpn.firefox.com

1 0

[tor-browser/tor-browser-89.0-10.0-1] Bug 40432: Prevent probing installed applications
by boklm＠torproject.org 16 Jun '21

16 Jun '21

commit 6bfc20432cd05696d0e9cd24f68efbd6383766b8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 17 18:09:09 2021 +0000 Bug 40432: Prevent probing installed applications --- .../exthandler/nsExternalHelperAppService.cpp | 30 ++++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index e46df70429c2..d5851413011a 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -1049,8 +1049,33 @@ nsresult nsExternalHelperAppService::GetFileTokenForPath( ////////////////////////////////////////////////////////////////////////////////////////////////////// // begin external protocol service default implementation... ////////////////////////////////////////////////////////////////////////////////////////////////////// + +static const char kExternalProtocolPrefPrefix[] = + "network.protocol-handler.external."; +static const char kExternalProtocolDefaultPref[] = + "network.protocol-handler.external-default"; + NS_IMETHODIMP nsExternalHelperAppService::ExternalProtocolHandlerExists( const char* aProtocolScheme, bool* aHandlerExists) { + + // Replicate the same check performed in LoadURI. + // Deny load if the prefs say to do so + nsAutoCString externalPref(kExternalProtocolPrefPrefix); + externalPref += aProtocolScheme; + bool allowLoad = false; + *aHandlerExists = false; + if (NS_FAILED(Preferences::GetBool(externalPref.get(), &allowLoad))) { + // no scheme-specific value, check the default + if (NS_FAILED( + Preferences::GetBool(kExternalProtocolDefaultPref, &allowLoad))) { + return NS_OK; // missing default pref + } + } + + if (!allowLoad) { + return NS_OK; // explicitly denied + } + nsCOMPtr<nsIHandlerInfo> handlerInfo; nsresult rv = GetProtocolHandlerInfo(nsDependentCString(aProtocolScheme), getter_AddRefs(handlerInfo)); @@ -1093,11 +1118,6 @@ NS_IMETHODIMP nsExternalHelperAppService::IsExposedProtocol( return NS_OK; } -static const char kExternalProtocolPrefPrefix[] = - "network.protocol-handler.external."; -static const char kExternalProtocolDefaultPref[] = - "network.protocol-handler.external-default"; - NS_IMETHODIMP nsExternalHelperAppService::LoadURI(nsIURI* aURI, nsIPrincipal* aTriggeringPrincipal,

1 0

[tor-browser/tor-browser-89.0-10.0-1] Bug 30605: Honor privacy.spoof_english in Android
by boklm＠torproject.org 16 Jun '21

16 Jun '21

commit d775894d3f541f26c0eb71a5208ff409e6c91d74 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 16 10:45:17 2020 +0200 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. --- mobile/android/components/geckoview/GeckoViewStartup.jsm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mobile/android/components/geckoview/GeckoViewStartup.jsm b/mobile/android/components/geckoview/GeckoViewStartup.jsm index 3603c3743fa1..b73a5f4f0978 100644 --- a/mobile/android/components/geckoview/GeckoViewStartup.jsm +++ b/mobile/android/components/geckoview/GeckoViewStartup.jsm @@ -17,6 +17,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { EventDispatcher: "resource://gre/modules/Messaging.jsm", Preferences: "resource://gre/modules/Preferences.jsm", Services: "resource://gre/modules/Services.jsm", + RFPHelper: "resource://gre/modules/RFPHelper.jsm", }); const { debug, warn } = GeckoViewUtils.initLogging("Startup"); @@ -252,6 +253,10 @@ class GeckoViewStartup { if (aData.requestedLocales) { Services.locale.requestedLocales = aData.requestedLocales; } + RFPHelper._handleSpoofEnglishChanged(); + if (Services.prefs.getIntPref("privacy.spoof_english", 0) === 2) { + break; + } const pls = Cc["@mozilla.org/pref-localizedstring;1"].createInstance( Ci.nsIPrefLocalizedString );

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 16 Jun '21

16 Jun '21

commit 84ae1a97b9b3cc9dfae1e0ec3fadc165a14d06d2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 16 20:17:31 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ru/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 609f75fe54..d744a2b66d 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -86,10 +86,10 @@ <!ENTITY torPreferences.torLogsDialogTitle "Журнал Tor">  -<!ENTITY torConnect.tryAgain "Try Connecting Again"> +<!ENTITY torConnect.tryAgain "Переподключение"> <!ENTITY torConnect.offline "Отключён"> -<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect to the Tor Network"> -<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> +<!ENTITY torConnect.connectMessage "Изменения в настройках Tor не вступят в силу, пока вы не подключитесь к сети Tor"> +<!ENTITY torConnect.tryAgainMessage "Браузеру Tor не удалось установить соединение с сетью Tor"> <!ENTITY torConnect.connectingConcise "Соединение..."> <!ENTITY torConnect.connectedConcise "Подключено"> -<!ENTITY torConnect.copyLog "Copy Tor Logs"> +<!ENTITY torConnect.copyLog "Копирование журналов Tor">

1 0

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

16 Jun '21

commit 2b13123b20b832cd253de0d29db7d4804d965f7b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 16 20:16:26 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ru.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ru.po b/ru.po index 9a408eead2..7b585859b3 100644 --- a/ru.po +++ b/ru.po @@ -29,6 +29,7 @@ # solokot <solokot(a)gmail.com>, 2017 # Valid Olov, 2013 # Viktor Kutcevich <architector4(a)tilde.team>, 2019 +# Vladimir Korsakov <inovasionempire(a)gmail.com>, 2021 # Wagan <wagan.sarukhanov(a)gmail.com>, 2015 # Ziggi, 2020 # Andrey Kostrikov <yavinav(a)gmail.com>, 2016 @@ -40,8 +41,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-01 12:30+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-06-16 20:12+0000\n" +"Last-Translator: Vladimir Korsakov <inovasionempire(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"

1 0

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

16 Jun '21

commit ffaf175ee84f36317b8e2a1611f826e394d097fb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 16 20:15:44 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ru.po | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/ru.po b/ru.po index 6ae841efab..e93b53fef7 100644 --- a/ru.po +++ b/ru.po @@ -29,6 +29,7 @@ # solokot <solokot(a)gmail.com>, 2017 # Valid Olov, 2013 # Viktor Kutcevich <architector4(a)tilde.team>, 2019 +# Vladimir Korsakov <inovasionempire(a)gmail.com>, 2021 # Wagan <wagan.sarukhanov(a)gmail.com>, 2015 # Ziggi, 2020 # Andrey Kostrikov <yavinav(a)gmail.com>, 2016 @@ -40,8 +41,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-28 18:17-0500\n" -"PO-Revision-Date: 2021-06-01 12:30+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-06-16 20:12+0000\n" +"Last-Translator: Vladimir Korsakov <inovasionempire(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" @@ -2710,76 +2711,76 @@ msgstr "" msgid "" "<a href=\"doc/anonymous_internet/tor\">Learn more about how Tails connects " "to Tor</a>" -msgstr "" +msgstr "<a href=\"doc/anonymous_internet/tor\">Узнайте больше о том, как Tails подключается к Tor</a>" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1091 msgid "Connect to a local network" -msgstr "" +msgstr "Подключиться к локальной сети" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1108 msgid "" "You are not connected to a local network yet. To be able to connect to the " "Tor network, you first need to connect to a Wi-Fi, wire, or mobile network." -msgstr "" +msgstr "Вы еще не подключены к локальной сети. Чтобы иметь возможность подключиться к сети Tor, вам сначала необходимо подключиться к Wi-Fi, проводной или мобильной сети." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1124 msgid "" "To connect to a Wi-Fi network, open the system menu in the top-right corner " "of the screen, choose Wi-Fi Not Connected and then Select " "Network." -msgstr "" +msgstr "Чтобы подключиться к сети Wi-Fi, откройте системное меню в правом верхнем углу экрана, выберите Wi-Fi не подключен, а затем Выбрать сеть." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1167 msgid "Testing Internet access…" -msgstr "" +msgstr "Проверка доступа к сети интернет..." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1207 msgid "You have access to the Internet" -msgstr "" +msgstr "У вас есть доступ в интернет" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1241 msgid "Testing access to Tor…" -msgstr "" +msgstr "Проверка доступа к сети Tor..." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1284 msgid "You can connect to Tor" -msgstr "" +msgstr "Вы можете подключиться к сети Tor" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1314 msgid "Failed to connect to Tor without bridges." -msgstr "" +msgstr "Не удалось подключиться к сети Tor из-за отсутствия мостов." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1330 msgid "Your local network is blocking access to Tor." -msgstr "" +msgstr "Ваша локальная сеть блокирует доступ к сети Tor." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1362 msgid "Connecting to Tor…" -msgstr "" +msgstr "Подключение к сети Tor..." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1418 msgid "Connected to Tor successfully" -msgstr "" +msgstr "Успешное подключение к сети Tor" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1442 msgid "You can now browse the Internet anonymously and uncensored." -msgstr "" +msgstr "Теперь вы можете просматривать Интернет анонимно и без цензуры." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1483 msgid "Open Network Monitor" -msgstr "" +msgstr "Открыть сетевой монитор" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497 msgid "View Tor Circuits" -msgstr "" +msgstr "Посмотреть схемы Tor" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1511 msgid "Reset Tor Connection" -msgstr "" +msgstr "Сбросить соединение с Tor" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1551 msgid "Configure a Local Proxy" -msgstr "" +msgstr "Настроить локальный прокси" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1577 msgid "Proxy Type" @@ -2819,4 +2820,4 @@ msgstr "Порт" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1747 msgid "_Save Proxy Settings" -msgstr "" +msgstr "Сохранение настроек прокси"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 16 Jun '21

16 Jun '21

commit 9ae217c128f50eb49f9a45af86fc962e2863d7c0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 16 18:46:59 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+cs.po | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/contents+cs.po b/contents+cs.po index 0bae211c33..f0085f6adf 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -499,6 +499,8 @@ msgid "" "5. You'll need to tell your GNU/Linux that you want the ability to execute " "shell scripts from the graphical interface or the command line." msgstr "" +"5. Musíte GNU/Linuxu sdělit, že chcete mít možnost spouštět shellové skripty" +" z grafického rozhraní nebo příkazového řádku." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -526,6 +528,8 @@ msgid "" "**Note:** On Ubuntu and some other distros if you try to launch the start-" "tor-browser.desktop file a text file might open up." msgstr "" +"**Poznámka:** V Ubuntu a některých dalších distribucích se při pokusu o " +"spuštění souboru start-tor-browser.desktop může otevřít textový soubor." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -535,6 +539,10 @@ msgid "" "Tab → Select \"Run them\" or \"Ask what to do\" under \"Executable Text " "Files\"." msgstr "" +"Chcete-li toto chování změnit a místo toho spustit Prohlížeč Tor, postupujte" +" takto: Otevřete \"Soubory\" (GNOME Files/Nautilus) → otevřete Předvolby → " +"přejděte na kartu \"Chování\" → v části \"Spustitelné textové soubory\" " +"vyberte \"Spustit je\" nebo \"Zeptat se, co má udělat\"." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -542,6 +550,8 @@ msgid "" "If you choose the latter click on \"Run\" after launching the start-tor-" "browser.desktop file." msgstr "" +"Pokud zvolíte druhou možnost, klikněte po spuštění souboru start-tor-" +"browser.desktop na \"Spustit\"." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -555,7 +565,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "`./start-tor-browser.desktop`" -msgstr "" +msgstr "`./start-tor-browser.desktop`" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -563,6 +573,8 @@ msgid "" "See here on how to [update Tor Browser](https://tb-" "manual.torproject.org/updating/)" msgstr "" +"Zde se dozvíte jak [aktualizovat Prohlížeč Tor](https://tb-" +"manual.torproject.org/updating/)" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) @@ -594,7 +606,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONNECT" -msgstr "" +msgstr "### PŘIPOJIT" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -602,6 +614,8 @@ msgid "" "<img class=\"col-md-6\" src=\"../../static/images/connect.png\" alt=\"Click " "'connect' to connect to Tor.\">" msgstr "" +"<img class=\"col-md-6\" src=\"../../static/images/connect.png\" alt=\"Click " +"'connect' to connect to Tor.\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -635,7 +649,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONFIGURE" -msgstr "" +msgstr "### NASTAVIT" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -643,6 +657,8 @@ msgid "" "<img class=\"col-md-6\" src=\"../../static/images/configure.png\" " "alt=\"Click 'configure' to adjust network settings.\">" msgstr "" +"<img class=\"col-md-6\" src=\"../../static/images/configure.png\" " +"alt=\"Click 'configure' to adjust network settings.\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -659,6 +675,8 @@ msgid "" "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\" " "alt=\"Select options for censored connection or proxy use.\">" msgstr "" +"<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\" " +"alt=\"Select options for censored connection or proxy use.\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -673,6 +691,8 @@ msgid "" "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\" " "alt=\"Configure Tor bridge options\">" msgstr "" +"<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\" " +"alt=\"Configure Tor bridge options\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body)

1 0

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

16 Jun '21

commit 7ba2c5d6e3f1cf7c4cfab2ebd3cc4c4a7b043f99 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 16 15:15:11 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/contents+es.po b/contents+es.po index 8c63765e60..9a69ed6e50 100644 --- a/contents+es.po +++ b/contents+es.po @@ -14,8 +14,8 @@ # Ines Branco Lopez <ibranco(a)fibgar.org>, 2021 # strel, 2021 # erinm, 2021 -# Emma Peel, 2021 # Zuhualime Akoochimoya, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-16 15:58+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Zuhualime Akoochimoya, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,9 +73,8 @@ msgid "" "Below, you'll find some different ways to volunteer with the Tor community " "as well as resources to better help you help Tor." msgstr "" -"Debajo encontrarás algunas maneras diferentes de obrar voluntariamente con " -"la comunidad Tor, como así también recursos para ayudarte mejor a ayudar a " -"Tor." +"Debajo encontrarás algunas maneras diferentes de colaborar con la comunidad " +"Tor, como así también recursos que te ayudarán a ayudar a Tor." #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.title) @@ -1212,8 +1211,8 @@ msgid "" "However all feedback must be discussed internally across the different teams" " at the Tor Project first." msgstr "" -"Sin embargo, todo aporte debe ser discutido internamente primero a través de" -" los diferentes equipos del Tor Project." +"Sin embargo, todo aporte se debe discutir internamente primero a través de " +"los diferentes equipos del Tor Project." #: https//community.torproject.org/user-research/how-to-volunteer/ #: (content/user-research/how-to-volunteer/contents+en.lrpage.body) @@ -1234,7 +1233,7 @@ msgid "" "research/guidelines/) to get to know this process more." msgstr "" "Por favor lee nuestra [Guía](https://community.torproject.org/user-" -"research/guidelines/) para conocer más acerca de este proceso." +"research/guidelines/) para saber más de este proceso." #: https//community.torproject.org/user-research/how-to-volunteer/ #: (content/user-research/how-to-volunteer/contents+en.lrpage.body)

1 0

[tor/main] git: Don't pull github anymore in git-pull-all.sh
by dgoulet＠torproject.org 16 Jun '21

16 Jun '21

commit 3f73ab3f0dbd717c464c8fa899413d6a20df3587 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 16 10:53:32 2021 -0400 git: Don't pull github anymore in git-pull-all.sh Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/git/git-pull-all.sh | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 94313c3473..bbe2576d8e 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -159,20 +159,7 @@ function goto_repo function fetch_origin { local cmd="git fetch origin" - printf " %s Fetching origin..." "$MARKER" - if [ $DRY_RUN -eq 0 ]; then - msg=$( eval "$cmd" 2>&1 ) - validate_ret $? "$msg" - else - printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" - fi -} - -# Fetch tor-github pull requests. No arguments. -function fetch_tor_github -{ - local cmd="git fetch tor-github" - printf " %s Fetching tor-github..." "$MARKER" + printf "%s Fetching origin..." "$MARKER" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) validate_ret $? "$msg" @@ -185,7 +172,7 @@ function fetch_tor_github function fetch_tor_gitlab { local cmd="git fetch tor-gitlab" - printf " %s Fetching tor-gitlab..." "$MARKER" + printf "%s Fetching tor-gitlab..." "$MARKER" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) validate_ret $? "$msg" @@ -198,11 +185,10 @@ function fetch_tor_gitlab # Entry point # ############### -# First, fetch tor-github. +# Get into our origin repository. goto_repo "$ORIGIN_PATH" -fetch_tor_github -# Then tor-gitlab +# First, fetch tor-gitlab fetch_tor_gitlab # Then, fetch the origin.

1 0