tor-commits September 2019

tor-commits@lists.torproject.org

21 participants
2044 discussions

[tor-browser-build/maint-8.5] Pick up aarch64 pick up
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit c653109cc75bb4bf8f0bf0f4223447533c40db85 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 10:09:09 2019 +0000 Pick up aarch64 pick up --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 26176b2..2a95652 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5.4 project_name: tor-browser

1 0

[tor-browser-build/maint-8.5] Pick up aarch64 properly
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit f986c71a6f78a7ecfe663666abded1c4789df480 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 6 06:52:44 2019 +0000 Pick up aarch64 properly --- projects/release/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/release/config b/projects/release/config index 1623083..0133c3f 100644 --- a/projects/release/config +++ b/projects/release/config @@ -17,6 +17,7 @@ targets: - torbrowser-osx-x86_64 - torbrowser-android-armv7 - torbrowser-android-x86 + - torbrowser-android-aarch64 - torbrowser-src torbrowser-android-armv7: var: @@ -124,6 +125,7 @@ input_files: project: tor-browser enable: '[% c("var/torbrowser-android-aarch64") %]' target: + - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - torbrowser-android-aarch64

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Revert "Load torbutton in browser.xul on Android"
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit af0bfb7134368f2d9a2eb7efeb1d6abcd11b5fdf Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 09:16:02 2019 +0000 Revert "Load torbutton in browser.xul on Android" This reverts commit 805ff051656dc22d11de026e01223352f39e7380. --- mobile/android/chrome/content/browser.js | 4 ---- mobile/android/chrome/content/browser.xul | 1 - 2 files changed, 5 deletions(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 7fcee29f0c3c..f8e9399f51c4 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -243,8 +243,6 @@ var lazilyLoadedBrowserScripts = [ ["CastingApps", "chrome://browser/content/CastingApps.js"], ["RemoteDebugger", "chrome://browser/content/RemoteDebugger.js"], ["gViewSourceUtils", "chrome://global/content/viewSourceUtils.js"], - ["torbuttonUtils", "chrome://torbutton/content/torbutton_utils.js"], - ["torbutton", "chrome://torbutton/content/torbutton.js"], ]; lazilyLoadedBrowserScripts.forEach(function(aScript) { @@ -765,8 +763,6 @@ var BrowserApp = { true ); - torbutton_init(); - // We can't delay registering WebChannel listeners: if the first page is // about:accounts, which can happen when starting the Firefox Account flow // from the first run experience, or via the Firefox Account Status diff --git a/mobile/android/chrome/content/browser.xul b/mobile/android/chrome/content/browser.xul index 71aa04df0ebf..8072a7a1c6e5 100644 --- a/mobile/android/chrome/content/browser.xul +++ b/mobile/android/chrome/content/browser.xul @@ -4,7 +4,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> -<?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> <window id="main-window" onload="BrowserApp.startup();"

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Load torbutton in BrowserApp.startup on Android
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit fe6da38319ca39a62dc8cfffe615ec0335ba3ddf Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Aug 30 10:17:25 2019 -0400 Load torbutton in BrowserApp.startup on Android --- mobile/android/chrome/content/browser.js | 3 +++ mobile/android/chrome/content/browser.xul | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index f8e9399f51c4..dbecd308a3dc 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -763,6 +763,9 @@ var BrowserApp = { true ); + // Torbutton scripts included in browser.xul + torbutton_init(); + // We can't delay registering WebChannel listeners: if the first page is // about:accounts, which can happen when starting the Firefox Account flow // from the first run experience, or via the Firefox Account Status diff --git a/mobile/android/chrome/content/browser.xul b/mobile/android/chrome/content/browser.xul index 8072a7a1c6e5..fab93922a5f6 100644 --- a/mobile/android/chrome/content/browser.xul +++ b/mobile/android/chrome/content/browser.xul @@ -4,6 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> <window id="main-window" onload="BrowserApp.startup();" @@ -11,6 +12,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <script type="application/javascript" src="chrome://browser/content/browser.js"/> + <script type="application/javascript" src="chrome://torbutton/content/torbutton_util.js"/> + <script type="application/javascript" src="chrome://torbutton/content/torbutton.js"/> <deck id="browsers" flex="1"/>

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 30683: Prevent detection of locale via some *.properties
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 43d389c5d6e4450882d47a36bddc6e974c6113d5 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Aug 20 12:58:09 2019 +0200 Bug 30683: Prevent detection of locale via some *.properties Spoofing dom/dom.properties, layout/xmlparser.properties, layout/MediaDocument.properties to en-US if needed. --- browser/installer/package-manifest.in | 3 +++ dom/base/nsContentUtils.cpp | 17 +++++++++++++---- dom/base/nsContentUtils.h | 4 ++++ dom/html/HTMLSelectElement.cpp | 2 +- dom/html/HTMLTextAreaElement.cpp | 6 +++--- dom/html/MediaDocument.cpp | 4 +++- dom/html/MediaDocument.h | 3 +++ dom/html/input/CheckableInputTypes.cpp | 4 ++-- dom/html/input/DateTimeInputTypes.cpp | 6 +++--- dom/html/input/FileInputType.cpp | 2 +- dom/html/input/InputType.cpp | 16 ++++++++-------- dom/html/input/NumericInputTypes.cpp | 8 ++++---- dom/html/input/SingleLineTextInputTypes.cpp | 6 +++--- dom/locales/moz.build | 6 ++++++ mobile/android/installer/package-manifest.in | 3 +++ parser/htmlparser/nsParserMsgUtils.cpp | 6 ++++++ parser/htmlparser/nsParserMsgUtils.h | 3 +++ 17 files changed, 69 insertions(+), 30 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 1a2a24f9b5b9..1825397678d1 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -345,6 +345,9 @@ @RESPATH@/res/dtd/* @RESPATH@/res/language.properties @RESPATH@/res/locale/layout/HtmlForm.properties +@RESPATH@/res/locale/layout/MediaDocument.properties +@RESPATH@/res/locale/layout/xmlparser.properties +@RESPATH@/res/locale/dom/dom.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ #endif diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index d7ab544f7274..2b416828e8c1 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3524,7 +3524,9 @@ static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { "chrome://global/locale/security/security.properties", "chrome://necko/locale/necko.properties", "chrome://global/locale/layout/HtmlForm.properties", - "resource://gre/res/locale/layout/HtmlForm.properties"}; + "resource://gre/res/locale/layout/HtmlForm.properties", + "chrome://global/locale/dom/dom.properties", + "resource://gre/res/locale/dom/dom.properties"}; /* static */ nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) { @@ -3573,7 +3575,8 @@ void nsContentUtils::AsyncPrecreateStringBundles() { } } -static bool SpoofLocaleEnglish() { +/* static */ +bool nsContentUtils::SpoofLocaleEnglish() { // 0 - will prompt // 1 - don't spoof // 2 - spoof @@ -3584,9 +3587,12 @@ static bool SpoofLocaleEnglish() { nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile, const char* aKey, nsAString& aResult) { - // When we spoof English, use en-US default strings in HTML forms. + // When we spoof English, use en-US properties in strings that are accessible + // by content. if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { aFile = eFORMS_PROPERTIES_en_US; + } else if (aFile == eDOM_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { + aFile = eDOM_PROPERTIES_en_US; } nsresult rv = EnsureStringBundle(aFile); @@ -3601,9 +3607,12 @@ 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. + // When we spoof English, use en-US properties in strings that are accessible + // by content. if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { aFile = eFORMS_PROPERTIES_en_US; + } else if (aFile == eDOM_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { + aFile = eDOM_PROPERTIES_en_US; } nsresult rv = EnsureStringBundle(aFile); diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 67febf189c34..9c409099c9af 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1119,6 +1119,8 @@ class nsContentUtils { eNECKO_PROPERTIES, eFORMS_PROPERTIES_MAYBESPOOF, eFORMS_PROPERTIES_en_US, + eDOM_PROPERTIES_MAYBESPOOF, + eDOM_PROPERTIES_en_US, PropertiesFile_COUNT }; static nsresult ReportToConsole( @@ -1132,6 +1134,8 @@ class nsContentUtils { static void LogMessageToConsole(const char* aMsg); + static bool SpoofLocaleEnglish(); + /** * Get the localized string named |aKey| in properties file |aFile|. */ diff --git a/dom/html/HTMLSelectElement.cpp b/dom/html/HTMLSelectElement.cpp index 76f21db23b31..afa01ee224ba 100644 --- a/dom/html/HTMLSelectElement.cpp +++ b/dom/html/HTMLSelectElement.cpp @@ -1539,7 +1539,7 @@ nsresult HTMLSelectElement::GetValidationMessage(nsAString& aValidationMessage, case VALIDITY_STATE_VALUE_MISSING: { nsAutoString message; nsresult rv = nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationSelectMissing", + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationSelectMissing", message); aValidationMessage = message; return rv; diff --git a/dom/html/HTMLTextAreaElement.cpp b/dom/html/HTMLTextAreaElement.cpp index 0d1ba35c8b59..2844267b9bb8 100644 --- a/dom/html/HTMLTextAreaElement.cpp +++ b/dom/html/HTMLTextAreaElement.cpp @@ -1001,7 +1001,7 @@ nsresult HTMLTextAreaElement::GetValidationMessage( const char16_t* params[] = {strMaxLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooLong", params, + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooLong", params, message); aValidationMessage = message; } break; @@ -1017,13 +1017,13 @@ nsresult HTMLTextAreaElement::GetValidationMessage( const char16_t* params[] = {strMinLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooShort", params, + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooShort", params, message); aValidationMessage = message; } break; case VALIDITY_STATE_VALUE_MISSING: { nsAutoString message; - rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, + rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationValueMissing", message); aValidationMessage = message; diff --git a/dom/html/MediaDocument.cpp b/dom/html/MediaDocument.cpp index 196adddc0f38..7ec66b31e63d 100644 --- a/dom/html/MediaDocument.cpp +++ b/dom/html/MediaDocument.cpp @@ -125,7 +125,9 @@ nsresult MediaDocument::Init() { nsCOMPtr<nsIStringBundleService> stringService = mozilla::services::GetStringBundleService(); if (stringService) { - stringService->CreateBundle(NSMEDIADOCUMENT_PROPERTIES_URI, + stringService->CreateBundle(nsContentUtils::SpoofLocaleEnglish() + ? NSMEDIADOCUMENT_PROPERTIES_URI_en_US + : NSMEDIADOCUMENT_PROPERTIES_URI, getter_AddRefs(mStringBundle)); } diff --git a/dom/html/MediaDocument.h b/dom/html/MediaDocument.h index e11fd2ec8551..37e005c7fffa 100644 --- a/dom/html/MediaDocument.h +++ b/dom/html/MediaDocument.h @@ -16,6 +16,9 @@ #define NSMEDIADOCUMENT_PROPERTIES_URI \ "chrome://global/locale/layout/MediaDocument.properties" +#define NSMEDIADOCUMENT_PROPERTIES_URI_en_US \ + "resource://gre/res/locale/layout/MediaDocument.properties" + namespace mozilla { namespace dom { diff --git a/dom/html/input/CheckableInputTypes.cpp b/dom/html/input/CheckableInputTypes.cpp index f55000c766ea..f0306b69cbd0 100644 --- a/dom/html/input/CheckableInputTypes.cpp +++ b/dom/html/input/CheckableInputTypes.cpp @@ -23,7 +23,7 @@ bool CheckboxInputType::IsValueMissing() const { } nsresult CheckboxInputType::GetValueMissingMessage(nsAString& aMessage) { - return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, + return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationCheckboxMissing", aMessage); } @@ -32,5 +32,5 @@ nsresult CheckboxInputType::GetValueMissingMessage(nsAString& aMessage) { nsresult RadioInputType::GetValueMissingMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationRadioMissing", aMessage); + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationRadioMissing", aMessage); } diff --git a/dom/html/input/DateTimeInputTypes.cpp b/dom/html/input/DateTimeInputTypes.cpp index 11dfc9e541b9..0efbe9a9121a 100644 --- a/dom/html/input/DateTimeInputTypes.cpp +++ b/dom/html/input/DateTimeInputTypes.cpp @@ -138,7 +138,7 @@ nsresult DateTimeInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { const char16_t* params[] = {maxStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationDateTimeRangeOverflow", + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationDateTimeRangeOverflow", params, aMessage); } @@ -148,7 +148,7 @@ nsresult DateTimeInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { const char16_t* params[] = {minStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationDateTimeRangeUnderflow", + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationDateTimeRangeUnderflow", params, aMessage); } @@ -194,7 +194,7 @@ nsresult DateInputType::GetBadInputMessage(nsAString& aMessage) { } return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidDate", aMessage); + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidDate", aMessage); } bool DateInputType::ConvertStringToNumber( diff --git a/dom/html/input/FileInputType.cpp b/dom/html/input/FileInputType.cpp index 2536a875b2ca..82a4c2de8659 100644 --- a/dom/html/input/FileInputType.cpp +++ b/dom/html/input/FileInputType.cpp @@ -22,5 +22,5 @@ bool FileInputType::IsValueMissing() const { nsresult FileInputType::GetValueMissingMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationFileMissing", aMessage); + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationFileMissing", aMessage); } diff --git a/dom/html/input/InputType.cpp b/dom/html/input/InputType.cpp index 210daeafad14..f7a28f4c1a3a 100644 --- a/dom/html/input/InputType.cpp +++ b/dom/html/input/InputType.cpp @@ -167,7 +167,7 @@ nsresult InputType::GetValidationMessage( const char16_t* params[] = {strMaxLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooLong", params, + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooLong", params, message); aValidationMessage = message; break; @@ -185,7 +185,7 @@ nsresult InputType::GetValidationMessage( const char16_t* params[] = {strMinLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooShort", params, + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooShort", params, message); aValidationMessage = message; @@ -216,7 +216,7 @@ nsresult InputType::GetValidationMessage( nsAutoString title; mInputElement->GetAttr(kNameSpaceID_None, nsGkAtoms::title, title); if (title.IsEmpty()) { - rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, + rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationPatternMismatch", message); } else { @@ -227,7 +227,7 @@ nsresult InputType::GetValidationMessage( } const char16_t* params[] = {title.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationPatternMismatchWithTitle", params, message); } aValidationMessage = message; @@ -279,12 +279,12 @@ nsresult InputType::GetValidationMessage( if (valueLowStr.Equals(valueHighStr)) { const char16_t* params[] = {valueLowStr.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationStepMismatchOneValue", params, message); } else { const char16_t* params[] = {valueLowStr.get(), valueHighStr.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationStepMismatch", + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationStepMismatch", params, message); } } else { @@ -293,7 +293,7 @@ nsresult InputType::GetValidationMessage( const char16_t* params[] = {valueLowStr.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationStepMismatchOneValue", params, message); } @@ -319,7 +319,7 @@ nsresult InputType::GetValidationMessage( nsresult InputType::GetValueMissingMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationValueMissing", aMessage); + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationValueMissing", aMessage); } nsresult InputType::GetTypeMismatchMessage(nsAString& aMessage) { diff --git a/dom/html/input/NumericInputTypes.cpp b/dom/html/input/NumericInputTypes.cpp index 6332e028c17e..ab0f6f36eb95 100644 --- a/dom/html/input/NumericInputTypes.cpp +++ b/dom/html/input/NumericInputTypes.cpp @@ -73,7 +73,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { const char16_t* params[] = {maxStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationNumberRangeOverflow", params, aMessage); } @@ -90,7 +90,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { const char16_t* params[] = {minStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationNumberRangeUnderflow", params, aMessage); } @@ -150,13 +150,13 @@ bool NumberInputType::HasBadInput() const { } nsresult NumberInputType::GetValueMissingMessage(nsAString& aMessage) { - return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, + return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationBadInputNumber", aMessage); } nsresult NumberInputType::GetBadInputMessage(nsAString& aMessage) { - return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, + return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationBadInputNumber", aMessage); } diff --git a/dom/html/input/SingleLineTextInputTypes.cpp b/dom/html/input/SingleLineTextInputTypes.cpp index 15cbe65a1941..c879276c86da 100644 --- a/dom/html/input/SingleLineTextInputTypes.cpp +++ b/dom/html/input/SingleLineTextInputTypes.cpp @@ -117,7 +117,7 @@ bool URLInputType::HasTypeMismatch() const { nsresult URLInputType::GetTypeMismatchMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidURL", aMessage); + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidURL", aMessage); } /* input type=email */ @@ -155,12 +155,12 @@ bool EmailInputType::HasBadInput() const { nsresult EmailInputType::GetTypeMismatchMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidEmail", aMessage); + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidEmail", aMessage); } nsresult EmailInputType::GetBadInputMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidEmail", aMessage); + nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidEmail", aMessage); } /* static */ diff --git a/dom/locales/moz.build b/dom/locales/moz.build index b2bcd271de7c..51f4b88ccd47 100644 --- a/dom/locales/moz.build +++ b/dom/locales/moz.build @@ -62,4 +62,10 @@ JAR_MANIFESTS += ['jar.mn'] RESOURCE_FILES.locale.layout += [ 'en-US/chrome/layout/HtmlForm.properties', + 'en-US/chrome/layout/MediaDocument.properties', + 'en-US/chrome/layout/xmlparser.properties', +] + +RESOURCE_FILES.locale.dom += [ + 'en-US/chrome/dom/dom.properties', ] diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 2002a894fc51..ae4319214fad 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -203,6 +203,9 @@ @BINPATH@/res/dtd/* @BINPATH@/res/language.properties @BINPATH@/res/locale/layout/HtmlForm.properties +@RESPATH@/res/locale/layout/MediaDocument.properties +@RESPATH@/res/locale/layout/xmlparser.properties +@RESPATH@/res/locale/dom/dom.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS @BINPATH@/res/fonts/* diff --git a/parser/htmlparser/nsParserMsgUtils.cpp b/parser/htmlparser/nsParserMsgUtils.cpp index 3e369893d4f7..47749732839e 100644 --- a/parser/htmlparser/nsParserMsgUtils.cpp +++ b/parser/htmlparser/nsParserMsgUtils.cpp @@ -9,6 +9,7 @@ #include "nsParserMsgUtils.h" #include "nsNetCID.h" #include "mozilla/Services.h" +#include "nsContentUtils.h" static nsresult GetBundle(const char* aPropFileName, nsIStringBundle** aBundle) { @@ -21,6 +22,11 @@ static nsresult GetBundle(const char* aPropFileName, mozilla::services::GetStringBundleService(); if (!stringService) return NS_ERROR_FAILURE; + if (nsContentUtils::SpoofLocaleEnglish() && + strcmp(aPropFileName, XMLPARSER_PROPERTIES) == 0) { + aPropFileName = XMLPARSER_PROPERTIES_en_US; + } + return stringService->CreateBundle(aPropFileName, aBundle); } diff --git a/parser/htmlparser/nsParserMsgUtils.h b/parser/htmlparser/nsParserMsgUtils.h index b4ec4784d65f..3645610385c1 100644 --- a/parser/htmlparser/nsParserMsgUtils.h +++ b/parser/htmlparser/nsParserMsgUtils.h @@ -11,6 +11,9 @@ #define XMLPARSER_PROPERTIES \ "chrome://global/locale/layout/xmlparser.properties" +#define XMLPARSER_PROPERTIES_en_US \ + "resource://gre/res/locale/layout/xmlparser.properties" + class nsParserMsgUtils { nsParserMsgUtils(); // Currently this is not meant to be created, use the // static methods

1 0

[translation/torbirdy] https://gitweb.torproject.org/translation.git/commit/?h=torbirdy
by translation＠torproject.org 02 Sep '19

02 Sep '19

commit dd66559ea563c723d717cb0f97ba87a379760d3a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 2 08:20:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbirdy --- ur/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ur/torbirdy.dtd b/ur/torbirdy.dtd index 5b71bf9b3..1da46fd8f 100644 --- a/ur/torbirdy.dtd +++ b/ur/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra2.key "d"> <!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.testproxy.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.proxy.label "پراکسی"> <!ENTITY torbirdy.prefs.privacy.label "Privacy"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> <!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 02 Sep '19

02 Sep '19

commit 915c88ab98d5daaa709be877058d03b5f56f097a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 2 08:18:27 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv.po b/sv.po index 51fe8f8f1..326e3bc3f 100644 --- a/sv.po +++ b/sv.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Anders Nilsson <anders(a)devode.se>, 2016,2018 +# Anders Nilsson <anders(a)devode.se>, 2016,2018-2019 # Anders Nilsson <anders(a)devode.se>, 2015 # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 # Filip Nyquist <fillerix(a)fillerix.se>, 2015 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-27 16:16+0000\n" -"Last-Translator: Jonatan Nyberg\n" +"PO-Revision-Date: 2019-09-02 07:50+0000\n" +"Last-Translator: Anders Nilsson <anders(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\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 02 Sep '19

02 Sep '19

commit 59ce4b8b6b5c0303141e62ae0e56beee1bd4cc09 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 2 08:17:19 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sv.po | 160 +++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/sv.po b/sv.po index 51fe8f8f1..927b6a85b 100644 --- a/sv.po +++ b/sv.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Anders Nilsson <anders(a)devode.se>, 2016,2018 +# Anders Nilsson <anders(a)devode.se>, 2016,2018-2019 # Anders Nilsson <anders(a)devode.se>, 2015 # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 # Filip Nyquist <fillerix(a)fillerix.se>, 2015 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-27 16:16+0000\n" -"Last-Translator: Jonatan Nyberg\n" +"PO-Revision-Date: 2019-09-02 07:50+0000\n" +"Last-Translator: Anders Nilsson <anders(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -116,38 +116,38 @@ msgstr "_Avsluta" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:386 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687 msgid "Direct (default)" -msgstr "" +msgstr "Direkt (standard)" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:392 msgid "Bridge & Proxy" -msgstr "" +msgstr "Bro & proxy" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:398 msgid "Offline" -msgstr "" +msgstr "Nedkopplad" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:479 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:529 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080 msgid "Unlock" -msgstr "" +msgstr "Lås upp" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:482 msgid "Failed to relock persistent storage." -msgstr "" +msgstr "Misslyckades att låsa bestående lagring." #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:500 msgid "Unlocking…" -msgstr "" +msgstr "Låser upp..." #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:533 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "Kan inte låsa upp krypterad lagring med detta lösenord." #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:595 msgid "Additional Settings" -msgstr "" +msgstr "Ytterligare inställningar" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:603 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367 @@ -158,32 +158,32 @@ msgstr "Avbryt" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:609 msgid "Add" -msgstr "" +msgstr "Lägg till" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:617 msgid "Back" -msgstr "" +msgstr "Tillbaka" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:731 msgid "Shutdown" -msgstr "" +msgstr "Stäng av" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:736 msgid "_Start Tails" -msgstr "" +msgstr "_Starta Tails" #. Translators: please do not translate this string (it is read from #. Gtk translation) #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/language.py:139 msgid "default:LTR" -msgstr "" +msgstr "standard:LTR" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:91 #, python-brace-format msgid "" "live-persist failed with return code {returncode}:\n" "{stderr}" -msgstr "" +msgstr "live-persist misslyckades med felkod {returncode}:\n{stderr}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:124 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:141 @@ -192,7 +192,7 @@ msgid "" "cryptsetup failed with return code {returncode}:\n" "{stdout}\n" "{stderr}" -msgstr "" +msgstr "cryptsetup misslyckades med felkod {returncode}:\n{stdout}\n{stderr}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:158 #, python-brace-format @@ -200,7 +200,7 @@ msgid "" "live-persist failed with return code {returncode}:\n" "{stdout}\n" "{stderr}" -msgstr "" +msgstr "live-persist misslyckades med felkod {returncode}:\n{stdout}\n{stderr}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:172 #, python-brace-format @@ -208,24 +208,24 @@ msgid "" "umount failed with return code {returncode}:\n" "{stdout}\n" "{stderr}" -msgstr "" +msgstr "umount misslyckades med felkod {returncode}:\n{stdout}\n{stderr}" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887 msgid "Administration Password" -msgstr "" +msgstr "Administrationslösenord" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34 msgid "" "Set up an administration password if you need to perform administrative " "tasks. Otherwise, the administration password is disabled for better " "security." -msgstr "" +msgstr "Ange ett administratörslösenord ifall du behöver utföra administrativa uppgifter.\nI annat fall kommer administratörslösenord inaktiveras för bättre säkerhet." #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69 msgid "Enter an administration password" -msgstr "" +msgstr "Ange ett administrationslösenord" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150 @@ -234,34 +234,34 @@ msgstr "Bekräfta" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109 msgid "Confirm your administration password" -msgstr "" +msgstr "Bekräfta ditt administrationslösenord" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129 msgid "Disable" -msgstr "" +msgstr "Inaktivera" #. This string will never be displayed in the 1st version of the greeter. #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899 msgid "Windows Camouflage" -msgstr "" +msgstr "Windows-kamouflage" #. This string will never be displayed in the 1st version of the greeter. #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176 msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " "to avoid attracting suspicion in public places." -msgstr "" +msgstr "Det här alternativet gör att Tails ser ut som Microsoft Windows 10. Detta kan vara användbart för att undvika att väcka misstanke på offentliga platser." #. This string will never be displayed in the 1st version of the greeter. #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198 msgid "Microsoft Windows 10 camouflage" -msgstr "" +msgstr "Microsoft Windows 10-kamouflage" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891 msgid "MAC Address Spoofing" -msgstr "" +msgstr "Fejka MAC-adress" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255 msgid "" @@ -269,25 +269,25 @@ msgid "" "Fi or wired) to the local network. Spoofing MAC addresses is generally safer" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." -msgstr "" +msgstr "Genom att fejka MAC-adresser döljer du serienummer på nätverkskortet (Wi-Fi eller kabel) för lokala nätverk. Det kan hjälpa dig dölja din geografiska position. Men det kan också orsaka anslutningsproblem eller verka misstänksamt." #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298 msgid "Spoof all MAC addresses (default)" -msgstr "" +msgstr "Fejka alla MAC-adresser (standard)" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344 msgid "Don't spoof MAC addresses" -msgstr "" +msgstr "Fejka inte alla MAC-adresser" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." -msgstr "" +msgstr "Du konfigurerar Tor-bryggan och lokala proxyn senare efter anslutning till ett nätverk." #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531 msgid "Welcome to Tails!" -msgstr "" +msgstr "Välkommen till Tails!" #. This string will never be displayed in the 1st version of the greeter. #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546 @@ -296,138 +296,138 @@ msgctxt "" "available settings." msgid "" "To get guided through Tails' settings, click on Take a Tour above" -msgstr "" +msgstr "För att guidas genom Tails inställningar, klicka på Ta en tur ovan" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581 msgid "Language & Region" -msgstr "" +msgstr "Språk & region" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617 msgid "Default Settings" -msgstr "" +msgstr "Standardinställningar" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630 msgid "Save Language & Region Settings" -msgstr "" +msgstr "Spara språk- och regionsinställningar" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691 msgid "_Language" -msgstr "" +msgstr "_Språk" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Tangentbordslayout" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806 msgid "_Formats" -msgstr "" +msgstr "_Format" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863 msgid "_Time Zone" -msgstr "" +msgstr "_Tidszon" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "Krypterad _bestående lagring" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965 msgid "Show Passphrase" -msgstr "" +msgstr "Visa lösenfras" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Konfigurera bestående lagring" #. The label for this placeholder text is not very big, so keep this string #. short. #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Mata in din lösenfras för att låsa upp den bestående lagringen" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111 msgid "Relock Persistent Storage" -msgstr "" +msgstr "Lås bestående lagring igen" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." -msgstr "" +msgstr "Din bestående lagring är upplåst. Starta om Tails för att låsa den igen." #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164 msgid "_Additional Settings" -msgstr "" +msgstr "_Ytterligare inställningar" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204 msgid "Save Additional Settings" -msgstr "" +msgstr "Spara ytterligare inställningar" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262 msgid "Add an additional setting" -msgstr "" +msgstr "Lägg till ytterligare inställning" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895 msgid "Network Configuration" -msgstr "" +msgstr "Nätverkskonfiguration" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." -msgstr "" +msgstr "Om din Internet-anslutning censureras, filtreras eller går via proxy kan du konfigurera en Tor-brygga eller en lokal proxy. För att arbeta helt nedkopplad kan du inaktivera alla nätverk." #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Anslut direkt till Tor-nätverket (standard)." #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421 msgid "Configure a Tor bridge or local proxy" -msgstr "" +msgstr "Konfigurera en Tor-bro eller lokal proxy" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465 msgid "Disable all networking" -msgstr "" +msgstr "Inaktivera alla nätverk" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." -msgstr "" +msgstr "Standardinställningarna är säkra i de flesta situationerna. För att lägga till en anpassad inställning, tryck på \"+\"-knappen nedan." #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559 msgid "_Administration Password" -msgstr "" +msgstr "_Administrationslösenord" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/utils.py:45 msgid "Off (default)" -msgstr "" +msgstr "Av (standard)" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616 msgid "_MAC Address Spoofing" -msgstr "" +msgstr "_Fejka MAC-adress" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/utils.py:43 msgid "On (default)" -msgstr "" +msgstr "På (standard)" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673 msgid "_Network Connection" -msgstr "" +msgstr "_Nätverksanslutning" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731 msgid "_Windows Camouflage" -msgstr "" +msgstr "_Windows-kamouflage" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/utils.py:48 msgid "On" -msgstr "" +msgstr "På" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/utils.py:50 msgid "Off" -msgstr "" +msgstr "Av" #: config/chroot_local-includes/usr/local/bin/keepassxc:15 #, sh-format @@ -439,19 +439,19 @@ msgid "" "${filename}\n" "\n" "Renaming it to keepassx.kdbx would allow KeePassXC to open it automatically in the future." -msgstr "" +msgstr "<big>Vill du byta namn på din KeePassXC-databas?</big>\n\nDu har en KeePassXC-databas i din mapp Persistent:\n\n${filename}\n\nByta namn på den till keepassx.kdbx skulle tillåta KeePassXC att öppna den automatiskt i framtiden." #: config/chroot_local-includes/usr/local/bin/keepassxc:23 msgid "Rename" -msgstr "" +msgstr "Byt namn" #: config/chroot_local-includes/usr/local/bin/keepassxc:24 msgid "Keep current name" -msgstr "" +msgstr "Behåll nuvarande namn" #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21 msgid "su is disabled. Please use sudo instead." -msgstr "" +msgstr "su är inaktiverad. Använd sudo istället." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen" @@ -459,7 +459,7 @@ msgstr "Lås skärmen" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79 msgid "Suspend" -msgstr "" +msgstr "Inaktivera" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83 msgid "Restart" @@ -617,7 +617,7 @@ msgstr "Installationen av dina extra program misslyckades" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:575 msgid "Additional software installed successfully" -msgstr "" +msgstr "Installation av extraprogram lyckades" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:595 msgid "The check for upgrades of your additional software failed" @@ -815,7 +815,7 @@ msgstr "Starta Tor Browser" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:35 msgid "Tor Status" -msgstr "" +msgstr "Tor-status" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:50 msgid "Open Onion Circuits" @@ -900,7 +900,7 @@ msgstr "Kunde inte låsa upp volymen {volume_name}:\n{error_message}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330 msgid "One or more applications are keeping the volume busy." -msgstr "" +msgstr "En eller flera program håller volymen upptagen." #. Translators: Don't translate {volume_name} or {error_message}, #. they are placeholder and will be replaced. @@ -909,11 +909,11 @@ msgstr "" msgid "" "Couldn't lock volume {volume_name}:\n" "{error_message}" -msgstr "" +msgstr "Kunde inte låsa volymen {volume_name}:\n{error_message}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338 msgid "Locking the volume failed" -msgstr "" +msgstr "Låsning av volymen misslyckades" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83 msgid "No file containers added" @@ -972,7 +972,7 @@ msgstr "Det gick inte att lägga till behållare" msgid "" "Could not add file container %s: Timeout while waiting for loop setup.\n" "Please try using the Disks application instead." -msgstr "" +msgstr "Det gick inte att lägga till filbehållaren %s: Tiden löpte ut i väntan på loop-inställning.\nFörsök använda programmet Disks istället." #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209 msgid "Choose File Container" @@ -1051,11 +1051,11 @@ msgstr "Tails dokumentation" #: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:1 msgid "Root Terminal" -msgstr "" +msgstr "Root-terminal" #: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:2 msgid "Opens a terminal as the root user, using gksu to ask for the password" -msgstr "" +msgstr "Öppnar en terminal som root-användare med gksu för att be om lösenordet" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" @@ -1133,7 +1133,7 @@ msgstr "Detta program är inte associerat med eller godkänts av VeraCrypt proje #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29 msgid "_Open" -msgstr "" +msgstr "_Öppna" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38 msgid "Lock this volume" @@ -1141,7 +1141,7 @@ msgstr "Lås denna volym" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52 msgid "_Unlock" -msgstr "" +msgstr "_Lås upp" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61 msgid "Detach this volume"

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Revert "Bug 1574980 - Fix issues with maintenance service install. r=bytesized a=jcristau"
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit d8983a79f8a0e9ae4543c229819cd17ee0e3f78a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 07:22:17 2019 +0000 Revert "Bug 1574980 - Fix issues with maintenance service install. r=bytesized a=jcristau" We don't use the maintenance service and don't want to have parts of it now included in our updater code. This commit fixes bug 31547 for esr68. --- .../components/maintenanceservice/serviceinstall.cpp | 9 +++++++++ toolkit/mozapps/update/common/moz.build | 20 ++++++++++++++------ toolkit/mozapps/update/common/updatehelper.cpp | 9 --------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/toolkit/components/maintenanceservice/serviceinstall.cpp b/toolkit/components/maintenanceservice/serviceinstall.cpp index eb02422fadfe..ae91b1b41b76 100644 --- a/toolkit/components/maintenanceservice/serviceinstall.cpp +++ b/toolkit/components/maintenanceservice/serviceinstall.cpp @@ -246,6 +246,15 @@ BOOL FixServicePath(SC_HANDLE service, LPCWSTR currentServicePath, * @return TRUE if the service was installed/upgraded */ BOOL SvcInstall(SvcInstallAction action) { + mozilla::UniquePtr<wchar_t[]> updateDir; + HRESULT permResult = GetCommonUpdateDirectory( + nullptr, SetPermissionsOf::FilesAndDirsWithBadPerms, updateDir); + if (FAILED(permResult)) { + LOG_WARN( + ("Unable to set the permissions on the update directory ('%S'): %d", + updateDir.get(), permResult)); + } + // Get a handle to the local computer SCM database with full access rights. nsAutoServiceHandle schSCManager( OpenSCManager(nullptr, nullptr, SC_MANAGER_ALL_ACCESS)); diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index 36aae9d6015b..c95f8395e853 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -14,14 +14,17 @@ EXPORTS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += [ - 'certificatecheck.h', 'pathhash.h', - 'registrycertificates.h', 'uachelper.h', 'updatehelper.cpp', 'updatehelper.h', 'updateutils_win.h', ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + EXPORTS += [ + 'certificatecheck.h', + 'registrycertificates.h', + ] Library('updatecommon') @@ -32,21 +35,26 @@ DisableStlWrapping() if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': SOURCES += [ - 'certificatecheck.cpp', 'pathhash.cpp', - 'registrycertificates.cpp', 'uachelper.cpp', 'updatehelper.cpp', 'updateutils_win.cpp', ] OS_LIBS += [ 'advapi32', - 'crypt32', 'ole32', 'rpcrt4', 'shell32', - 'wintrust', ] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + SOURCES += [ + 'certificatecheck.cpp', + 'registrycertificates.cpp', + ] + OS_LIBS += [ + 'crypt32', + 'wintrust', + ] SOURCES += [ '/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp', diff --git a/toolkit/mozapps/update/common/updatehelper.cpp b/toolkit/mozapps/update/common/updatehelper.cpp index df14fafc51e9..d51813527d62 100644 --- a/toolkit/mozapps/update/common/updatehelper.cpp +++ b/toolkit/mozapps/update/common/updatehelper.cpp @@ -12,7 +12,6 @@ # include "mozilla/UniquePtr.h" # include "pathhash.h" # include "shlobj.h" -# include "registrycertificates.h" # include "uachelper.h" # include "updatehelper.h" # include "updateutils_win.h" @@ -123,14 +122,6 @@ BOOL StartServiceUpdate(LPCWSTR installDir) { return FALSE; } - // Check that the copied file's certificate matches the expected name and - // issuer stored in the registry for this installation and that the - // certificate is trusted by the system's certificate store. - if (!DoesBinaryMatchAllowedCertificates(installDir, tmpService)) { - DeleteFileW(tmpService); - return FALSE; - } - // Start the upgrade comparison process STARTUPINFOW si = {0}; si.cb = sizeof(STARTUPINFOW);

1 0

[metrics-lib/master] Fix leaking resource in TorperfResultImpl.java
by karsten＠torproject.org 02 Sep '19

02 Sep '19

commit 114f548674d8586453577f2a16ad6b39b1714118 Author: fava <fava(a)libertymail.net> Date: Thu Aug 29 06:52:16 2019 +0000 Fix leaking resource in TorperfResultImpl.java Fix leaking resource in TorperfResultImpl.java using try-with-resource statement. This fix is related to analysis on metrics-lib using sonarqube Implements part of #30544 Signed-off-by: fava <fava(a)libertymail.net> --- .../descriptor/impl/TorperfResultImpl.java | 45 ++++++++++++---------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index 4eb00ac..83e9491 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -30,28 +30,31 @@ public class TorperfResultImpl extends DescriptorImpl List<Descriptor> parsedDescriptors = new ArrayList<>(); String descriptorString = new String(rawDescriptorBytes, StandardCharsets.UTF_8); - Scanner scanner = new Scanner(descriptorString).useDelimiter("\r?\n"); - String typeAnnotation = ""; - while (scanner.hasNext()) { - String line = scanner.next(); - if (line.startsWith("@type torperf ")) { - String[] parts = line.split(" "); - if (parts.length != 3) { - throw new DescriptorParseException("Illegal line '" + line - + "'."); - } - String version = parts[2]; - if (!version.startsWith("1.")) { - throw new DescriptorParseException("Unsupported version in " - + " line '" + line + "'."); + try (Scanner scanner = + new Scanner(descriptorString).useDelimiter("\r?\n")) { + String typeAnnotation = ""; + while (scanner.hasNext()) { + String line = scanner.next(); + if (line.startsWith("@type torperf ")) { + String[] parts = line.split(" "); + if (parts.length != 3) { + throw new DescriptorParseException("Illegal line '" + line + + "'."); + } + String version = parts[2]; + if (!version.startsWith("1.")) { + throw new DescriptorParseException("Unsupported version in " + + " line '" + line + "'."); + } + typeAnnotation = line + "\n"; + } else { + /* XXX21932 */ + parsedDescriptors.add(new TorperfResultImpl( + (typeAnnotation + line + "\n") + .getBytes(StandardCharsets.UTF_8), + descriptorFile)); + typeAnnotation = ""; } - typeAnnotation = line + "\n"; - } else { - /* XXX21932 */ - parsedDescriptors.add(new TorperfResultImpl( - (typeAnnotation + line + "\n").getBytes(StandardCharsets.UTF_8), - descriptorFile)); - typeAnnotation = ""; } } return parsedDescriptors;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2019