Skip to content

Commit 5820a81

Browse files
pes10kpes10k
authored
Merge pull request gorhill#38 from gorhill/master
Re-sync with uBo master
2 parents 56a7bc5 + def2013 commit 5820a81

16 files changed

Lines changed: 150 additions & 108 deletions

File tree

‎assets/assets.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,23 @@
156156
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
157157
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
158158
},
159+
"adguard-spyware-url": {
160+
"content": "filters",
161+
"group": "privacy",
162+
"off": true,
163+
"title": "AdGuard URL Tracking Protection",
164+
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/17.txt",
165+
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
166+
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
167+
},
168+
"block-lan": {
169+
"content": "filters",
170+
"group": "privacy",
171+
"off": true,
172+
"title": "Block access to LAN",
173+
"contentURL": "https://raw.githubusercontent.com/gwarser/filter-lists/master/lan-block.txt",
174+
"supportURL": "https://github.com/gwarser/filter-lists"
175+
},
159176
"easyprivacy": {
160177
"content": "filters",
161178
"group": "privacy",

‎assets/resources/scriptlets.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@
731731
}
732732
}
733733
if ( skip ) { return; }
734-
timer = self.requestIdleCallback(rmattr, { timeout: 67 });
734+
timer = self.requestIdleCallback(rmattr, { timeout: 17 });
735735
};
736736
const start = ( ) => {
737737
rmattr();
@@ -746,10 +746,10 @@
746746
};
747747
if ( document.readyState !== 'complete' && /\bcomplete\b/.test(behavior) ) {
748748
self.addEventListener('load', start, { once: true });
749-
} else if ( document.readyState === 'loading' ) {
750-
self.addEventListener('DOMContentLoaded', start, { once: true });
751-
} else {
749+
} else if ( document.readyState !== 'loading' || /\basap\b/.test(behavior) ) {
752750
start();
751+
} else {
752+
self.addEventListener('DOMContentLoaded', start, { once: true });
753753
}
754754
})();
755755

‎dist/firefox/updates.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"uBlock0@raymondhill.net": {
44
"updates": [
55
{
6-
"version": "1.35.3.105",
6+
"version": "1.36.3.0",
77
"browser_specific_settings": { "gecko": { "strict_min_version": "57" } },
8-
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.35.3rc5/uBlock0_1.35.3rc5.firefox.signed.xpi"
8+
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.36.3b0/uBlock0_1.36.3b0.firefox.signed.xpi"
99
}
1010
]
1111
}

‎dist/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.36.0
1+
1.36.3.0

