0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 13:43:04 -05:00

Merge branch 'main' into main

This commit is contained in:
Awqre 2024-11-09 11:16:28 +00:00
commit e7475bff60
16 changed files with 170 additions and 41 deletions

View file

@ -128,7 +128,7 @@
"tags": "ads",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"adguard-mobile": {
"content": "filters",
@ -139,7 +139,7 @@
"ua": "mobile",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"easylist": {
"content": "filters",
@ -165,7 +165,7 @@
"tags": "privacy",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/17.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"adguard-spyware": {
"content": "filters",
@ -174,7 +174,7 @@
"title": "AdGuard Tracking Protection",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"block-lan": {
"content": "filters",
@ -245,7 +245,7 @@
"tags": "annoyances cookies",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/18.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"ublock-cookies-adguard": {
"content": "filters",
@ -314,7 +314,7 @@
"tags": "annoyances social",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"fanboy-social": {
"content": "filters",
@ -357,7 +357,7 @@
"tags": "annoyances",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/19.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"adguard-mobile-app-banners": {
"content": "filters",
@ -368,7 +368,7 @@
"tags": "annoyances mobile",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/20.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"adguard-other-annoyances": {
"content": "filters",
@ -379,7 +379,7 @@
"tags": "annoyances",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/21.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"adguard-widgets": {
"content": "filters",
@ -390,7 +390,7 @@
"tags": "annoyances",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/22.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"easylist-annoyances": {
"content": "filters",
@ -611,9 +611,13 @@
"group": "regions",
"off": true,
"title": "🇭🇷hr 🇷🇸rs: Dandelion Sprout's Serbo-Croatian filters",
"tags": "ads croatian serbian",
"lang": "hr sr",
"contentURL": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/SerboCroatianList.txt",
"tags": "ads croatian serbian bosnian",
"lang": "bs hr sr",
"contentURL": [
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/SerboCroatianList.txt",
"https://cdn.jsdelivr.net/gh/DandelionSprout/adfilt@master/SerboCroatianList.txt",
"https://cdn.statically.io/gl/DandelionSprout/adfilt/master/SerboCroatianList.txt"
],
"supportURL": "https://github.com/DandelionSprout/adfilt#readme"
},
"HUN-0": {
@ -702,7 +706,7 @@
"lang": "ja",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"KOR-1": {
"content": "filters",
@ -757,7 +761,7 @@
"lang": "af fy nl",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/8.txt",
"cdnURLs": null,
"supportURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"supportURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"NOR-0": {
"content": "filters",
@ -767,9 +771,7 @@
"tags": "ads norwegian danish icelandic",
"lang": "nb nn no da is",
"contentURL": [
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt"
],
"cdnURLs": [
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt",
"https://cdn.jsdelivr.net/gh/DandelionSprout/adfilt@master/NorwegianList.txt",
"https://cdn.statically.io/gl/DandelionSprout/adfilt/master/NorwegianList.txt"
],
@ -845,7 +847,7 @@
"lang": "an ast ca cak es eu gl gn trs pt quz",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"SVN-0": {
"content": "filters",
@ -890,7 +892,7 @@
"lang": "tr",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
},
"VIE-1": {
"content": "filters",

View file

View file

View file

@ -0,0 +1 @@
identity-allow-site-data = LibreWolf: 常にクッキーとデータをこのサイトに保存する

View file

@ -0,0 +1,64 @@
librewolf-header = LibreWolf の設定
librewolf-warning-title = 注意!
librewolf-general-heading = ブラウザーの動作
librewolf-extension-update-checkbox =
.label = アドオンを自動的にアップデート
librewolf-sync-checkbox =
.label = Firefox Sync を有効にする
librewolf-autocopy-checkbox =
.label = 中クリックでペーストを有効にする
librewolf-styling-checkbox =
.label = userChrome.css のカスタマイズを許可する
librewolf-network-heading = ネットワーク
librewolf-ipv6-checkbox =
.label = IPv6 を有効にする
librewolf-privacy-heading = プライバシー
librewolf-xorigin-ref-checkbox =
.label = クロスオリジンリファラを制限する
librewolf-webgl-checkbox =
.label = WebGL を有効にする
librewolf-rfp-checkbox =
.label = ResistFingerprinting を有効にする
librewolf-auto-decline-canvas-checkbox =
.label = Canvas アクセスリクエストをサイレントにブロックする
librewolf-letterboxing-checkbox =
.label = Letterboxing を有効にする
librewolf-security-heading = セキュリティ
librewolf-goog-safe-download-checkbox =
.label = ダウンロードをスキャンする
librewolf-broken-heading = フィンガープリント採取
librewolf-goog-safe-checkbox =
.label = Google セーフブラウジングを有効にする
librewolf-extension-update-warning1 = アップデートごとに拡張機能のコードを確認しないのであれば、このオプションを有効にすべきです。
librewolf-ipv6-description = { -brand-short-name } が IPv6 を使用して接続することを許可します。
librewolf-ipv6-warning1 = ブラウザーで IPv6 をブロックする代わりに、OS の IPv6 プライバシー機能を有効にすることを推奨します。
librewolf-ocsp-description = OCSP チェックが行えない場合のウェブサイトへの接続を防止します。
librewolf-ocsp-warning1 = これにより、セキュリティーは向上しますが、OCSP サーバーがダウンした際に不具合を引き起こす可能性があります。
librewolf-sync-description = 他のブラウザーとデータを同期します。再起動が必要です。
librewolf-sync-warning1 = Firefox Sync はサーバーにデータを送信する前にローカルでデータを暗号化します。
librewolf-autocopy-description = コピーするテキストを選択し、中クリックでペーストします。
librewolf-styling-description = 手動でロードされたテーマで UI をカスタマイズしたい場合は、これを有効にして下さい。
librewolf-styling-warning1 = テーマの提供元が信頼できることを確認して下さい。
librewolf-xorigin-ref-description = 同一オリジンにのみリファラを送信します。
librewolf-xorigin-ref-warning1 = これにより不具合を引き起こす可能性があります。さらに、送信されたリファラであってもトリミングされます。
librewolf-webgl-description = WebGL は強力なフィンガープリントベクターです。
librewolf-webgl-warning1 = 有効にする必要がある場合、Canvas Blocker などの拡張機能の使用を検討して下さい。
librewolf-rfp-warning1 = 無効にする必要がある場合、Canvas Blocker などの拡張機能の使用を検討して下さい。
librewolf-auto-decline-canvas-description = ユーザーの確認なしで、自動的にウェブサイトへの Canvas アクセスを拒否します。
librewolf-auto-decline-canvas-warning1 = URL バーからアクセスを許可することは可能です。
librewolf-goog-safe-description = マルウェアやフィッシング詐欺が心配な場合、有効にすることを検討して下さい。
pane-librewolf-title = LibreWolf
category-librewolf =
.tooltiptext = about:config の設定が合理的にグループ化され、簡単にアクセスできます
librewolf-ocsp-checkbox =
.label = OCSP hard-fail を強制する
librewolf-extension-update-description = 手動の操作なしで拡張機能の最新の状態を保ちます。セキュリティのために良い選択です。
librewolf-rfp-description = ResistFingerprinting は、最高級のフィンガープリント採取対策ツールです。
librewolf-warning-description = 私たちは、プライバシーとセキュリティーを重視してデフォルト設定を厳選しています。これらの設定を変更する場合は、設定の説明を読んで、変更による影響を確認して下さい。
librewolf-letterboxing-description = Letterboxing は、制限された丸めた解像度を返すために、ウィンドウの周りに余白を追加します。
librewolf-goog-safe-warning1 = 検閲の懸念があるため無効にされていますが、初心者のユーザーにはおすすめです。チェックはすべてローカルで行われます。
librewolf-goog-safe-download-description = セーフブラウジングを有効にすることで、ダウンロードをスキャンして疑わしいファイルを識別できます。
librewolf-goog-safe-download-warning1 = チェックはすべてローカルで行われます。
librewolf-footer = 関連リンク
librewolf-config-link = 詳細な設定 (about:config)
librewolf-open-profile = ユーザープロファイルのディレクトリを開く

View file

@ -0,0 +1,6 @@
translations-panel-disable-translations =
.label = 翻訳機能を完全に無効にする
translations-manage-enable =
.label = 全ページの翻訳を有効にする
translations-manage-autopopup =
.label = ブラウザーで設定されていない言語のページも翻訳するか確認する

View file

@ -0,0 +1,7 @@
-screenshots-brand-name = スクリーンショット
-translations-brand-name = 翻訳
-firefox-suggest-brand-name = 提案
-firefox-home-brand-name = ホームページ
-firefoxview-brand-name = タブビュー
-firefoxlabs-brand-name = 実験的な機能
-profiler-brand-name = プロファイラ

View file

@ -0,0 +1 @@
identity-allow-site-data = LibreWolf: Zawsze przechowuj pliki cookies i dane tej strony

View file

@ -0,0 +1,22 @@
pane-librewolf-title = LibreWolf
librewolf-network-heading = Sieć
librewolf-privacy-heading = Prywatność
librewolf-header = Ustawienia LibreWolf
librewolf-warning-title = Uwaga!
librewolf-general-heading = Zachowanie przeglądarki
librewolf-ipv6-checkbox =
.label = Włącz IPv6
librewolf-webgl-checkbox =
.label = Włącz WebGL
librewolf-rfp-checkbox =
.label = Włącz opcję ResistFingerprinting
librewolf-extension-update-checkbox =
.label = Automatycznie aktualizuj rozszerzenia
librewolf-sync-checkbox =
.label = Włącz Firefox Sync
librewolf-footer = Przydatne linki
librewolf-goog-safe-download-checkbox =
.label = Skanuj pobrane pliki
librewolf-config-link = Wszystkie zaawansowane ustawienia (about:confg)
librewolf-open-profile = Otwórz katalog profilu użytkownika
librewolf-security-heading = Bezpieczeństwo

View file

@ -0,0 +1,6 @@
translations-panel-disable-translations =
.label = Całkowicie wyłącz tłumaczenie
translations-manage-enable =
.label = Włącz tłumaczenie całych stron
translations-manage-autopopup =
.label = Pytaj o tłumaczenie dla stron, które nie są w językach skonfigurowanych w przeglądarce

View file

@ -0,0 +1,7 @@
-screenshots-brand-name = Zrzuty ekranu
-translations-brand-name = Tłumaczenia
-firefox-suggest-brand-name = Sugestie
-firefox-home-brand-name = Strona startowa
-firefoxview-brand-name = Widok kart
-firefoxlabs-brand-name = Funkcje eksperymentalne
-profiler-brand-name = Profilowanie

View file

@ -1,6 +1,8 @@
diff --git a/toolkit/components/remote/nsDBusRemoteClient.cpp b/toolkit/components/remote/nsDBusRemoteClient.cpp
index aad9d7054af8..a926d8b6abdc 100644
--- a/toolkit/components/remote/nsDBusRemoteClient.cpp
+++ b/toolkit/components/remote/nsDBusRemoteClient.cpp
@@ -73,7 +73,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram,
@@ -76,7 +76,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram,
mozilla::XREAppData::SanitizeNameForDBus(profileName);
aDestinationName =
@ -9,7 +11,7 @@
if (aDestinationName.Length() > DBUS_MAXIMUM_NAME_LENGTH)
aDestinationName.Truncate(DBUS_MAXIMUM_NAME_LENGTH);
@@ -87,7 +87,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram,
@@ -90,7 +90,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram,
if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) {
// We don't have a valid busName yet - try to create a default one.
aDestinationName =
@ -18,7 +20,7 @@
if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) {
// We failed completelly to get a valid bus name - just quit
// to prevent crash at dbus_bus_request_name().
@@ -115,7 +115,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProgram,
@@ -117,7 +117,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProfile,
}
nsAutoCString pathName;
@ -27,7 +29,7 @@
static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym(
RTLD_DEFAULT, "dbus_validate_path");
@@ -126,7 +126,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProgram,
@@ -128,7 +128,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProfile,
}
nsAutoCString remoteInterfaceName;
@ -36,9 +38,11 @@
LOG(" DBus destination: %s\n", destinationName.get());
LOG(" DBus path: %s\n", pathName.get());
diff --git a/toolkit/components/remote/nsDBusRemoteServer.cpp b/toolkit/components/remote/nsDBusRemoteServer.cpp
index 4afb8381d0bc..bd927334b817 100644
--- a/toolkit/components/remote/nsDBusRemoteServer.cpp
+++ b/toolkit/components/remote/nsDBusRemoteServer.cpp
@@ -28,7 +28,7 @@ static const char* introspect_template =
@@ -29,7 +29,7 @@ static const char* introspect_template =
"1.0//EN\"\n"
"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
"<node>\n"
@ -47,16 +51,16 @@
" <method name=\"OpenURL\">\n"
" <arg name=\"url\" direction=\"in\" type=\"ay\"/>\n"
" </method>\n"
@@ -38,7 +38,7 @@ static const char* introspect_template =
@@ -39,7 +39,7 @@ static const char* introspect_template =
bool nsDBusRemoteServer::HandleOpenURL(const gchar* aInterfaceName,
const gchar* aMethodName,
const gchar* aParam) {
Span<const gchar> aParam) {
- nsPrintfCString ourInterfaceName("org.mozilla.%s", mAppName.get());
+ nsPrintfCString ourInterfaceName("io.gitlab.%s", mAppName.get());
if ((strcmp("OpenURL", aMethodName) != 0) ||
(strcmp(ourInterfaceName.get(), aInterfaceName) != 0)) {
@@ -129,7 +129,7 @@ static const GDBusInterfaceVTable gInterfaceVTable = {
@@ -132,7 +132,7 @@ static const GDBusInterfaceVTable gInterfaceVTable = {
HandleMethodCall, HandleGetProperty, HandleSetProperty};
void nsDBusRemoteServer::OnBusAcquired(GDBusConnection* aConnection) {
@ -65,7 +69,7 @@
static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym(
RTLD_DEFAULT, "dbus_validate_path");
if (!sDBusValidatePathName ||
@@ -202,8 +202,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
@@ -206,8 +206,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
mozilla::XREAppData::SanitizeNameForDBus(profileName);
@ -75,7 +79,7 @@
if (busName.Length() > DBUS_MAXIMUM_NAME_LENGTH) {
busName.Truncate(DBUS_MAXIMUM_NAME_LENGTH);
}
@@ -217,7 +216,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
@@ -221,7 +220,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
// We don't have a valid busName yet - try to create a default one.
if (!sDBusValidateBusName(busName.get(), nullptr)) {

View file

@ -1,8 +1,18 @@
diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 4efbba2..5445b03 100644
index d0ba6ac670f4..a7dc8393e9de 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -414,6 +414,33 @@ var gIdentityHandler = {
@@ -204,6 +204,9 @@ var gIdentityHandler = {
"identity-popup-clear-sitedata-button": event => {
this.clearSiteData(event);
},
+ "identity-popup-allow-sitedata-button": () => {
+ this.toggleSiteData();
+ },
"identity-popup-remove-cert-exception": () => {
this.removeCertException();
},
@@ -457,6 +460,33 @@ var gIdentityHandler = {
event.stopPropagation();
},
@ -36,7 +46,7 @@ index 4efbba2..5445b03 100644
/**
* Handler for mouseclicks on the "More Information" button in the
* "identity-popup" panel.
@@ -1151,6 +1178,8 @@ var gIdentityHandler = {
@@ -1217,6 +1247,8 @@ var gIdentityHandler = {
this._identityPopupContentOwner.textContent = owner;
this._identityPopupContentSupp.textContent = supplemental;
this._identityPopupContentVerif.textContent = verifier;
@ -46,16 +56,15 @@ index 4efbba2..5445b03 100644
setURI(uri) {
diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
index 8bc64fa..4a4a1af 100644
index 768768c7d448..08602d9460c6 100644
--- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
+++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
@@ -96,6 +96,12 @@
@@ -98,6 +98,11 @@
<toolbarbutton id="identity-popup-clear-sitedata-button"
data-l10n-id="identity-clear-site-data"
class="subviewbutton"
oncommand="gIdentityHandler.clearSiteData(event);"/>
class="subviewbutton"/>
+ <toolbarbutton id="identity-popup-allow-sitedata-button"
+ class="subviewbutton"
+ oncommand="gIdentityHandler.toggleSiteData();">
+ class="subviewbutton">
+ <label data-l10n-id="identity-allow-site-data" flex="1"></label>
+ <html:moz-toggle id="identity-popup-allow-sitedata-toggle" style="pointer-events: none;"></html:moz-toggle>
+ </toolbarbutton>

@ -1 +1 @@
Subproject commit 575d6a19d18113c9eaecd2fc770e42ad05adf362
Subproject commit 7bb122726f8442df59998295836c46043264a09a

View file

@ -1 +1 @@
131.0.3
132.0.1