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

[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-… [View More]

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 … [View More]

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/… [View More]

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 … [View More] | 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 [View Less]

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.… [View More]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); [View Less]

1 0

[tor-launcher/master] Release preparations for 0.2.19.3
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 784dbc8bc01ff8cd3d510c6429225d4d5232fb96 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 06:07:30 2019 +0000 Release preparations for 0.2.19.3 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 9df9f31..8989427 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:… [View More]

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 66d86946ca9bb7347f3b64bd6cd2eed51abc7891 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 06:05:56 2019 +0000 Translations update --- src/chrome/locale/de/torlauncher.properties | 2 +- src/chrome/locale/ka/torlauncher.properties | 2 +- src/chrome/locale/mk/network-settings.dtd | 6 +-- src/chrome/locale/mk/torlauncher.properties | 4 +- src/chrome/locale/nb/network-settings.dtd | 2 +- src/chrome/locale/nb/torlauncher.properties | 24 +++++------ src/… [View More]chrome/locale/sr/network-settings.dtd | 18 ++++----- src/chrome/locale/sr/torlauncher.properties | 62 ++++++++++++++--------------- src/chrome/locale/sv/network-settings.dtd | 10 ++--- src/chrome/locale/sv/torlauncher.properties | 14 +++---- 10 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 78f349c..026d24e 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -87,7 +87,7 @@ torlauncher.bootstrapWarning.identity=Nichtübereinstimmung der Identitäten torlauncher.bootstrapWarning.timeout=Verbindungszeitüberschreitung torlauncher.bootstrapWarning.noroute=Kein Pfad zum Rechner torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler -torlauncher.bootstrapWarning.pt_missing=Steckbarer Transport fehlt +torlauncher.bootstrapWarning.pt_missing=Pluggable Transport fehlt torlauncher.nsresult.NS_ERROR_NET_RESET=Die Verbindung zum Server ist verloren gegangen. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Konnte nicht mit dem Server verbinden. diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 271f5b5..c51cdfd 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.connect=დაკავშირება torlauncher.restart_tor=Tor-ის ხელახლა გაშვება torlauncher.quit=დახურვა torlauncher.quit_win=გასვლა -torlauncher.done=შესრულებულია +torlauncher.done=მზადაა torlauncher.forAssistance=დახმარებისთვის დაუკავშირდით %S torlauncher.forAssistance2=დახმარებისთვის ეწვიეთ %S diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 730fc04..b6fcffc 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Кликнете "Поврзи" да се поврзете на Tor."> -<!ENTITY torSettings.configurePrompt "Кликни на "Конфигурирај" да ги конфигурирате мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси."> +<!ENTITY torSettings.connectPrompt "Кликнете на "Поврзи" да се поврзете на Tor."> +<!ENTITY torSettings.configurePrompt "Кликнете на "Конфигурирај" за да ги конфигурирате мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси."> <!ENTITY torSettings.configure "Конфигурирај"> <!ENTITY torSettings.connect "Поврзи"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelpTitle "Помош за мост реле"> <!ENTITY torsettings.bridgeHelp1 "Мостовите се неизлистани релеа кои го прават потешко блокирањето на поврзувањата кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, а meek прави како да е од некој стандарден прелистувач наместо од Tor."> -<!ENTITY torsettings.bridgeHelp2 "Поради тоа колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp2 "Поради тоа колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не сте сигурни кои мостови работат во вашата држава, посетете ја torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави поврзувањето со Тор мрежата.  Ова може да потрае неколку минути."> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 58ea6f3..b370ad7 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -47,8 +47,8 @@ torlauncher.quit=Прекини torlauncher.quit_win=Излез torlauncher.done=Завршено -torlauncher.forAssistance=За асистенција, контактирајте %S -torlauncher.forAssistance2=За помош, посетете %S +torlauncher.forAssistance=За помош, контактирајте не на %S +torlauncher.forAssistance2=За помош, посетете ја %S torlauncher.copiedNLogMessages=Копирањето е завршено. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта. diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 73162db..3d1ef4d 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Etablering av tilkobling">  -<!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleseren"> +<!ENTITY torlauncher.localePicker.title "Tor Nettleser Språk"> <!ENTITY torlauncher.localePicker.prompt "Velg språk">  diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 5b4d92d..db8b132 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor-oppstarteren -torlauncher.tor_exited_during_startup=Tor ble avsluttet under oppstart. Dette kan ha sin årsak i en feil i din torrc-fil, en feil i Tor eller et annet program på din maskin, eller feilaktig maskinvare. Tor-nettleseren vil ikke starte før det bakenforliggende problemet er ordnet og du har startet det på ny. -torlauncher.tor_exited=Tor avsluttet uventet. Dette kan være forårsaket av en feil i Tor, eller et annet program på ditt system, alternativt ødelagt maskinvare. Før omstart av Tor er gjennomført vil du ikke kunne nå noen nettsider. Hvis problemet vedvarer, send en kopi av din Tor-logg til brukerstøtte. +torlauncher.tor_exited_during_startup=Tor ble avsluttet under oppstart. Dette kan ha sin årsak i en feil i din torrc-fil, en feil i Tor eller et annet program på din maskin, eller feilaktig maskinvare. Tor Nettleser vil ikke starte før det bakenforliggende problemet er ordnet og du har startet det på ny. +torlauncher.tor_exited=Tor avsluttet uventet. Dette kan skyldes en feil i Tor i seg selv, et annet program på systemet ditt eller feil maskinvare. Før du starter Tor på nytt, vil ikke Tor Nettleser kunne nå noen nettsteder. Hvis problemet vedvarer, kan du sende en kopi av Tor-loggen til brukerstøtte team. torlauncher.tor_exited2=Omstart av Tor vil ikke lukke fanene dine. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. @@ -38,7 +38,7 @@ torlauncher.contacting_bridgedb=Kontakter BridgeDB. Vennligst vent. torlauncher.captcha_prompt=Løs CAPTCHA-en for å forespørre en bro. torlauncher.bad_captcha_solution=Løsningen er ikke riktig. Vær så snill, prøv på nytt. torlauncher.unable_to_get_bridge=Kunne ikke skaffe en bro fra BridgeDB\n\n%S -torlauncher.no_meek=Denne nettleseren er ikke konfigurert for svak, noe som trengs for å skaffe broer. +torlauncher.no_meek=Denne nettleseren er ikke konfigurert for saktmodig, noe som er nødvendig for å skaffe broer. torlauncher.no_bridges_available=Ingen broer er tilgjengelig på dette tidspunktet. Beklager. torlauncher.connect=Koble til @@ -57,21 +57,21 @@ torlauncher.bootstrapStatus.conn_pt=Kobler til bro torlauncher.bootstrapStatus.conn_done_pt=Koblet til broen torlauncher.bootstrapStatus.conn_proxy=Kobler til proxy torlauncher.bootstrapStatus.conn_done_proxy=Koblet til proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.conn=Kobler til et Tor-relé +torlauncher.bootstrapStatus.conn_done=Koblet til et Tor-relé +torlauncher.bootstrapStatus.handshake=Forhandler med et Tor-relé +torlauncher.bootstrapStatus.handshake_done=Ferdig med å forhandle med et Tor-relé torlauncher.bootstrapStatus.onehop_create=Etablerer en kryptert katalogforbindelse torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus torlauncher.bootstrapStatus.loading_status=Laster nettverkstatus torlauncher.bootstrapStatus.loading_keys=Laster identitetsbekreftende sertifikater torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om rutingsstafettoppsettsinformasjon torlauncher.bootstrapStatus.loading_descriptors=Laster inn rutingsstafettoppsetts-informasjon -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy +torlauncher.bootstrapStatus.enough_dirinfo=Fullført lasting om relé informasjon +torlauncher.bootstrapStatus.ap_conn_pt=Bygger kretser: Kobler til bro +torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kretser: Koblet til bro +torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretser: Kobler til proxy +torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kretser: Koblet til proxy torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index e0d20a9..7dcd5e2 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Подешавања Тор мреже"> <!ENTITY torsettings.wizard.title.default "Повежите се на Тор"> <!ENTITY torsettings.wizard.title.configure "Подешавања Тор мреже"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">  <!ENTITY torlauncher.localePicker.title "Тор језик"> @@ -21,11 +21,11 @@ <!ENTITY torsettings.reconfigTor "Поново Конфигуриши"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Ukloni podešavanja i poveži se"> <!ENTITY torsettings.optional "Опционо"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za povezivanje na internet"> <!ENTITY torsettings.useProxy.type "Врста proxyja:"> <!ENTITY torsettings.useProxy.type.placeholder "изаберите тип проксија"> <!ENTITY torsettings.useProxy.address "Adresa:"> @@ -39,17 +39,17 @@ <!ENTITY torsettings.firewall.checkbox "Овај рачунар пролази кроз firewall који дозвољава само конекције на одређене портове."> <!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:"> <!ENTITY torsettings.useBridges.checkbox "Тор је цензурисан у мојој земљи"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.default "Odaberi ugrađeni most"> +<!ENTITY torsettings.useBridges.default.placeholder "Odaberi most"> +<!ENTITY torsettings.useBridges.bridgeDB "Zahtevaj most od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesi karaktere sa slike"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.captchaSubmit "Predaj"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.copyLog "Kopiraj Tor log u privremenu memoriju"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> <!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index d76ac94..653ec9d 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -26,18 +26,18 @@ torlauncher.error_proxy_addr_missing=Морате навести IP адресу torlauncher.error_proxy_type_missing=Morate izabrati tip proxya. torlauncher.error_bridges_missing=Morate odrediti jedan ili vise mostova torlauncher.error_default_bridges_type_missing=Морате да одаберете тип транспорта за обезбеђене мостове -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Molimo zahtevajte most torlauncher.error_bridge_bad_default_type=Не постоје услови да мостови који имају тип транспорта %S буду доступни. Молимо Вас да прилагодите поставке. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(radi u Kini) +torlauncher.bridge_suffix.meek-azure=(radi u Kini) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.request_a_bridge=Zahtevanje mosta... +torlauncher.request_a_new_bridge=Zahtevanje novog mosta... +torlauncher.contacting_bridgedb=Kontaktiranje BridgeDB. Molimo sačekajte. +torlauncher.captcha_prompt=Rešite CAPTCHA da biste zahtevali most. +torlauncher.bad_captcha_solution=Rešenje nije ispravno. Molimo pokušajte ponovo. +torlauncher.unable_to_get_bridge=Nije moguće nabavljanje mosta od BridgeDB. torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -48,35 +48,35 @@ torlauncher.quit_win=Излаз torlauncher.done=Gotovo torlauncher.forAssistance=За помоћ контактирајте %Ѕ -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Za pomoć poseti %S torlauncher.copiedNLogMessages=Копирање завршено. %S Top лог поруке су спремне да буду налепљене у уређивач текста или у поруку у електронској пошти. torlauncher.bootstrapStatus.starting=Покрећем -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.conn_pt=Povezivanje sa mostom +torlauncher.bootstrapStatus.conn_done_pt=Povezan sa mostom +torlauncher.bootstrapStatus.conn_proxy=Povezivanje sa proxy-jem +torlauncher.bootstrapStatus.conn_done_proxy=Povezan sa proxy-jem +torlauncher.bootstrapStatus.conn=Povezivanje sa Tor relejem +torlauncher.bootstrapStatus.conn_done=Povezan sa Tor relejem +torlauncher.bootstrapStatus.handshake=Pregovaranje sa Tor relejem +torlauncher.bootstrapStatus.handshake_done=Završeno pregovaranje sa Tor relejem torlauncher.bootstrapStatus.onehop_create=Успостављање шифроване везе директоријума torlauncher.bootstrapStatus.requesting_status=Преузимање мрежног статуса torlauncher.bootstrapStatus.loading_status=Учитавање мрежног статуса torlauncher.bootstrapStatus.loading_keys=Преузимање сертификата ауторитета torlauncher.bootstrapStatus.requesting_descriptors=Захтев за пренос информације torlauncher.bootstrapStatus.loading_descriptors=Учитавање преноса информације -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.enough_dirinfo=Završeno učitavenje informacija o releju +torlauncher.bootstrapStatus.ap_conn_pt=Građenje kola: Povezivanje sa mostom +torlauncher.bootstrapStatus.ap_conn_done_pt=Građenje kola: Povezan sa mostom +torlauncher.bootstrapStatus.ap_conn_proxy=Građenje kola: Povezivanje sa proxy-jem +torlauncher.bootstrapStatus.ap_conn_done_proxy=Građenje kola: Povezan sa proxy-jem +torlauncher.bootstrapStatus.ap_conn=Građenje kola: Povezivanje sa Tor relejem +torlauncher.bootstrapStatus.ap_conn_done=Građenje kola: Povezans a Tor relejem +torlauncher.bootstrapStatus.ap_handshake=Građenje kola: Pregovaranje sa Tor relejem +torlauncher.bootstrapStatus.ap_handshake_done=Građenje kola: Završeno pregovaranje sa Tor relejem +torlauncher.bootstrapStatus.circuit_create=Građenje kola: Uspostavljanje Tor kola torlauncher.bootstrapStatus.done=Повезан са Тор мрежом! torlauncher.bootstrapWarning.done=ради @@ -89,6 +89,6 @@ torlauncher.bootstrapWarning.noroute=нема путање до сервера torlauncher.bootstrapWarning.ioerror=грешка при писању/читању torlauncher.bootstrapWarning.pt_missing=Недостаје прикључујући транспорт -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Veza sa serverom je izgubljena. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Neuspešno povezivanje sa serverom. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Neuspešno povezivanje sa proxy-jem. diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 3cd528b..95a0720 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -23,11 +23,11 @@ <!ENTITY torsettings.discardSettings.prompt "Du har konfigurerat Tor-broar eller så har du angett lokala proxyinställningar.  För att göra en direktanslutning till Tor-nätverket måste de här inställningarna tas bort."> <!ENTITY torsettings.discardSettings.proceed "Ta bort inställningar och anslut"> -<!ENTITY torsettings.optional "Valfri"> +<!ENTITY torsettings.optional "Valfritt"> <!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet"> -<!ENTITY torsettings.useProxy.type "Typ av proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "Välj en proxy typ"> +<!ENTITY torsettings.useProxy.type "Proxytyp:"> +<!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp"> <!ENTITY torsettings.useProxy.address "Adress:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -52,11 +52,11 @@ <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> <!ENTITY torsettings.proxyHelpTitle "Proxy hjälp"> -<!ENTITY torsettings.proxyHelp1 "En lokal proxy kan behövas när du ansluter via ett företag, skola eller universitetsnätverk. Om du inte är säker på om en proxy behövs, titta på internetinställningarna i en annan webbläsare eller kontrollera systemets nätverksinställningar."> +<!ENTITY torsettings.proxyHelp1 "En lokal proxy kan behövas när du ansluter via ett företags-, skol- eller universitetsnätverk. Om du inte är säker på om en proxy behövs, titta på internetinställningarna i en annan webbläsare eller kontrollera systemets nätverksinställningar."> <!ENTITY torsettings.bridgeHelpTitle "Hjälp om relä-broar"> <!ENTITY torsettings.bridgeHelp1 "Broar är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av bro använder sig av olika metoder för att undvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor."> <!ENTITY torsettings.bridgeHelp2 "I och med att vissa länder försöker blockera Tor fungerar inte alla broar i alla länder.   Ifall du är osäker på vilka broar som fungerar i ditt land besök torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Var god och vänta medans vi etablerar en anslutning till Tor nätverket.   Detta kan ta upp till flera minuter."> +<!ENTITY torprogress.pleaseWait "Var god och vänta medan vi etablerar en anslutning till Tor-nätverket.   Detta kan ta upp till flera minuter."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index a83d888..4f84ece 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -6,7 +6,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, ett fel i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har åtgärdat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta. torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina flikar i webbläsaren. -torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. +torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tor-kontrollport. torlauncher.tor_failed_to_start=Det gick inte att starta Tor. torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor. torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en anslutning till Tor-nätverket. @@ -15,22 +15,22 @@ torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas. -torlauncher.datadir_missing=Tor datakatalog finns inte och kunde inte skapas. -torlauncher.password_hash_missing=Misslyckades med att hämta hashat lösenord. +torlauncher.datadir_missing=Tor-datakatalog finns inte och kunde inte skapas. +torlauncher.password_hash_missing=Det gick inte att få hashat lösenord. torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S torlauncher.failed_to_save_settings=Kunde inte spara inställningar för Tor.\n\n%S torlauncher.ensure_tor_is_running=Försäkra dig om att Tor är startad. torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller värdnamn, samt ett port-nummer för att konfigurera Tor till att använda en proxy för att nå Internet. -torlauncher.error_proxy_type_missing=Du måste välja typ av proxy. +torlauncher.error_proxy_type_missing=Du måste välja proxytyp. torlauncher.error_bridges_missing=Du måste ange en eller flera broar. torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade broarna. torlauncher.error_bridgedb_bridges_missing=Vänligen begär en bro. torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade broar för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. -torlauncher.bridge_suffix.meek-amazon=(Fungerar i Kina) -torlauncher.bridge_suffix.meek-azure=(Fungerar i Kina) +torlauncher.bridge_suffix.meek-amazon=(fungerar i Kina) +torlauncher.bridge_suffix.meek-azure=(fungerar i Kina) torlauncher.request_a_bridge=Begär en bro... torlauncher.request_a_new_bridge=Begär en ny bro... @@ -61,7 +61,7 @@ torlauncher.bootstrapStatus.conn=Ansluter till en Tor-relä torlauncher.bootstrapStatus.conn_done=Ansluten till en Tor-relä torlauncher.bootstrapStatus.handshake=Förhandlar med en Tor-relä torlauncher.bootstrapStatus.handshake_done=Avslutade förhandlingarna med en Tor-relä -torlauncher.bootstrapStatus.onehop_create=Skapar en krypterad kataloganslutning +torlauncher.bootstrapStatus.onehop_create=Upprättar en krypterad kataloganslutning torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatus torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat [View Less]