‎src/_locales/bn/messages.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
"description": "extension name."
55
},
66
"extShortDesc": {
7-
"message": "অবশেষে, একটি দক্ষ বিজ্ঞাপন রোধক। সিপিইউ এবং মেমরি সহায়ক।",
7+
"message": "অবশেষে, একটি সাশ্রয়ী বিজ্ঞাপন রোধক। সিপিইউ এবং মেমরিতে নমনীয়।",
88
"description": "this will be in the Chrome web store: must be 132 characters or less"
99
},
1010
"dashboardName": {
11-
"message": "ইউব্লক₀ — ড্যাশবোর্ড",
11+
"message": "uBlock₀ — ড্যাশবোর্ড",
1212
"description": "English: uBlock₀ — Dashboard"
1313
},
1414
"dashboardUnsavedWarning": {
15-
"message": "সতর্ক হন! আপনার পরিবর্তনগুলো সংরক্ষণ করা হয়নি।",
15+
"message": "সতর্কীকরণ! আপনার পরিবর্তনগুলো সংরক্ষণ করা হয়নি।",
1616
"description": "A warning in the dashboard when navigating away from unsaved changes"
1717
},
1818
"dashboardUnsavedWarningStay": {
19-
"message": "অবস্থান করে পরিবর্তন বা সংরক্ষণ করুন।",
19+
"message": "থাকুন",
2020
"description": "Label for button to prevent navigating away from unsaved changes"
2121
},
2222
"dashboardUnsavedWarningIgnore": {
23-
"message": "অবজ্ঞা করুন।",
23+
"message": "অবজ্ঞা করুন",
2424
"description": "Label for button to ignore unsaved changes"
2525
},
2626
"settingsPageName": {
@@ -40,35 +40,35 @@
4040
"description": "appears as tab name in dashboard"
4141
},
4242
"whitelistPageName": {
43-
"message": "পরিচ্ছন্ন তালিকা",
43+
"message": "বিশ্বস্ত তালিকা",
4444
"description": "appears as tab name in dashboard"
4545
},
4646
"shortcutsPageName": {
47-
"message": "শর্টকাট",
47+
"message": "শর্টকাটগুলি",
4848
"description": "appears as tab name in dashboard"
4949
},
5050
"statsPageName": {
51-
"message": "ইউব্লক₀ — ঘটনাবলী",
51+
"message": "uBlock₀ — ঘটনাবলী",
5252
"description": "Title for the logger window"
5353
},
5454
"aboutPageName": {
5555
"message": "সম্পর্কে",
5656
"description": "appears as tab name in dashboard"
5757
},
5858
"assetViewerPageName": {
59-
"message": "ইউব্লক₀ — তথ্য নিরিক্ষক ",
59+
"message": "uBlock₀ — তথ্য নিরিক্ষক",
6060
"description": "Title for the asset viewer page"
6161
},
6262
"advancedSettingsPageName": {
6363
"message": "উন্নত সেটিংস",
6464
"description": "Title for the advanced settings page"
6565
},
6666
"popupPowerSwitchInfo": {
67-
"message": "ক্লিক: এই সাইটের জন্য ইউব্লক₀ নিষ্ক্রিয়/সক্রিয় করবে।\n\nCtrl+ক্লিক: শুধু এই পাতার জন্য ইউব্লক₀ নিষ্ক্রিয় করবে।",
67+
"message": "ক্লিক: এই সাইটের জন্য uBlock₀ সক্রিয়/নিষ্ক্রিয় করুন\n\nCtrl+ক্লিক: শুধু এই পেজে uBlock₀ নিষ্ক্রিয় করুন",
6868
"description": "English: Click: disable/enable uBlock₀ for this site.\n\nCtrl+click: disable uBlock₀ only on this page."
6969
},
7070
"popupPowerSwitchInfo1": {
71-
"message": "এই সাইটের জন্য ইউব্লক₀ নিষ্ক্রিয় করতে ক্লিক করুন।\n\nCtrl+ক্লিক করলে শুধু এই পাতার জন্য ইউব্লক₀ নিষ্ক্রিয় হবে।",
71+
"message": "এই সাইটে uBlock₀ নিষ্ক্রিয় করুন\n\nCtrl+ক্লিক: শুধু এই পেজে uBlock₀ নিষ্ক্রিয় করুন",
7272
"description": "Message to be read by screen readers"
7373
},
7474
"popupPowerSwitchInfo2": {
@@ -124,7 +124,7 @@
124124
"description": "Tooltip used for the logger icon in the panel"
125125
},
126126
"popupTipNoPopups": {
127-
"message": "এই সাইটের জন্য সব পপআপ প্রতিরোধ চালু/বন্ধ করুন",
127+
"message": "এই সাইটের সব পপআপ ব্লকিং চালু/বন্ধ করুন",
128128
"description": "Tooltip for the no-popups per-site switch"
129129
},
130130
"popupTipNoPopups1": {
@@ -180,19 +180,19 @@
180180
"description": "Tooltip for the no-scripting per-site switch"
181181
},
182182
"popupNoPopups_v2": {
183-
"message": "পপ-আপ উইন্ডো",
183+
"message": "পপ-আপ উইন্ডোগুলি",
184184
"description": "Caption for the no-popups per-site switch"
185185
},
186186
"popupNoLargeMedia_v2": {
187-
"message": "বড় আয়তনের উপাদান",
187+
"message": "বড় মিডিয়া এলিমেন্টগুলি",
188188
"description": "Caption for the no-large-media per-site switch"
189189
},
190190
"popupNoCosmeticFiltering_v2": {
191191
"message": "সৌন্দর্য্যবর্ধক ছাকন",
192192
"description": "Caption for the no-cosmetic-filtering per-site switch"
193193
},
194194
"popupNoRemoteFonts_v2": {
195-
"message": "দুরস্থিত ফন্ট",
195+
"message": "রিমোট ফন্টগুলি",
196196
"description": "Caption for the no-remote-fonts per-site switch"
197197
},
198198
"popupNoScripting_v2": {
@@ -268,11 +268,11 @@
268268
"description": "Example of use: Version 1.26.4"
269269
},
270270
"popup3pScriptFilterTip": {
271-
"message": "↑: Emphasize rows which have 3rd-party scripts",
271+
"message": "↑: থার্ড-পার্টি স্ক্রিপ্ট থাকা সারিগুলোতে গুরুত্ব দেয়া",
272272
"description": "Tooltip shown when hovering small filtering widget in '3rd-party scripts' cell"
273273
},
274274
"popup3pFrameFilterTip": {
275-
"message": "↑: Emphasize rows which have 3rd-party frames",
275+
"message": "↑: থার্ড-পার্টি ফ্রেম থাকা সারিগুলোতে গুরুত্ব দেয়া",
276276
"description": "Tooltip shown when hovering small filtering widget in '3rd-party frames' cell"
277277
},
278278
"pickerCreate": {
@@ -380,7 +380,7 @@
380380
"description": "background information: https://github.com/gorhill/uBlock/issues/3150"
381381
},
382382
"settingsUncloakCnamePrompt": {
383-
"message": "Uncloak canonical names",
383+
"message": "Canonical Name এর উন্মোচন",
384384
"description": "background information: https://github.com/uBlockOrigin/uBlock-issues/issues/1513"
385385
},
386386
"settingsLastRestorePrompt": {
@@ -848,7 +848,7 @@
848848
"description": "Label for radio-button to pick export text format"
849849
},
850850
"aboutPrivacyPolicy": {
851-
"message": "Privacy policy",
851+
"message": "গোপনীয়তার নীতি",
852852
"description": "Link to privacy policy on GitHub (English)"
853853
},
854854
"aboutChangelog": {
@@ -1048,7 +1048,7 @@
10481048
"description": "An entry in the browser's contextual menu"
10491049
},
10501050
"contextMenuSubscribeToList": {
1051-
"message": "Subscribe to filter list...",
1051+
"message": "ফিল্টার তালিকায় সাবস্ক্রাইব করুন...",
10521052
"description": "An entry in the browser's contextual menu"
10531053
},
10541054
"contextMenuTemporarilyAllowLargeMediaElements": {

‎src/_locales/kn/messages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"description": "English: uBlock₀ — Dashboard"
1313
},
1414
"dashboardUnsavedWarning": {
15-
"message": "Warning! You have unsaved changes",
15+
"message": "ಎಚ್ಚರಿಕೆ! ನೀವು ಉಳಿಸದ ಬದಲಾವಣೆಗಳನ್ನು ಹೊಂದಿದ್ದೀರಿ",
1616
"description": "A warning in the dashboard when navigating away from unsaved changes"
1717
},
1818
"dashboardUnsavedWarningStay": {

0 commit comments

Comments
 (0)