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

[community/master] Create child page with BSD auto update instructions
by emmapeel＠torproject.org 29 Aug '19

29 Aug '19

commit 3fc8f0efe60b71920863fe9d6ced516c2940110b Author: gus <gus(a)torproject.org> Date: Thu Aug 29 07:12:44 2019 -0400 Create child page with BSD auto update instructions --- .../guard/freebsd/updates/contents.lr | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr new file mode 100644 index 0000000..bc1dd05 --- /dev/null +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -0,0 +1,45 @@ +_model: page +--- +title: Automatic Updates on BSD* +--- +_hidden: no +--- +_slug: updates +--- +body: + +# DragonFlyBSD / FreeBSD / HardenedBSD + +**NOTE:** _all steps documented on this page are considering that your machine/server/system only provides Tor relay services. please be aware that other services running might stop/restart during the upgrade._ + +#1. Create the script to perform the updates. + +Let's use `/root/pkg_upgrade.sh` + +``` +#!/usr/bin/env sh +PATH="/bin:/usr/bin:/sbin:/usr/sbin" +RAND=$(jot -r 1 300) +sleep ${RAND} +env AUTOCLEAN=YES ASSUME_ALWAYS_YES=YES HANDLE_RC_SCRIPTS=YES pkg upgrade +``` + +#2. Schedule the job to run. + +``` +# echo "0 0 * * * root /bin/sh /root/pkg_upgrade.sh >/dev/null" >> /etc/crontab +``` + +#3. Restart cron's service. + +``` +# service cron restart +``` +--- +html: two-columns-page.html +--- +section: relay operations +--- +section_id: relay-operations +--- +key: 1

1 0

[community/master] Include BSD auto update instructions, link to post-install
by emmapeel＠torproject.org 29 Aug '19

29 Aug '19

commit f5d506dcbb4451110225b8926255b3644cce4556 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 07:05:06 2019 -0400 Include BSD auto update instructions, link to post-install --- .../technical-setup/guard/freebsd/contents.lr | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/contents.lr index a47dfc8..01504ac 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr @@ -4,7 +4,11 @@ title: FreeBSD --- body: -## 1. Install the tor package +# 1. Enable Automatic Software Updates + +One of the most imported things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. Follow the instructions to enable [automatic software updates](updates) for your operating system. + +# 2. Install the tor package `pkg install tor ca_root_nss` @@ -12,7 +16,7 @@ or for alpha releases: `pkg install tor-devel ca_root_nss` -## 2. Put the configuration file `/usr/local/etc/tor/torrc` in place +# 3. Put the configuration file `/usr/local/etc/tor/torrc` in place ``` #change the nickname "myNiceRelay" to a name that you like @@ -25,14 +29,14 @@ ContactInfo tor-operator@your-emailaddress-domain Log notice syslog ``` -## 3. Ensure that the `random_id` sysctl setting is enabled: +# 4. Ensure that the `random_id` sysctl setting is enabled: ``` echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf sysctl net.inet.ip.random_id=1 ``` -## 4. Start the tor daemon and make sure it starts at boot: +# 5. Start the tor daemon and make sure it starts at boot: ``` sysrc tor_enable=YES @@ -61,6 +65,9 @@ FreeBSDlatest: { } ``` +# 6. Final notes + +If you are having troubles setting up your relay, have a look at our [help section](FIXME). If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes. --- html: two-columns-page.html ---

1 0

[community/master] Hiding Debian updates page
by emmapeel＠torproject.org 29 Aug '19

29 Aug '19

commit c9e99c114feceefe29a15567a9f5397aa2cb8858 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 07:32:00 2019 -0400 Hiding Debian updates page --- .../technical-setup/guard/debianubuntu/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr index 39c6547..7d9645f 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: Automatic updates on Debian and Ubuntu --- -_discoverable: yes +_discoverable: no --- _hidden: yes ---

1 0

[community/master] Hiding Fedora updates page
by emmapeel＠torproject.org 29 Aug '19

29 Aug '19

commit cd56a88f1c9a122243888b53c15fcd8051fe27a7 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 07:32:30 2019 -0400 Hiding Fedora updates page --- .../relay-operations/technical-setup/guard/fedora/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr index f8ee3f7..03ad164 100644 --- a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr @@ -30,4 +30,4 @@ _hidden: yes --- _slug: updates --- -_discoverable: yes +_discoverable: no

1 0

[community/master] Hiding BSD updates page
by emmapeel＠torproject.org 29 Aug '19

29 Aug '19