1 0

[tor-browser-build/master] Bug 30460: Update TOPL Project to Use Android Toolchain (Firefox 68)
by gk＠torproject.org 01 Sep '19

01 Sep '19

commit eb5032bf34f73aaa207ad73ce70d7505921713ee Author: sisbell <shane.isbell(a)gmail.com> Date: Wed Jul 17 02:19:40 2019 -0700 Bug 30460: Update TOPL Project to Use Android Toolchain (Firefox 68) Update TOPL version --- projects/tor-onion-proxy-library/30284.patch | 22 - .../add_socks_port_flags.patch | 14 - projects/tor-onion-proxy-library/build | 7 +- projects/tor-onion-proxy-library/config | 10 +- .../gradle-… [View More]

1 0

[tor-browser-build/master] Bug 30665: Get Firefox 68 ESR Working with latest android toolchain
by gk＠torproject.org 01 Sep '19

01 Sep '19

commit 2d3e92fc4f3e7961a469d5f0a50ebc9b067c08cc Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Aug 26 10:28:35 2019 -0700 Bug 30665: Get Firefox 68 ESR Working with latest android toolchain Bug 31389: Update Android Firefox to Build with Clang --- projects/firefox/android-dependencies.patch | 30 - projects/firefox/android-packages.patch | 10 + projects/firefox/android-remove-emulator.patch | 23 + projects/firefox/build | 23 +-… [View More]

1 0