commit 7762dde9c04f55e9b9006ebeea74f549eaa01e23 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 07:33:28 2019 -0400 Hiding BSD updates page will-fix: https://dip.torproject.org/web/community/issues/80 --- .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index bc1dd05..6746558 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: Automatic Updates on BSD* --- -_hidden: no +_hidden: yes --- _slug: updates ---

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Revert "Bug 24056: Use en-US strings in HTML forms"
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit 69bf59ac52f26317e93e2325a8e8c1d797f56c0c Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Aug 19 13:13:36 2019 +0200 Revert "Bug 24056: Use en-US strings in HTML forms" This reverts commit 243a68926e148a2590707ee9b3cb2364e2f42083. --- dom/base/nsContentUtils.cpp | 32 +++++++------------------------- dom/base/nsContentUtils.h | 3 --- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index a7ff89977a95..ca8ad1d26b26 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -317,8 +317,6 @@ bool nsContentUtils::sBypassCSSOMOriginCheck = false; nsCString* nsContentUtils::sJSBytecodeMimeType = nullptr; -int32_t nsContentUtils::sSpoofEnglish = 0; - nsContentUtils::UserInteractionObserver* nsContentUtils::sUserInteractionObserver = nullptr; @@ -607,8 +605,6 @@ nsresult nsContentUtils::Init() { Preferences::AddBoolVarCache(&sAllowXULXBL_for_file, "dom.allow_XUL_XBL_for_file"); - Preferences::AddIntVarCache(&sSpoofEnglish, "privacy.spoof_english", 0); - #ifndef RELEASE_OR_BETA sBypassCSSOMOriginCheck = getenv("MOZ_BYPASS_CSSOM_ORIGIN_CHECK"); #endif @@ -3511,7 +3507,7 @@ void nsContentUtils::GetEventArgNames(int32_t aNameSpaceID, nsAtom* aEventName, // Note: The list of content bundles in nsStringBundle.cpp should be updated // whenever entries are added or removed from this list. -static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { +static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = { // Must line up with the enum values in |PropertiesFile| enum. "chrome://global/locale/css.properties", "chrome://global/locale/xbl.properties", @@ -3526,9 +3522,7 @@ static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { "chrome://global/locale/commonDialogs.properties", "chrome://global/locale/mathml/mathml.properties", "chrome://global/locale/security/security.properties", - "chrome://necko/locale/necko.properties", - "resource://gre/chrome/en-US/locale/en-US/global/layout/" - "HtmlForm.properties"}; + "chrome://necko/locale/necko.properties"}; /* static */ nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) { @@ -3581,11 +3575,6 @@ void nsContentUtils::AsyncPrecreateStringBundles() { nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile, const char* aKey, nsAString& aResult) { - // When we spoof English, use en-US default strings in HTML forms. - if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) { - aFile = eFORMS_PROPERTIES_en_US; - } - nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -3598,11 +3587,6 @@ nsresult nsContentUtils::FormatLocalizedString(PropertiesFile aFile, const char16_t** aParams, uint32_t aParamsLength, nsAString& aResult) { - // When we spoof English, use en-US default strings in HTML forms. - if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) { - aFile = eFORMS_PROPERTIES_en_US; - } - nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -5136,13 +5120,11 @@ nsIWidget* nsContentUtils::GetTopLevelWidget(nsIWidget* aWidget) { const nsDependentString nsContentUtils::GetLocalizedEllipsis() { static char16_t sBuf[4] = {0, 0, 0, 0}; if (!sBuf[0]) { - if (sSpoofEnglish != 2) { - nsAutoString tmp; - Preferences::GetLocalizedString("intl.ellipsis", tmp); - uint32_t len = - std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); - CopyUnicodeTo(tmp, 0, sBuf, len); - } + nsAutoString tmp; + Preferences::GetLocalizedString("intl.ellipsis", tmp); + uint32_t len = + std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); + CopyUnicodeTo(tmp, 0, sBuf, len); if (!sBuf[0]) sBuf[0] = char16_t(0x2026); } return nsDependentString(sBuf); diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 4ea35a42f029..de450090e9db 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1117,7 +1117,6 @@ class nsContentUtils { eMATHML_PROPERTIES, eSECURITY_PROPERTIES, eNECKO_PROPERTIES, - eFORMS_PROPERTIES_en_US, PropertiesFile_COUNT }; static nsresult ReportToConsole( @@ -3421,8 +3420,6 @@ class nsContentUtils { static int32_t sInnerOrOuterWindowCount; static uint32_t sInnerOrOuterWindowSerialCounter; - - static int32_t sSpoofEnglish; }; /* static */ inline nsContentPolicyType

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 1561322 - Allow spoofing strings in HTML forms r=baku, Pike
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit 1ad6ff94d72b99a72ac66459230755502acccd8d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Jul 24 13:22:22 2019 +0000 Bug 1561322 - Allow spoofing strings in HTML forms r=baku,Pike When privacy.spoof_english = 2, we should hide the user's locale in content. So we use en-US default strings for HTML form elements, such as a Submit button. We also force GetLocalizedEllipsis() to always return the ellipsis used by en-US. Differential Revision: https://phabricator.services.mozilla.com/D35815 --HG-- extra : moz-landing-system : lando --- browser/installer/package-manifest.in | 1 + dom/base/nsContentUtils.cpp | 35 ++++++++++++++++++++------ dom/base/nsContentUtils.h | 2 ++ dom/html/HTMLInputElement.cpp | 37 +++++++++++++++------------- dom/locales/moz.build | 4 +++ layout/base/nsCSSFrameConstructor.cpp | 8 +++--- layout/forms/nsFileControlFrame.cpp | 4 +-- layout/forms/nsGfxButtonControlFrame.cpp | 4 +-- layout/generic/DetailsFrame.cpp | 5 ++-- mobile/android/installer/package-manifest.in | 1 + 10 files changed, 67 insertions(+), 34 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index a160f316a56d..1a2a24f9b5b9 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -344,6 +344,7 @@ @RESPATH@/res/fonts/* @RESPATH@/res/dtd/* @RESPATH@/res/language.properties +@RESPATH@/res/locale/layout/HtmlForm.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ #endif diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index ca8ad1d26b26..d7ab544f7274 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3507,7 +3507,7 @@ void nsContentUtils::GetEventArgNames(int32_t aNameSpaceID, nsAtom* aEventName, // Note: The list of content bundles in nsStringBundle.cpp should be updated // whenever entries are added or removed from this list. -static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = { +static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { // Must line up with the enum values in |PropertiesFile| enum. "chrome://global/locale/css.properties", "chrome://global/locale/xbl.properties", @@ -3522,7 +3522,9 @@ static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = { "chrome://global/locale/commonDialogs.properties", "chrome://global/locale/mathml/mathml.properties", "chrome://global/locale/security/security.properties", - "chrome://necko/locale/necko.properties"}; + "chrome://necko/locale/necko.properties", + "chrome://global/locale/layout/HtmlForm.properties", + "resource://gre/res/locale/layout/HtmlForm.properties"}; /* static */ nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) { @@ -3571,10 +3573,22 @@ void nsContentUtils::AsyncPrecreateStringBundles() { } } +static bool SpoofLocaleEnglish() { + // 0 - will prompt + // 1 - don't spoof + // 2 - spoof + return StaticPrefs::privacy_spoof_english() == 2; +} + /* static */ nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile, const char* aKey, nsAString& aResult) { + // When we spoof English, use en-US default strings in HTML forms. + if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { + aFile = eFORMS_PROPERTIES_en_US; + } + nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -3587,6 +3601,11 @@ nsresult nsContentUtils::FormatLocalizedString(PropertiesFile aFile, const char16_t** aParams, uint32_t aParamsLength, nsAString& aResult) { + // When we spoof English, use en-US default strings in HTML forms. + if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { + aFile = eFORMS_PROPERTIES_en_US; + } + nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -5120,11 +5139,13 @@ nsIWidget* nsContentUtils::GetTopLevelWidget(nsIWidget* aWidget) { const nsDependentString nsContentUtils::GetLocalizedEllipsis() { static char16_t sBuf[4] = {0, 0, 0, 0}; if (!sBuf[0]) { - nsAutoString tmp; - Preferences::GetLocalizedString("intl.ellipsis", tmp); - uint32_t len = - std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); - CopyUnicodeTo(tmp, 0, sBuf, len); + if (!SpoofLocaleEnglish()) { + nsAutoString tmp; + Preferences::GetLocalizedString("intl.ellipsis", tmp); + uint32_t len = + std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); + CopyUnicodeTo(tmp, 0, sBuf, len); + } if (!sBuf[0]) sBuf[0] = char16_t(0x2026); } return nsDependentString(sBuf); diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index de450090e9db..67febf189c34 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1117,6 +1117,8 @@ class nsContentUtils { eMATHML_PROPERTIES, eSECURITY_PROPERTIES, eNECKO_PROPERTIES, + eFORMS_PROPERTIES_MAYBESPOOF, + eFORMS_PROPERTIES_en_US, PropertiesFile_COUNT }; static nsresult ReportToConsole( diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index b7360a9ff3e7..dd0365a7646c 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -725,15 +725,15 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) { nsAutoString title; nsAutoString okButtonLabel; if (aType == FILE_PICKER_DIRECTORY) { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DirectoryUpload", title); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "DirectoryUpload", title); - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DirectoryPickerOkButtonLabel", - okButtonLabel); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, + "DirectoryPickerOkButtonLabel", okButtonLabel); } else { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "FileUpload", title); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "FileUpload", title); } nsCOMPtr<nsIFilePicker> filePicker = @@ -2339,22 +2339,25 @@ void HTMLInputElement::GetDisplayFileName(nsAString& aValue) const { if ((IsDirPickerEnabled() && Allowdirs()) || (StaticPrefs::dom_webkitBlink_dirPicker_enabled() && HasAttr(kNameSpaceID_None, nsGkAtoms::webkitdirectory))) { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "NoDirSelected", value); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "NoDirSelected", value); } else if (HasAttr(kNameSpaceID_None, nsGkAtoms::multiple)) { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "NoFilesSelected", value); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "NoFilesSelected", + value); } else { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "NoFileSelected", value); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "NoFileSelected", + value); } } else { nsString count; count.AppendInt(int(mFileData->mFilesOrDirectories.Length())); const char16_t* params[] = {count.get()}; - nsContentUtils::FormatLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "XFilesSelected", params, value); + nsContentUtils::FormatLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "XFilesSelected", params, + value); } aValue = value; @@ -5825,8 +5828,8 @@ HTMLInputElement::SubmitNamesValues(HTMLFormSubmission* aFormSubmission) { !HasAttr(kNameSpaceID_None, nsGkAtoms::value)) { // Get our default value, which is the same as our default label nsAutoString defaultValue; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "Submit", defaultValue); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "Submit", defaultValue); value = defaultValue; } diff --git a/dom/locales/moz.build b/dom/locales/moz.build index 1734739c5426..b2bcd271de7c 100644 --- a/dom/locales/moz.build +++ b/dom/locales/moz.build @@ -59,3 +59,7 @@ with Files("en-US/chrome/plugins.properties"): BUG_COMPONENT = ("Core", "Plug-ins") JAR_MANIFESTS += ['jar.mn'] + +RESOURCE_FILES.locale.layout += [ + 'en-US/chrome/layout/HtmlForm.properties', +] diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 4941b7f9780a..7a5a96d1769a 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -1654,8 +1654,8 @@ already_AddRefed<nsIContent> nsCSSFrameConstructor::CreateGeneratedContent( } nsAutoString temp; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "Submit", temp); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "Submit", temp); return CreateGenConTextNode(aState, temp, nullptr, nullptr); } @@ -7899,8 +7899,8 @@ void nsCSSFrameConstructor::GetAlternateTextFor(Element* aElement, nsAtom* aTag, // If there's no "value" attribute either, then use the localized string for // "Submit" as the alternate text. - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "Submit", aAltText); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "Submit", aAltText); } } diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index 5774f9f9275f..9be30011aa8e 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -215,8 +215,8 @@ static already_AddRefed<Element> MakeAnonButton(Document* aDoc, // Set the file picking button text depending on the current locale. nsAutoString buttonTxt; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - labelKey, buttonTxt); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, labelKey, buttonTxt); // Set the browse button text. It's a bit of a pain to do because we want to // make sure we are not notifying. diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp index a35765a2cb5e..03186ef7bf54 100644 --- a/layout/forms/nsGfxButtonControlFrame.cpp +++ b/layout/forms/nsGfxButtonControlFrame.cpp @@ -88,8 +88,8 @@ nsresult nsGfxButtonControlFrame::GetDefaultLabel(nsAString& aString) const { return NS_OK; } - return nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - prop, aString); + return nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, prop, aString); } nsresult nsGfxButtonControlFrame::GetLabel(nsString& aLabel) { diff --git a/layout/generic/DetailsFrame.cpp b/layout/generic/DetailsFrame.cpp index 9f4e909f3952..e1a9f0c70b2b 100644 --- a/layout/generic/DetailsFrame.cpp +++ b/layout/generic/DetailsFrame.cpp @@ -98,8 +98,9 @@ nsresult DetailsFrame::CreateAnonymousContent( mDefaultSummary = new HTMLSummaryElement(nodeInfo.forget()); nsAutoString defaultSummaryText; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DefaultSummary", defaultSummaryText); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "DefaultSummary", + defaultSummaryText); RefPtr<nsTextNode> description = new nsTextNode(nodeInfoManager); description->SetText(defaultSummaryText, false); mDefaultSummary->AppendChildTo(description, false); diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 816589393562..3d014cbc6e67 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -201,6 +201,7 @@ @BINPATH@/res/grabber.gif @BINPATH@/res/dtd/* @BINPATH@/res/language.properties +@BINPATH@/res/locale/layout/HtmlForm.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS @BINPATH@/res/fonts/*

1 0

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

29 Aug '19

commit f50afc2f723aa87b1f11fbcc156266021b797a99 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 29 10:53:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+mk.po | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/contents+mk.po b/contents+mk.po index bdb6af5ac..e007bf1dd 100644 --- a/contents+mk.po +++ b/contents+mk.po @@ -21,11 +21,11 @@ msgstr "" #: https//support.torproject.org/ (content/contents+en.lrshowcase.title) msgid "How can we help?" -msgstr "" +msgstr "Како можеме да помогнеме?" #: https//support.torproject.org/faq/ (content/faq/contents+en.lrtopic.title) msgid "Most Frequently Asked Questions" -msgstr "" +msgstr "Често поставувани прашања" #: https//support.torproject.org/tbb/ (content/tbb/contents+en.lrtopic.title) msgid "Tor Browser" @@ -49,22 +49,22 @@ msgstr "GetTor" #: https//support.torproject.org/connecting/ #: (content/connecting/contents+en.lrtopic.title) msgid "Connecting To Tor" -msgstr "" +msgstr "Поврзување на Tor" #: https//support.torproject.org/censorship/ #: (content/censorship/contents+en.lrtopic.title) msgid "Censorship" -msgstr "" +msgstr "Цензура" #: https//support.torproject.org/https/ #: (content/https/contents+en.lrtopic.title) msgid "HTTPS" -msgstr "" +msgstr "HTTPS" #: https//support.torproject.org/operators/ #: (content/operators/contents+en.lrtopic.title) msgid "Operators" -msgstr "" +msgstr "Оператори" #: https//support.torproject.org/onionservices/ #: (content/onionservices/contents+en.lrtopic.title) @@ -83,6 +83,8 @@ msgstr "" msgid "" "When I use Tor Browser, will anyone be able to tell which websites I visit?" msgstr "" +"Кога го користам Tor прелистувачот, ќе може ли секој да види кој веб–сајтови" +" ги посетувам?" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.description) @@ -337,7 +339,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For Windows users:" -msgstr "" +msgstr "#### За Windows корисници:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -356,7 +358,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For macOS users:" -msgstr "" +msgstr "#### За macOS корисници:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -375,7 +377,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For GNU/Linux users:" -msgstr "" +msgstr "#### За GNU/Linux корисници:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1120,6 +1122,8 @@ msgid "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " "Browser Update\">" msgstr "" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " +"Browser Update\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1131,7 +1135,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1141,7 +1145,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) @@ -1284,6 +1288,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " +"Circuit for this Site\">" #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.title) @@ -1983,21 +1989,21 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "* Linux" -msgstr "" +msgstr "* Linux" #: https//support.torproject.org/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.description) #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "* macOS (OS X)" -msgstr "" +msgstr "* macOS (OS X)" #: https//support.torproject.org/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.description) #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "* Windows" -msgstr "" +msgstr "* Windows" #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.title) @@ -2461,27 +2467,27 @@ msgstr "" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<div class=\"row\">" -msgstr "" +msgstr "<div class=\"row\">" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<div class=\"col-md-6\">" -msgstr "" +msgstr "<div class=\"col-md-6\">" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<div class=\"card\">" -msgstr "" +msgstr "<div class=\"card\">" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<img class=\"card-img-top\" src=\"/static/images/image2.png\" alt=\"https\">" -msgstr "" +msgstr "<img class=\"card-img-top\" src=\"/static/images/image2.png\" alt=\"https\">" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<div class=\"card-body\">" -msgstr "" +msgstr "<div class=\"card-body\">" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) @@ -2493,12 +2499,12 @@ msgstr "" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "</div>" -msgstr "" +msgstr "</div>" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<img class=\"card-img-top\" src=\"/static/images/image6.png\" alt=\"https\">" -msgstr "" +msgstr "<img class=\"card-img-top\" src=\"/static/images/image6.png\" alt=\"https\">" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description)

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 29 Aug '19

29 Aug '19

commit 72901312d5bcc6f139f038b99b58f41541911fe4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 29 10:52:53 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-mk.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tor-outreach2019-2020-mk.md b/tor-outreach2019-2020-mk.md index 828962bc9..63e6366fe 100644 --- a/tor-outreach2019-2020-mk.md +++ b/tor-outreach2019-2020-mk.md @@ -38,7 +38,7 @@ She also uses a Tor-powered app called **OnionShare** to send files to other act # 3. TOR ЗА ЧОВЕКОВИ ПРАВА -### Water is life +### Водата е живот Jelani lives in a small village which a wide river runs through. @@ -58,9 +58,9 @@ All of this software uses Tor to help protect Jelani’s privacy. --- -# 4. TOR FOR ANTI-CENSORSHIP +# 4. TOR ЗА ПРОТИВ ЦЕНЗУРАТА -### Build bridges not walls +### Градете мостови не ѕидови Jean was traveling for the first time to a country far from his family. @@ -92,7 +92,7 @@ With Tor Browser, Jean can browse freely and privately and contact his family. # 5. Shared Sections -## What is Tor? +## Што е Tor? Tor is free software and an open network that helps protect you from tracking, surveillance, and censorship online. Tor is created for free by a 501(c)3 U.S.-based nonprofit called the Tor Project. @@ -103,7 +103,7 @@ When you use Tor Browser, no one can see what websites you visit or where in the Other applications, like SecureDrop and OnionShare, use Tor to protect their users against surveillance and censorship. -## 6. How does Tor work? +## 6. Како Tor работи? Amal wants to visit Bekele’s website privately, so she opens Tor Browser. @@ -121,13 +121,13 @@ The third relay removes the last encryption layer and forwards the web page requ Bekele doesn't know that the website request came from Amal unless she tells him so. -## 7. Who uses Tor? +## 7. Кој користи Tor? -People all over the world use Tor to protect their privacy and access the web freely. +Луѓе низ целиот свет го користат Tor за да ја заштитат нивната приватност и да пристапат кон вебот слободно Tor helps protect journalists, human rights defenders, domestic violence victims, academic researchers, and anyone experiencing tracking, censorship, or surveillance. -## 6. Why trust Tor? +## 6. Зошто да му веруваш на Tor? Tor is designed for privacy. We don’t know who our users are, and we don't keep logs of user activity. @@ -135,7 +135,7 @@ Tor relay operators cannot reveal the true identity of Tor users. Continual peer review of Tor's source code by academic and open source communities ensures that there are no backdoors in Tor, and our social contract promises that we will never backdoor Tor. -## 7. Join the Tor community +## 7. Приклучи се на Tor заедницата Tor is made possible by a diverse set of users, developers, relay operators, and advocates from around the world. @@ -148,9 +148,9 @@ The Tor community is governed by a code of conduct, and we outline our set of pr Learn more about Tor by visiting our website, our wiki, finding us on IRC, joining one of our mailing lists, or signing up for Tor News at newsletter.torproject.org. -## 8. Download Tor +## 8. Преземи Tor -Tor for Desktop +Tor за Десктоп torproject.org/download TOR ON MOBILE

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 29 Aug '19

29 Aug '19

commit 9aeb94034737c88533fe852354d147826c1cb74e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 29 10:23:14 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-mk.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tor-outreach2019-2020-mk.md b/tor-outreach2019-2020-mk.md index 6c8fce0dc..828962bc9 100644 --- a/tor-outreach2019-2020-mk.md +++ b/tor-outreach2019-2020-mk.md @@ -1,8 +1,8 @@ # Tor Outreach Material 2019-2020 -# 1. TOR FOR PRIVACY +# 1. TOR ЗА ПРИВАТНОСТ -### Privacy is a human right +### Приватноста е човеково право Like many of us, Aleisha spends most of her time online--connecting with friends, posting on social media, and browsing the web. @@ -16,7 +16,7 @@ She goes to a privacy training at a local hackerspace and learns about **Tor Bro --- -# 2.TOR FOR FEMINISTS +# 2.TOR ЗА ФЕМИНИСТИ ### The future is cyberfeminist @@ -36,7 +36,7 @@ She also uses a Tor-powered app called **OnionShare** to send files to other act --- -# 3. TOR FOR HUMAN RIGHTS +# 3. TOR ЗА ЧОВЕКОВИ ПРАВА ### Water is life

1 0